Ticket #26195: patch-config.c.diff

config.c

@@ -30 +30 @@
 
 #define REALLOC_STEP    10
 
+/* Mac OS X does not define O_CLOEXEC, MAP_POPULATE or MADV_DONTFORK 
+   and PATH_MAX is in limits.h - brad@pixilla.com */
+#if defined(Darwin) 
+#include <limits.h>
+#ifndef O_CLOEXEC
+#define O_CLOEXEC 0
+#endif
+#ifndef MAP_POPULATE
+#define MAP_POPULATE 0
+#endif
+#ifndef MADV_DONTFORK
+#define MADV_DONTFORK 0
+#endif
+#define IS_DARWIN 1
+#else
+#define IS_DARWIN 0
+#endif
+
 #if defined(SunOS) 
 #include <syslimits.h>
 #if !defined(isblank)
@@ -100 +118 @@
 
         chptr = start;
 
-        while( (len = mbrtowc(&pwc, chptr, strlen(chptr), NULL)) != 0 ) {
-                if( len == (size_t)(-1) || len == (size_t)(-2) || !iswprint(pwc) || iswblank(pwc) ) {
-                    message(MESS_ERROR, "%s:%d bad %s path %s\n",
-                            configFile, lineNum, key, start);
-                    return NULL;
+/* Mac OS X is not liking this, reverting to older code - brad@pixilla.com */
+        if( !IS_DARWIN ) {
+                while( (len = mbrtowc(&pwc, chptr, strlen(chptr), NULL)) != 0 ) {
+                        if( len == (size_t)(-1) || len == (size_t)(-2) || !iswprint(pwc) || iswblank(pwc) ) {
+                                message(MESS_ERROR, "%s:%d bad %s path %s\n",
+                                        configFile, lineNum, key, start);
+                                return NULL;
+                        }
+                        chptr += len;
+                }
+        } else {
+                while (*chptr && isprint(*chptr) && *chptr != ' ') {
+                        chptr++;
+                }
+                if (*chptr) {
+                        message(MESS_ERROR, "%s:%d bad %s path %s\n",
+                                configFile, lineNum, key, start);
+                        return NULL;
                 }
-                chptr += len;
-        }
-
-/*
-        while (*chptr && isprint(*chptr) && *chptr != ' ')
-            chptr++;
-        if (*chptr) {
-            message(MESS_ERROR, "%s:%d bad %s path %s\n",
-                    configFile, lineNum, key, start);
-            return NULL;
         }
-*/
 
         path = strdup(start);
 
@@ -127 +147 @@
         *startPtr = start;
 
         return path;
-    } else
+                } else
         return NULL;
 }