SOURCES: msmtp-home_etc.patch - fixed: getenv(HOME_ETC) must also ...

[saq]

Author: saq                          Date: Tue Sep 20 16:50:14 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- fixed: getenv(HOME_ETC) must also be duped. Adapted from Jan Palus's patch

---- Files affected:
SOURCES:
   msmtp-home_etc.patch (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: SOURCES/msmtp-home_etc.patch
diff -u SOURCES/msmtp-home_etc.patch:1.5 SOURCES/msmtp-home_etc.patch:1.6
--- SOURCES/msmtp-home_etc.patch:1.5	Thu Jul 14 21:45:53 2005
+++ SOURCES/msmtp-home_etc.patch	Tue Sep 20 18:50:09 2005
@@ -1,24 +1,24 @@
-diff -uNr msmtp-1.4.2.orig/src/os_env.c msmtp-1.4.2/src/os_env.c
---- msmtp-1.4.2.orig/src/os_env.c	2005-07-14 21:41:38.000000000 +0200
-+++ msmtp-1.4.2/src/os_env.c	2005-07-14 21:39:32.000000000 +0200
-@@ -260,6 +260,9 @@
+--- msmtp-1.4.4/src/os_env.c.orig	2005-09-20 18:44:17.000000000 +0200
++++ msmtp-1.4.4/src/os_env.c	2005-09-20 18:46:28.000000000 +0200
+@@ -257,7 +257,9 @@
      
      char *home;
      
+-    if ((home = getenv("HOME")))
 +    home = getenv("HOME_ETC");
-+    if (!home)
-+    
-     if ((home = getenv("HOME")))
++    if (home == NULL) home = getenv("HOME");
++    if (home != NULL)
      {
  	home = xstrdup(home);
-@@ -275,7 +278,9 @@
- 
+     }
+@@ -273,7 +275,9 @@
      char *home;
      struct passwd *pw;
--    
-+
+     
+-    if ((home = getenv("HOME")))
 +    home = getenv("HOME_ETC");
-+    if (!home)
-     if ((home = getenv("HOME")))
++    if (home == NULL) home = getenv("HOME");
++    if (home != NULL)
      {
  	home = xstrdup(home);
+     }
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/msmtp-home_etc.patch?r1=1.5&r2=1.6&f=u