Merge branch 'CHUNKING'

[exim.git] / src / src / environment.c

diff --git a/src/src/environment.c b/src/src/environment.c
index c41d19ebac552ac233738a07dcf6756075ed20f6..c394eb7e7b9f9b31b576857cbe27db5fc105c615 100644 (file)
--- a/src/src/environment.c
+++ b/src/src/environment.c
@@ -9,9 +9,7 @@
 
 #include "exim.h"
 
-#ifndef environ
 extern char **environ;
-#endif
 
 /* The cleanup_environment() function is used during the startup phase
 of the Exim process, right after reading the configurations main
@@ -46,14 +44,15 @@ else if (Ustrcmp(keep_environment, "*") != 0)
     /* It's considered broken if we do not find the '=', according to
     Florian Weimer. For now we ignore such strings. unsetenv() would complain,
     getenv() would complain. */
-    uschar *eqp = Ustrchr(*p, '=');
+    uschar * eqp = Ustrchr(*p, '=');
 
     if (eqp)
       {
-      uschar *name = string_copyn(*p, eqp - *p);
+      uschar * name = string_copyn(*p, eqp - *p);
+
       if (OK != match_isinlist(name, CUSS &keep_environment,
           0, NULL, NULL, MCL_NOEXPAND, FALSE, NULL))
-        if (unsetenv(CS name) < 0) return FALSE;
+        if (os_unsetenv(name) < 0) return FALSE;
         else p = USS environ; /* RESTART from the beginning */
       else p++;
       store_reset(name);
@@ -62,11 +61,11 @@ else if (Ustrcmp(keep_environment, "*") != 0)
   }
 if (add_environment)
   {
-    uschar *p;
+    uschar * p;
     int sep = 0;
-    const uschar* envlist = add_environment;
-    while ((p = string_nextinlist(&envlist, &sep, NULL, 0)))
-        putenv(CS p);
+    const uschar * envlist = add_environment;
+
+    while ((p = string_nextinlist(&envlist, &sep, NULL, 0))) putenv(CS p);
   }
 
   return TRUE;