X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsrc%2Fos.c;h=47af038f78216beaf73e6dcc1935dd28695dec21;hb=e2e3255a028f500210e24279453b6d1487841a92;hp=d40fb606d0e06c547649466db83d3e3a84977b70;hpb=3ae121c94f0dfaeba5938de26931c49e29677d0a;p=user%2Fhenk%2Fcode%2Fexim.git

diff --git a/src/src/os.c b/src/src/os.c
index d40fb606d..47af038f7 100644
--- a/src/src/os.c
+++ b/src/src/os.c
@@ -2,7 +2,7 @@
 *     Exim - an Internet mail transport agent    *
 *************************************************/
 
-/* Copyright (c) University of Cambridge 1995 - 2014 */
+/* Copyright (c) University of Cambridge 1995 - 2016 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 #ifdef STAND_ALONE
@@ -844,9 +844,9 @@ os_get_dns_resolver_res(void)
 
 #if !defined(OS_UNSETENV)
 int
-os_unsetenv(const char *name)
+os_unsetenv(const unsigned char * name)
 {
-  return unsetenv(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)
-char *
-os_getcwd(char *buffer, size_t size)
+unsigned char *
+os_getcwd(unsigned char * buffer, size_t size)
 {
-return getcwd(buffer, size);
+return (unsigned char *) getcwd((char *)buffer, size);
 }
 #else
 #ifndef PATH_MAX
 # define PATH_MAX 4096
 #endif
-char *
-os_getcwd(char *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 = (char*) malloc(size))) return NULL;
-if (!(buffer = getcwd(buffer, size))) return NULL;
-return realloc(buffer, strlen(buffer) + 1);
+if (!b && !(b = malloc(size))) return NULL;
+if (!(b = getcwd(b, size))) return NULL;
+return realloc(b, strlen(b) + 1);
 }
 #endif