X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fsrc%2Fbuildconfig.c;h=fe16082f71fd40f180c1c763c804764344d12bf7;hb=478be7b070f6ea0198060f32521afae7500e209b;hp=6cc5e9abf685048dd9e842b40db1cd0a25d676ab;hpb=c988f1f4faa9f679f79beddf3c14676c5dcb8e28;p=exim.git diff --git a/src/src/buildconfig.c b/src/src/buildconfig.c index 6cc5e9abf..fe16082f7 100644 --- a/src/src/buildconfig.c +++ b/src/src/buildconfig.c @@ -1,10 +1,10 @@ -/* $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.12 2006/02/07 11:19:00 ph10 Exp $ */ /************************************************* * Exim - an Internet mail transport agent * *************************************************/ -/* Copyright (c) University of Cambridge 1995 - 2005 */ +/* Copyright (c) University of Cambridge 1995 - 2006 */ /* See the file NOTICE for conditions of use and distribution. */ @@ -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,13 +139,49 @@ 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) { printf("*** Buildconfig: failed to open Makefile\n"); - fclose(new); + (void)fclose(new); exit(1); } @@ -242,15 +285,16 @@ fprintf(new, "#define HAVE_ICONV %s\n", if (errno_quota[0] != 0) fprintf(new, "\n#define ERRNO_QUOTA %s\n", errno_quota); -if (strcmp(cc, "gcc") == 0 && strstr(ostype, "IRIX") != NULL) +if (strcmp(cc, "gcc") == 0 && + (strstr(ostype, "IRIX") != NULL || strstr(ostype, "AIX") != NULL)) { fprintf(new, "\n/* This switch includes the code to fix the inet_ntoa() */"); - fprintf(new, "\n/* bug when using gcc on an IRIX system. */"); + fprintf(new, "\n/* bug when using gcc on an IRIX or AIX system. */"); fprintf(new, "\n#define USE_INET_NTOA_FIX"); } fprintf(new, "\n"); -fclose(base); +(void)fclose(base); /* Now handle the macros listed in the defaults */ @@ -259,7 +303,7 @@ base = fopen("../src/config.h.defaults", "rb"); if (base == NULL) { printf("*** Buildconfig: failed to open ../src/config.h.defaults\n"); - fclose(new); + (void)fclose(new); exit(1); } @@ -480,9 +524,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 +556,7 @@ while (fgets(buffer, sizeof(buffer), base) != NULL) { if (isgroup) gid = (gid_t)atoi(user); - else + else uid = (uid_t)atoi(user); } @@ -560,13 +604,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 +639,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 +673,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 +684,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 +721,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); @@ -771,7 +816,7 @@ while (fgets(buffer, sizeof(buffer), base) != NULL) } } -fclose(base); +(void)fclose(base); /* If any AUTH macros were defined, ensure that SUPPORT_CRYPTEQ is also defined. */ @@ -785,7 +830,7 @@ if (have_auth) /* End off */ fprintf(new, "\n/* End of config.h */\n"); -fclose(new); +(void)fclose(new); return 0; }