From 6e0d92c24b511c8f0748307d40aaba6e6cb7db78 Mon Sep 17 00:00:00 2001 From: Olly Betts Date: Tue, 27 Feb 2024 15:23:44 +1300 Subject: [PATCH] Remove fallback implementation of strftime() ISO C90 includes strftime() so we really should be able to rely on it being provided by now. --- configure.ac | 4 - src/msvc/config.h.in | 3 - src/strftime.c | 441 --------------------------------------------------- 3 files changed, 448 deletions(-) delete mode 100644 src/strftime.c diff --git a/configure.ac b/configure.ac index edb4d12a..115f83c1 100644 --- a/configure.ac +++ b/configure.ac @@ -240,10 +240,6 @@ AC_TYPE_INT32_T AC_TYPE_UINT32_T dnl Checks for library functions. -AC_FUNC_STRFTIME -if test yes != "$ac_cv_func_strftime"; then - AC_LIBOBJ(strftime) -fi AC_FUNC_VPRINTF dnl Check if there's a declaration of lround(). Below we also check for dnl lround() with AC_CHECK_FUNCS, which just checks if it can be linked diff --git a/src/msvc/config.h.in b/src/msvc/config.h.in index 4aa2c3d3..abdbcb21 100644 --- a/src/msvc/config.h.in +++ b/src/msvc/config.h.in @@ -6,9 +6,6 @@ /* Define if you don't have vprintf but do have _doprnt. */ #undef HAVE_DOPRNT -/* Define if you have the strftime function. */ -#define HAVE_STRFTIME 1 - /* Define if you have the vprintf function. */ #define HAVE_VPRINTF 1 diff --git a/src/strftime.c b/src/strftime.c deleted file mode 100644 index 4aed3b5e..00000000 --- a/src/strftime.c +++ /dev/null @@ -1,441 +0,0 @@ -/* - * strftime.c - * - * Public-domain relatively quick-and-dirty implemenation of - * ANSI library routine for System V Unix systems. - * - * It's written in old-style C for maximal portability. - * However, since I'm used to prototypes, I've included them too. - * - * If you want stuff in the System V ascftime routine, add the SYSV_EXT define. - * For stuff needed to implement the P1003.2 date command, add POSIX2_DATE. - * For complete POSIX semantics, add POSIX_SEMANTICS. - * - * The code for %c, %x, and %X is my best guess as to what's "appropriate". - * This version ignores LOCALE information. - * It also doesn't worry about multi-byte characters. - * So there. - * - * Arnold Robbins - * January, February, March, 1991 - * Updated March 1992 - * - * Fixes from ado@elsie.nci.nih.gov - * February 1991 - * - * Fixed compiler warnings from GCC - * Olly Betts 2005-01-12 - * - * Fix memory leak if realloc() fails - * Olly Betts 2010-12-21 - * - * Fix compilation error with GCC - * Olly Betts 2010-12-21 - */ - -#include -#include -#include -#include -#include - -#ifndef __STDC__ -#define const /**/ - -extern void *malloc(); -extern void *realloc(); -extern void free(); -extern void tzset(); -extern char *strchr(); -extern char *getenv(); -static int weeknumber(); -#else -#include -extern void tzset(void); -static int weeknumber(const struct tm *timeptr, int firstweekday); -#endif - -#ifdef __GNUC__ -#define inline __inline__ -#else -#define inline /**/ -#endif - -#define range(low, item, hi) max(low, min(item, hi)) - -extern char *tzname[2]; -extern int daylight; - -#define SYSV_EXT 1 /* stuff in System V ascftime routine */ -#define POSIX2_DATE 1 /* stuff in Posix 1003.2 date command */ -#define VMS_EXT 1 /* include %V for VMS date format */ -#define POSIX_SEMANTICS 1 /* call tzset() if TZ changes */ - -#if defined(POSIX2_DATE) && ! defined(SYSV_EXT) -#define SYSV_EXT 1 -#endif - -/* min --- return minimum of two numbers */ - -#ifndef __STDC__ -static inline int -min(a, b) -int a, b; -#else -static inline int -min(int a, int b) -#endif -{ - return (a < b ? a : b); -} - -/* max --- return maximum of two numbers */ - -#ifndef __STDC__ -static inline int -max(a, b) -int a, b; -#else -static inline int -max(int a, int b) -#endif -{ - return (a > b ? a : b); -} - -/* strftime --- produce formatted time */ - -#ifndef __STDC__ -size_t -strftime(s, maxsize, format, timeptr) -char *s; -size_t maxsize; -const char *format; -const struct tm *timeptr; -#else -size_t -strftime(char *s, size_t maxsize, const char *format, const struct tm *timeptr) -#endif -{ - char *endp = s + maxsize; - char *start = s; - char tbuf[100]; - int i; - static short first = 1; - static char *savetz = NULL; - static int savetzlen = 0; - char *tz; - int tzlen; - - /* various tables, useful in North America */ - static const char *days_a[] = { - "Sun", "Mon", "Tue", "Wed", - "Thu", "Fri", "Sat", - }; - static const char *days_l[] = { - "Sunday", "Monday", "Tuesday", "Wednesday", - "Thursday", "Friday", "Saturday", - }; - static const char *months_a[] = { - "Jan", "Feb", "Mar", "Apr", "May", "Jun", - "Jul", "Aug", "Sep", "Oct", "Nov", "Dec", - }; - static const char *months_l[] = { - "January", "February", "March", "April", - "May", "June", "July", "August", "September", - "October", "November", "December", - }; - static const char *ampm[] = { "AM", "PM", }; - - if (s == NULL || format == NULL || timeptr == NULL || maxsize == 0) - return 0; - - if (strchr(format, '%') == NULL && strlen(format) + 1 >= maxsize) - return 0; - -#ifndef POSIX_SEMANTICS - if (first) { - tzset(); - first = 0; - } -#else /* POSIX_SEMANTICS */ - tz = getenv("TZ"); - tzlen = strlen(tz); - if (first) { - if (tz != NULL) { - savetz = (char *) malloc(tzlen + 1); - if (savetz != NULL) { - savetzlen = tzlen + 1; - strcpy(savetz, tz); - } - } - tzset(); - first = 0; - } - /* if we have a saved TZ, and it is different, recapture and reset */ - if (tz && savetz && (tz[0] != savetz[0] || strcmp(tz, savetz) != 0)) { - i = strlen(tz) + 1; - if (i > savetzlen) { - char * newsavetz = (char *) realloc(savetz, i); - if (newsavetz) { - savetzlen = i; - strcpy(newsavetz, tz); - } else { - free(savetz); - } - savetz = newsavetz; - } else - strcpy(savetz, tz); - tzset(); - } -#endif /* POSIX_SEMANTICS */ - - for (; *format && s < endp - 1; format++) { - tbuf[0] = '\0'; - if (*format != '%') { - *s++ = *format; - continue; - } - again: - switch (*++format) { - case '\0': - *s++ = '%'; - goto out; - - case '%': - *s++ = '%'; - continue; - - case 'a': /* abbreviated weekday name */ - if (timeptr->tm_wday < 0 || timeptr->tm_wday > 6) - strcpy(tbuf, "?"); - else - strcpy(tbuf, days_a[timeptr->tm_wday]); - break; - - case 'A': /* full weekday name */ - if (timeptr->tm_wday < 0 || timeptr->tm_wday > 6) - strcpy(tbuf, "?"); - else - strcpy(tbuf, days_l[timeptr->tm_wday]); - break; - -#ifdef SYSV_EXT - case 'h': /* abbreviated month name */ -#endif - case 'b': /* abbreviated month name */ - if (timeptr->tm_mon < 0 || timeptr->tm_mon > 11) - strcpy(tbuf, "?"); - else - strcpy(tbuf, months_a[timeptr->tm_mon]); - break; - - case 'B': /* full month name */ - if (timeptr->tm_mon < 0 || timeptr->tm_mon > 11) - strcpy(tbuf, "?"); - else - strcpy(tbuf, months_l[timeptr->tm_mon]); - break; - - case 'c': /* appropriate date and time representation */ - sprintf(tbuf, "%s %s %2d %02d:%02d:%02d %d", - days_a[range(0, timeptr->tm_wday, 6)], - months_a[range(0, timeptr->tm_mon, 11)], - range(1, timeptr->tm_mday, 31), - range(0, timeptr->tm_hour, 23), - range(0, timeptr->tm_min, 59), - range(0, timeptr->tm_sec, 61), - timeptr->tm_year + 1900); - break; - - case 'd': /* day of the month, 01 - 31 */ - i = range(1, timeptr->tm_mday, 31); - sprintf(tbuf, "%02d", i); - break; - - case 'H': /* hour, 24-hour clock, 00 - 23 */ - i = range(0, timeptr->tm_hour, 23); - sprintf(tbuf, "%02d", i); - break; - - case 'I': /* hour, 12-hour clock, 01 - 12 */ - i = range(0, timeptr->tm_hour, 23); - if (i == 0) - i = 12; - else if (i > 12) - i -= 12; - sprintf(tbuf, "%02d", i); - break; - - case 'j': /* day of the year, 001 - 366 */ - sprintf(tbuf, "%03d", timeptr->tm_yday + 1); - break; - - case 'm': /* month, 01 - 12 */ - i = range(0, timeptr->tm_mon, 11); - sprintf(tbuf, "%02d", i + 1); - break; - - case 'M': /* minute, 00 - 59 */ - i = range(0, timeptr->tm_min, 59); - sprintf(tbuf, "%02d", i); - break; - - case 'p': /* am or pm based on 12-hour clock */ - i = range(0, timeptr->tm_hour, 23); - if (i < 12) - strcpy(tbuf, ampm[0]); - else - strcpy(tbuf, ampm[1]); - break; - - case 'S': /* second, 00 - 61 */ - i = range(0, timeptr->tm_sec, 61); - sprintf(tbuf, "%02d", i); - break; - - case 'U': /* week of year, Sunday is first day of week */ - sprintf(tbuf, "%d", weeknumber(timeptr, 0)); - break; - - case 'w': /* weekday, Sunday == 0, 0 - 6 */ - i = range(0, timeptr->tm_wday, 6); - sprintf(tbuf, "%d", i); - break; - - case 'W': /* week of year, Monday is first day of week */ - sprintf(tbuf, "%d", weeknumber(timeptr, 1)); - break; - - case 'x': /* appropriate date representation */ - sprintf(tbuf, "%s %s %2d %d", - days_a[range(0, timeptr->tm_wday, 6)], - months_a[range(0, timeptr->tm_mon, 11)], - range(1, timeptr->tm_mday, 31), - timeptr->tm_year + 1900); - break; - - case 'X': /* appropriate time representation */ - sprintf(tbuf, "%02d:%02d:%02d", - range(0, timeptr->tm_hour, 23), - range(0, timeptr->tm_min, 59), - range(0, timeptr->tm_sec, 61)); - break; - - case 'y': /* year without a century, 00 - 99 */ - i = timeptr->tm_year % 100; - sprintf(tbuf, "%d", i); - break; - - case 'Y': /* year with century */ - sprintf(tbuf, "%d", 1900 + timeptr->tm_year); - break; - - case 'Z': /* time zone name or abbrevation */ - i = 0; - if (daylight && timeptr->tm_isdst) - i = 1; - strcpy(tbuf, tzname[i]); - break; - -#ifdef SYSV_EXT - case 'n': /* same as \n */ - tbuf[0] = '\n'; - tbuf[1] = '\0'; - break; - - case 't': /* same as \t */ - tbuf[0] = '\t'; - tbuf[1] = '\0'; - break; - - case 'D': /* date as %m/%d/%y */ - strftime(tbuf, sizeof tbuf, "%m/%d/%y", timeptr); - break; - - case 'e': /* day of month, blank padded */ - sprintf(tbuf, "%2d", range(1, timeptr->tm_mday, 31)); - break; - - case 'r': /* time as %I:%M:%S %p */ - strftime(tbuf, sizeof tbuf, "%I:%M:%S %p", timeptr); - break; - - case 'R': /* time as %H:%M */ - strftime(tbuf, sizeof tbuf, "%H:%M", timeptr); - break; - - case 'T': /* time as %H:%M:%S */ - strftime(tbuf, sizeof tbuf, "%H:%M:%S", timeptr); - break; -#endif - - -#ifdef VMS_EXT - case 'V': /* date as dd-bbb-YYYY */ - sprintf(tbuf, "%2d-%3.3s-%4d", - range(1, timeptr->tm_mday, 31), - months_a[range(0, timeptr->tm_mon, 11)], - timeptr->tm_year + 1900); - for (i = 3; i < 6; i++) - if (islower(tbuf[i])) - tbuf[i] = toupper(tbuf[i]); - break; -#endif - - -#ifdef POSIX2_DATE - case 'C': - sprintf(tbuf, "%02d", (timeptr->tm_year + 1900) / 100); - break; - - - case 'E': - case 'O': - /* POSIX locale extensions, ignored for now */ - goto again; -#endif - default: - tbuf[0] = '%'; - tbuf[1] = *format; - tbuf[2] = '\0'; - break; - } - i = strlen(tbuf); - if (i) { - if (s + i < endp - 1) { - strcpy(s, tbuf); - s += i; - } else - return 0; - } - } -out: - if (s < endp && *format == '\0') { - *s = '\0'; - return (s - start); - } else - return 0; -} - -/* weeknumber --- figure how many weeks into the year */ - -/* With thanks and tip of the hatlo to ado@elsie.nci.nih.gov */ -/* Modified byMichal Jaegermann */ - -#ifndef __STDC__ -static int -weeknumber(timeptr, firstweekday) -const struct tm *timeptr; -int firstweekday; -#else -static int -weeknumber(const struct tm *timeptr, int firstweekday) -#endif -/* - * firstweekday is 0 if starting in Sunday, non-zero if in Monday - */ -{ - return (timeptr->tm_yday - timeptr->tm_wday + - (firstweekday ? (timeptr->tm_wday ? 8 : 1) : 7)) / 7; -} -- 2.11.4.GIT