Fix previous attempt to remove "memory" from debug "all".

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

diff --git a/src/src/buildconfig.c b/src/src/buildconfig.c
index 6cc5e9abf685048dd9e842b40db1cd0a25d676ab..2cfc32de26bfcb5112f1a5ed4121cfa418912a64 100644 (file)
--- a/src/src/buildconfig.c
+++ b/src/src/buildconfig.c
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/src/buildconfig.c,v 1.5 2005/01/04 10:00:42 ph10 Exp $ */
+/* $Cambridge: exim/src/src/buildconfig.c,v 1.9 2005/06/17 13:52:15 ph10 Exp $ */
 
 /*************************************************
 *     Exim - an Internet mail transport agent    *
@@ -15,8 +15,13 @@
 /* This auxiliary program builds the file config.h by the following
 process:
 
-First it reads Makefile, looking for certain OS-specific definitions which it
-uses to define macros. Then it reads the defaults file config.h.defaults.
+First, it determines the size of off_t and time_t variables, and generates
+macro code to define OFF_T_FMT and TIME_T_FMT as suitable formats, if they are
+not already defined in the system-specific header file.
+
+Then it reads Makefile, looking for certain OS-specific definitions which it
+uses to define some specific macros. Finally, it reads the defaults file
+config.h.defaults.
 
 The defaults file contains normal C #define statements for various macros; if
 the name of a macro is found in the environment, the environment value replaces
@@ -96,6 +101,8 @@ if (!OK)
 int
 main(int argc, char **argv)
 {
+off_t test_off_t = 0;
+time_t test_time_t = 0;
 FILE *base;
 FILE *new;
 int last_initial = 'A';
@@ -132,7 +139,43 @@ fprintf(new, "using values specified in the configuration file Local/Makefile.\n
 fprintf(new, "Do not edit it. Instead, edit Local/Makefile and "
   "rerun make. */\n\n");
 
-/* First, search the makefile for certain settings */
+/* First, deal with the printing format for off_t variables. We assume that if
+the size of off_t is greater than 4, "%lld" will be available as a format for
+printing long long variables, and there will be support for the long long type.
+This assumption is known to be OK for the common operating systems. */
+
+fprintf(new, "#ifndef OFF_T_FMT\n");
+if (sizeof(test_off_t) > 4)
+  {
+  fprintf(new, "#define OFF_T_FMT  \"%%lld\"\n");
+  fprintf(new, "#define LONGLONG_T long long int\n");
+  }
+else
+  {
+  fprintf(new, "#define OFF_T_FMT  \"%%ld\"\n");
+  fprintf(new, "#define LONGLONG_T long int\n");
+  }
+fprintf(new, "#endif\n\n");
+
+/* Now do the same thing for time_t variables. If the length is greater than
+4, we want to assume long long support (even if off_t was less than 4). If the
+length is 4 or less, we can leave LONGLONG_T to whatever was defined above for
+off_t. */
+
+fprintf(new, "#ifndef TIME_T_FMT\n");
+if (sizeof(test_time_t) > 4)
+  {
+  fprintf(new, "#define TIME_T_FMT  \"%%lld\"\n");
+  fprintf(new, "#undef  LONGLONG_T\n");
+  fprintf(new, "#define LONGLONG_T long long int\n");
+  }
+else
+  {
+  fprintf(new, "#define TIME_T_FMT  \"%%ld\"\n");
+  }
+fprintf(new, "#endif\n\n");
+
+/* Now search the makefile for certain settings */
 
 base = fopen("Makefile", "rb");
 if (base == NULL)
@@ -480,9 +523,9 @@ while (fgets(buffer, sizeof(buffer), base) != NULL)
   if (strcmp(name, "CONFIGURE_OWNER") == 0 ||
       strcmp(name, "CONFIGURE_GROUP") == 0)
     {
-    int isgroup = name[10] == 'G'; 
+    int isgroup = name[10] == 'G';
     uid_t uid = 0;
-    gid_t gid = 0; 
+    gid_t gid = 0;
     char *s;
     char *username = NULL;
     char *user = getenv(name);
@@ -512,7 +555,7 @@ while (fgets(buffer, sizeof(buffer), base) != NULL)
       {
       if (isgroup)
         gid = (gid_t)atoi(user);
-      else    
+      else
         uid = (uid_t)atoi(user);
       }
 
@@ -560,13 +603,13 @@ while (fgets(buffer, sizeof(buffer), base) != NULL)
       {
       if (isgroup)
         fprintf(new, "#define CONFIGURE_GROUPNAME         \"%s\"\n", username);
-      else 
+      else
         fprintf(new, "#define CONFIGURE_OWNERNAME         \"%s\"\n", username);
       }
-    
+
     if (isgroup)
       fprintf(new, "#define CONFIGURE_GROUP              %d\n", (int)gid);
-    else   
+    else
       fprintf(new, "#define CONFIGURE_OWNER              %d\n", (int)uid);
     continue;
     }
@@ -595,16 +638,16 @@ while (fgets(buffer, sizeof(buffer), base) != NULL)
       for (i = 1, j = 0; i <= count; list++, i++)
         {
         char name[64];
-         
+
         p = list;
         while (*list != 0 && *list != ':') list++;
         strncpy(name, p, list-p);
         name[list-p] = 0;
-        
+
         if (name[0] == 0)
           {
-          continue; 
-          }  
+          continue;
+          }
         else if (name[strspn(name, "0123456789")] == 0)
           {
           vector[j++] = (uid_t)atoi(name);
@@ -629,8 +672,8 @@ while (fgets(buffer, sizeof(buffer), base) != NULL)
     continue;
     }
 
-  /* WITH_CONTENT_SCAN is another special case: it must be set if either it or 
-  WITH_OLD_DEMIME is set. */  
+  /* WITH_CONTENT_SCAN is another special case: it must be set if either it or
+  WITH_OLD_DEMIME is set. */
 
   if (strcmp(name, "WITH_CONTENT_SCAN") == 0)
     {
@@ -640,7 +683,7 @@ while (fgets(buffer, sizeof(buffer), base) != NULL)
       fprintf(new, "#define WITH_CONTENT_SCAN     yes\n");
     else fprintf(new, "/* WITH_CONTENT_SCAN not set */\n");
     continue;
-    } 
+    }
 
   /* Otherwise, check whether a value exists in the environment. Remember if
   it is an AUTH setting or SUPPORT_CRYPTEQ. */
@@ -677,6 +720,7 @@ while (fgets(buffer, sizeof(buffer), base) != NULL)
     else if (strcmp(name, "RADIUS_LIB_TYPE") == 0)
       {
       if (strcmp(value, "RADIUSCLIENT") == 0 ||
+          strcmp(value, "RADIUSCLIENTNEW") == 0 ||
           strcmp(value, "RADLIB") == 0)
         {
         fprintf(new, "#define RADIUS_LIB_%s\n", value);