Merge branch 'tom_dev'

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

diff --git a/src/src/buildconfig.c b/src/src/buildconfig.c
index 38ed0311f170d62fff599d83584d47f1dc1c5876..56939770d1ae5dd11bec2a8d085679374e28aa41 100644 (file)
--- a/src/src/buildconfig.c
+++ b/src/src/buildconfig.c
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/src/buildconfig.c,v 1.20 2010/06/12 15:21:26 jetmore Exp $ */
+/* $Cambridge: exim/src/src/buildconfig.c,v 1.21 2010/06/13 08:26:40 pdp Exp $ */

 
 /*************************************************
 *     Exim - an Internet mail transport agent    *
 
 /*************************************************
 *     Exim - an Internet mail transport agent    *


@@ -34,7 +34,6 @@ normally called independently. */
 
 
 #include <ctype.h>
 
 
 #include <ctype.h>

-#include <inttypes.h>

 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>


@@ -43,16 +42,16 @@ normally called independently. */
 #include <grp.h>
 
 typedef struct {
 #include <grp.h>
 
 typedef struct {

-  char *name;
+  const char *name;

   int *flag;
 } have_item;
 
 typedef struct {
   int *flag;
 } have_item;
 
 typedef struct {

-  char *name;
+  const char *name;

   char *data;
 } save_item;
 
   char *data;
 } save_item;
 

-static char *db_opts[] = { "", "USE_DB", "USE_GDBM", "USE_TDB" };
+static const char *db_opts[] = { "", "USE_DB", "USE_GDBM", "USE_TDB" };

 
 static int have_ipv6 = 0;
 static int have_iconv = 0;
 
 static int have_ipv6 = 0;
 static int have_iconv = 0;


@@ -104,7 +103,7 @@ main(int argc, char **argv)
 {
 off_t test_off_t = 0;
 time_t test_time_t = 0;
 {
 off_t test_off_t = 0;
 time_t test_time_t = 0;

-#if !(__STDC_VERSION__ >= 199901L) && !defined(PRIdMAX)
+#if ! (__STDC_VERSION__ >= 199901L)

 size_t test_size_t = 0;
 unsigned long test_ulong_t = 0L;
 #endif
 size_t test_size_t = 0;
 unsigned long test_ulong_t = 0L;
 #endif


@@ -187,14 +186,10 @@ with C99 not being ubiquitous yet.  Unfortunately. */
 #if __STDC_VERSION__ >= 199901L
 fprintf(new, "#define SIZE_T_FMT  \"%%zu\"\n");
 #else
 #if __STDC_VERSION__ >= 199901L
 fprintf(new, "#define SIZE_T_FMT  \"%%zu\"\n");
 #else

-# ifdef PRIdMAX
-fprintf(new, "#define SIZE_T_FMT  \"%%" PRIdMAX "\"\n");
-# else

 if (sizeof(test_size_t) > sizeof (test_ulong_t))
   fprintf(new, "#define SIZE_T_FMT  \"%%llu\"\n");
 else
   fprintf(new, "#define SIZE_T_FMT  \"%%lu\"\n");
 if (sizeof(test_size_t) > sizeof (test_ulong_t))
   fprintf(new, "#define SIZE_T_FMT  \"%%llu\"\n");
 else
   fprintf(new, "#define SIZE_T_FMT  \"%%lu\"\n");

-# endif

 #endif
 
 /* Now search the makefile for certain settings */
 #endif
 
 /* Now search the makefile for certain settings */


@@ -564,9 +559,9 @@ while (fgets(buffer, sizeof(buffer), base) != NULL)
     int isgroup = name[10] == 'G';
     uid_t uid = 0;
     gid_t gid = 0;
     int isgroup = name[10] == 'G';
     uid_t uid = 0;
     gid_t gid = 0;

-    char *s;
-    char *username = NULL;
-    char *user = getenv(name);
+    const char *s;
+    const char *username = NULL;
+    const char *user = getenv(name);

 
     if (user == NULL) user = "";
     while (isspace((unsigned char)(*user))) user++;
 
     if (user == NULL) user = "";
     while (isspace((unsigned char)(*user))) user++;


@@ -607,8 +602,7 @@ while (fgets(buffer, sizeof(buffer), base) != NULL)
       while (isspace(*user)) user++;
       username = user;
       }
       while (isspace(*user)) user++;
       username = user;
       }

-
-    else if (isgroup)
+else if (isgroup)

       {
       struct group *gr = getgrnam(user);
       if (gr == NULL)
       {
       struct group *gr = getgrnam(user);
       if (gr == NULL)


@@ -807,11 +801,13 @@ while (fgets(buffer, sizeof(buffer), base) != NULL)
         fprintf(new, "\"%s\"\n", value);
         }
 
         fprintf(new, "\"%s\"\n", value);
         }
 

-      /* Timezone values HEADERS_CHARSET, and TCP_WRAPPERS_DAEMON_NAME get quoted */
+      /* Timezone values HEADERS_CHARSET, TCP_WRAPPERS_DAEMON_NAME and
+      WHITELIST_D_MACROS get quoted */

 
       else if (strcmp(name, "TIMEZONE_DEFAULT") == 0||
                strcmp(name, "TCP_WRAPPERS_DAEMON_NAME") == 0||
 
       else if (strcmp(name, "TIMEZONE_DEFAULT") == 0||
                strcmp(name, "TCP_WRAPPERS_DAEMON_NAME") == 0||

-               strcmp(name, "HEADERS_CHARSET") == 0)
+               strcmp(name, "HEADERS_CHARSET") == 0||
+              strcmp(name, "WHITELIST_D_MACROS") == 0)

         fprintf(new, "\"%s\"\n", value);
 
       /* For others, quote any paths and don't quote anything else */
         fprintf(new, "\"%s\"\n", value);
 
       /* For others, quote any paths and don't quote anything else */