check for malloc failure and actually look in /home/wichert for file instead of looki...

diff --git a/ChangeLog b/ChangeLog
index 528307481585ad1e4bd51ce46aaaa2adabe8595c..adf26a2d1d21f20967346f6bd03025afb685e7ad 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue Jul  2 12:29:52 CEST 2002 Wichert Akkerman <wichert@deephackmode.org>
+
+  * Merge from HEAD:
+    + lib/myopt: check for malloc failure and actually look in $HOME for
+      file instead of looking in confdir twice
+
 Tue Jul  2 10:20:40 CEST 2002 Wichert Akkerman <wichert@deephackmode.org>
 
   * debian/rules: cp instead of mv since we need files for both dpkg

diff --git a/debian/changelog b/debian/changelog
index b46916adeec94d33bfac54a0844e6841d8db9d74..5c4b7435d85a8244c91be40ed569df5857836b05 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+dpkg (1.10.2) unstable; urgency=low
+
+  * Make configuration files in $HOME work again
+
+ -- Wichert Akkerman <wakkerma@debian.org>  UNRELEASED
+
 dpkg (1.10.1) unstable; urgency=low
 
   * Add conflict with dpkg-iasearch which intruded on our namespace.
@@ -11,7 +17,7 @@ dpkg (1.10.1) unstable; urgency=low
     Closes: Bug#150739
   * Move dpkg.cfg and dselect.cfg manpages into dpkg package. Closes: Bug#132901
 
- -- Wichert Akkerman <wakkerma@debian.org>  Tue,  2 Jul 2002 10:30:34 +0200
+ -- Wichert Akkerman <wakkerma@debian.org>  Tue,  2 Jul 2002 12:34:07 +0200
 
 dpkg (1.10) unstable; urgency=low
 

diff --git a/lib/myopt.c b/lib/myopt.c
index 9d7c044ce3ab56315aaafe3b282d46fd137629d3..194883369c92eed3461b56d761fe7b7899f30f60 100644 (file)
--- a/lib/myopt.c
+++ b/lib/myopt.c
@@ -3,7 +3,7 @@
  * myopt.c - my very own option parsing
  *
  * Copyright (C) 1994,1995 Ian Jackson <ian@chiark.greenend.org.uk>
- * Copyright (C) 2000 Wichert Akkerman <wakkerma@debian.org>
+ * Copyright (C) 2000,2002 Wichert Akkerman <wichert@deephackmode.org>
  *
  * This is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as
@@ -90,15 +90,17 @@ void loadcfgfile(const char *prog, const struct cmdinfo* cmdinfos) {
   int l1, l2;
   l1 = strlen(CONFIGDIR "/.cfg") + strlen(prog);
   file = malloc(l1 + 1);
+  if (file==NULL) ohshite(_("Error allocating memory for cfgfilename"));
   sprintf(file, CONFIGDIR "/%s.cfg", prog);
   myfileopt(file, cmdinfos);
   if ((home = getenv("HOME")) != NULL) {
-    l2 = strlen(home) + strlen("/.cfg") + strlen(prog);
+    l2 = strlen(home) + 1 + strlen("/.cfg") + strlen(prog);
     if (l2 > l1) {
       free(file);
       file = malloc(l2 + 1);
-      l1 = l2;
+      if (file==NULL) ohshite(_("Error allocating memory for cfgfilename"));
     }
+    sprintf(file, "%s/.%s.cfg", home, prog);
     myfileopt(file, cmdinfos);
   }
   free(file);

diff --git a/version-nr b/version-nr
index 4dae2985b58cc788127f922e33b8e9ae4c41da60..5ad2491cf8808e3c61f8a41daf3766ad973092e4 100644 (file)
--- a/version-nr
+++ b/version-nr
@@ -1 +1 @@
-1.10.1
+1.10.2