X-Git-Url: https://vcs.fsf.org/?p=exim.git;a=blobdiff_plain;f=src%2Fsrc%2Fbuildconfig.c;h=a680b344a9bfae408ca667425a59bbc84d4f9bec;hp=f3390cb7513bfb91f9f3861811bbc28196ab4819;hb=66e0f1529f73be9afa5388018729549e9ee38bd6;hpb=6d7c6175eda3aaa316d1960a89170a285510ad40 diff --git a/src/src/buildconfig.c b/src/src/buildconfig.c index f3390cb75..a680b344a 100644 --- a/src/src/buildconfig.c +++ b/src/src/buildconfig.c @@ -2,7 +2,7 @@ * Exim - an Internet mail transport agent * *************************************************/ -/* Copyright (c) University of Cambridge 1995 - 2012 */ +/* Copyright (c) University of Cambridge 1995 - 2018 */ /* See the file NOTICE for conditions of use and distribution. */ @@ -36,6 +36,8 @@ normally called independently. */ #include #include #include +#include +#include #include #include @@ -101,12 +103,16 @@ main(int argc, char **argv) { off_t test_off_t = 0; time_t test_time_t = 0; +ino_t test_ino_t; #if ! (__STDC_VERSION__ >= 199901L) size_t test_size_t = 0; ssize_t test_ssize_t = 0; unsigned long test_ulong_t = 0L; +unsigned int test_uint_t = 0; #endif long test_long_t = 0; +long long test_longlong_t = 0; +int test_int_t = 0; FILE *base; FILE *new; int last_initial = 'A'; @@ -150,15 +156,16 @@ This assumption is known to be OK for the common operating systems. */ fprintf(new, "#ifndef OFF_T_FMT\n"); if (sizeof(test_off_t) > sizeof(test_long_t)) - { - fprintf(new, "#define OFF_T_FMT \"%%lld\"\n"); - fprintf(new, "#define LONGLONG_T long long int\n"); - } + fprintf(new, "# define OFF_T_FMT \"%%lld\"\n"); else - { - fprintf(new, "#define OFF_T_FMT \"%%ld\"\n"); - fprintf(new, "#define LONGLONG_T long int\n"); - } + fprintf(new, "# define OFF_T_FMT \"%%ld\"\n"); +fprintf(new, "#endif\n\n"); + +fprintf(new, "#ifndef LONGLONG_T\n"); +if (sizeof(test_longlong_t) > sizeof(test_long_t)) + fprintf(new, "# define LONGLONG_T long long int\n"); +else + 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 @@ -169,14 +176,23 @@ off_t. */ fprintf(new, "#ifndef TIME_T_FMT\n"); if (sizeof(test_time_t) > sizeof(test_long_t)) { - fprintf(new, "#define TIME_T_FMT \"%%lld\"\n"); - fprintf(new, "#undef LONGLONG_T\n"); - fprintf(new, "#define LONGLONG_T long long int\n"); + 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, "# define TIME_T_FMT \"%%ld\"\n"); +fprintf(new, "#endif\n\n"); + +fprintf(new, "#ifndef INO_T_FMT\n"); +if (sizeof(test_ino_t) > sizeof(test_long_t)) + fprintf(new, "# define INO_T_FMT \"%%llu\"\n"); +else + fprintf(new, "# define INO_T_FMT \"%%lu\"\n"); +fprintf(new, "#endif\n\n"); + +fprintf(new, "#ifndef PID_T_FMT\n"); +fprintf(new, "# define PID_T_FMT \"%%lu\"\n"); fprintf(new, "#endif\n\n"); /* And for sizeof() results, size_t, which should with C99 be just %zu, deal @@ -190,12 +206,17 @@ fprintf(new, "#define SSIZE_T_FMT \"%%zd\"\n"); #else if (sizeof(test_size_t) > sizeof (test_ulong_t)) fprintf(new, "#define SIZE_T_FMT \"%%llu\"\n"); -else +else if (sizeof(test_size_t) > sizeof (test_uint_t)) fprintf(new, "#define SIZE_T_FMT \"%%lu\"\n"); +else + fprintf(new, "#define SIZE_T_FMT \"%%u\"\n"); + if (sizeof(test_ssize_t) > sizeof(test_long_t)) fprintf(new, "#define SSIZE_T_FMT \"%%lld\"\n"); -else +else if (sizeof(test_ssize_t) > sizeof(test_int_t)) fprintf(new, "#define SSIZE_T_FMT \"%%ld\"\n"); +else + fprintf(new, "#define SSIZE_T_FMT \"%%d\"\n"); #endif /* Now search the makefile for certain settings */ @@ -716,21 +737,36 @@ else if (isgroup) fprintf(new, "#define FIXED_NEVER_USERS %d", j); for (i = 0; i < j; i++) fprintf(new, ", %d", (unsigned int)vector[i]); fprintf(new, "\n"); + free(vector); } 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 it or + EXPERIMENTAL_DCC is set. */ if (strcmp(name, "WITH_CONTENT_SCAN") == 0) { char *wcs = getenv("WITH_CONTENT_SCAN"); - char *wod = getenv("WITH_OLD_DEMIME"); char *dcc = getenv("EXPERIMENTAL_DCC"); - if (wcs != NULL || wod != NULL || dcc != NULL) - fprintf(new, "#define WITH_CONTENT_SCAN yes\n"); - else fprintf(new, "/* WITH_CONTENT_SCAN not set */\n"); + fprintf(new, wcs || dcc + ? "#define WITH_CONTENT_SCAN yes\n" + : "/* WITH_CONTENT_SCAN not set */\n"); + continue; + } + + /* DISABLE_DKIM is special; must be forced if DISABLE_TLS */ + if (strcmp(name, "DISABLE_DKIM") == 0) + { + char *d_dkim = getenv("DISABLE_DKIM"); + char *notls = getenv("DISABLE_TLS"); + + if (d_dkim) + fprintf(new, "#define DISABLE_DKIM yes\n"); + else if (notls) + fprintf(new, "#define DISABLE_DKIM yes /* forced by lack of TLS */\n"); + else + fprintf(new, "/* DISABLE_DKIM not set */\n"); continue; } @@ -804,7 +840,11 @@ else if (isgroup) strncpy(buffer, ss, sss-ss); buffer[sss-ss] = 0; /* For empty case */ } - else strcpy(buffer, ss); + else + { + strncpy(buffer, ss, sizeof(buffer)); + buffer[sizeof(buffer)-1] = 0; + } pp = buffer + (int)strlen(buffer); while (pp > buffer && isspace((unsigned char)pp[-1])) pp--; *pp = 0; @@ -915,9 +955,25 @@ else if (isgroup) defined. */ if (have_auth) - { if (!support_crypteq) fprintf(new, "/* Force SUPPORT_CRYPTEQ for AUTH */\n" "#define SUPPORT_CRYPTEQ\n"); + +/* Check poll() for timer functionality. +Some OS' have released with it broken. */ + + { + struct timeval before, after; + size_t us; + + gettimeofday(&before, NULL); + (void) poll(NULL, 0, 500); + gettimeofday(&after, NULL); + + us = (after.tv_sec - before.tv_sec) * 1000000 + + (after.tv_usec - before.tv_usec); + + if (us < 400000) + fprintf(new, "#define NO_POLL_H\n"); } /* End off */