[PATCH] msmtp-home_etc.patch

[Jan Palus]

On 20.09.2005  17:16, Paweł Sakowski wrote:
> Te okolice są już patchowane przez msmtp-home_etc.patch, zapodaj patch
> do niego.

Wlasnie o nieprawidlowosci w nim mnie chodzilo, przeslalem jeno
poprawnego patcha w calosci. Ale moze byc i patch do tegoz patcha.
-------------- następna część ---------
Index: msmtp-home_etc.patch
===================================================================
RCS file: /cvsroot/SOURCES/msmtp-home_etc.patch,v
retrieving revision 1.5
diff -u -r1.5 msmtp-home_etc.patch
--- msmtp-home_etc.patch	14 Jul 2005 19:45:53 -0000	1.5
+++ msmtp-home_etc.patch	20 Sep 2005 16:08:46 -0000
@@ -1,24 +1,29 @@
 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 @@
+@@ -257,7 +257,11 @@
      
      char *home;
      
-+    home = getenv("HOME_ETC");
-+    if (!home)
-+    
-     if ((home = getenv("HOME")))
+-    if ((home = getenv("HOME")))
++    if ((home = getenv("HOME_ETC")))
++    {
++	home = xstrdup(home);
++    }
++    else if ((home = getenv("HOME")))
      {
  	home = xstrdup(home);
-@@ -275,7 +278,9 @@
- 
+     }
+@@ -273,7 +277,11 @@
      char *home;
      struct passwd *pw;
--    
-+
-+    home = getenv("HOME_ETC");
-+    if (!home)
-     if ((home = getenv("HOME")))
+     
+-    if ((home = getenv("HOME")))
++    if ((home = getenv("HOME_ETC")))
++    {
++	home = xstrdup(home);
++    }
++    else if ((home = getenv("HOME")))
      {
  	home = xstrdup(home);
+     }