os_getcwd(): do not realloc if there was no malloc().

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

diff --git a/src/src/os.c b/src/src/os.c
index 1cde1b8ecde19ff2aa030819a52d58398cc9d0b7..ca24e8dd27e47d42df5140e55de39cd0a072c6d8 100644 (file)
--- a/src/src/os.c
+++ b/src/src/os.c
@@ -844,9 +844,9 @@ os_get_dns_resolver_res(void)
 
 #if !defined(OS_UNSETENV)
 int
-os_unsetenv(const uschar * name)
+os_unsetenv(const unsigned char * name)
 {
-return unsetenv(CS name);
+return unsetenv((char *)name);
 }
 #endif
 
@@ -862,24 +862,24 @@ may not even do this. If the OS supports getcwd(NULL, 0) we'll use
 this, for all other systems we provide our own getcwd() */
 
 #if !defined(OS_GETCWD)
-uschar *
-os_getcwd(uschar * buffer, size_t size)
+unsigned char *
+os_getcwd(unsigned char * buffer, size_t size)
 {
-return getcwd(CS buffer, size);
+return (unsigned char *) getcwd((char *)buffer, size);
 }
 #else
 #ifndef PATH_MAX
 # define PATH_MAX 4096
 #endif
-uschar *
-os_getcwd(uschar * buffer, size_t size)
+unsigned char *
+os_getcwd(unsigned char * buffer, size_t size)
 {
-void *rc;
+char * b = (char *)buffer;
 
 if (!size) size = PATH_MAX;
-if (!buffer && !(buffer = US malloc(size))) return NULL;
-if (!(buffer = getcwd(CS buffer, size))) return NULL;
-return realloc(CS buffer, strlen(buffer) + 1);
+if (!b && !(b = malloc(size))) return NULL;
+if (!(b = getcwd(b, size))) return NULL;
+return buffer ? buffer : realloc(b, strlen(b) + 1);
 }
 #endif