Testsuite: add file-inclusion facility to "client" scripts

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

diff --git a/src/src/os.c b/src/src/os.c
index b0adc587a946e46f5b71bf4543024b95d8e1e1ca..ca24e8dd27e47d42df5140e55de39cd0a072c6d8 100644 (file)
--- a/src/src/os.c
+++ b/src/src/os.c
@@ -865,7 +865,7 @@ this, for all other systems we provide our own getcwd() */
 unsigned char *
 os_getcwd(unsigned char * buffer, size_t size)
 {
-return getcwd((char *)buffer, size);
+return (unsigned char *) getcwd((char *)buffer, size);
 }
 #else
 #ifndef PATH_MAX
@@ -874,12 +874,12 @@ return getcwd((char *)buffer, 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((char *)buffer, size))) return NULL;
-return realloc((char *)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