diff options
| -rw-r--r-- | compat/Makefile.local | 4 | ||||
| -rw-r--r-- | compat/compat.h | 5 | ||||
| -rw-r--r-- | compat/have_timegm.c | 7 | ||||
| -rw-r--r-- | compat/timegm.c | 56 | ||||
| -rwxr-xr-x | configure | 11 | ||||
| -rw-r--r-- | parse-time-string/parse-time-string.c | 1 |
6 files changed, 84 insertions, 0 deletions
diff --git a/compat/Makefile.local b/compat/Makefile.local index 2c4f65fc..b0d5417f 100644 --- a/compat/Makefile.local +++ b/compat/Makefile.local @@ -17,4 +17,8 @@ ifneq ($(HAVE_STRSEP),1) notmuch_compat_srcs += $(dir)/strsep.c endif +ifneq ($(HAVE_TIMEGM),1) +notmuch_compat_srcs += $(dir)/timegm.c +endif + SRCS := $(SRCS) $(notmuch_compat_srcs) diff --git a/compat/compat.h b/compat/compat.h index ae762c30..5a402d5c 100644 --- a/compat/compat.h +++ b/compat/compat.h @@ -57,6 +57,11 @@ char* strcasestr(const char *haystack, const char *needle); char *strsep(char **stringp, const char *delim); #endif /* !HAVE_STRSEP */ +#if !HAVE_TIMEGM +#include <time.h> +time_t timegm (struct tm *tm); +#endif /* !HAVE_TIMEGM */ + /* Silence gcc warnings about unused results. These warnings exist * for a reason; any use of this needs to be justified. */ #ifdef __GNUC__ diff --git a/compat/have_timegm.c b/compat/have_timegm.c new file mode 100644 index 00000000..b62b7937 --- /dev/null +++ b/compat/have_timegm.c @@ -0,0 +1,7 @@ +#include <time.h> +#include "compat.h" + +int main() +{ + return (int) timegm((struct tm *)0); +} diff --git a/compat/timegm.c b/compat/timegm.c new file mode 100644 index 00000000..3560c370 --- /dev/null +++ b/compat/timegm.c @@ -0,0 +1,56 @@ +/* timegm.c --- Implementation of replacement timegm function. + + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License as + published by the Free Software Foundation; either version 3, or (at + your option) any later version. + + This program is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301, USA. */ + +/* Copyright 2013 Blake Jones. */ + +#include <time.h> +#include "compat.h" + +static int +leapyear (int year) +{ + return ((year % 4) == 0 && ((year % 100) != 0 || (year % 400) == 0)); +} + +/* + * This is a simple implementation of timegm() which does what is needed + * by create_output() -- just turns the "struct tm" into a GMT time_t. + * It does not normalize any of the fields of the "struct tm", nor does + * it set tm_wday or tm_yday. + */ +time_t +timegm (struct tm *tm) +{ + int monthlen[2][12] = { + { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }, + { 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }, + }; + int year, month, days; + + days = 365 * (tm->tm_year - 70); + for (year = 70; year < tm->tm_year; year++) { + if (leapyear(1900 + year)) { + days++; + } + } + for (month = 0; month < tm->tm_mon; month++) { + days += monthlen[leapyear(1900 + year)][month]; + } + days += tm->tm_mday - 1; + + return ((((days * 24) + tm->tm_hour) * 60 + tm->tm_min) * 60 + tm->tm_sec); +} @@ -530,6 +530,17 @@ else fi rm -f compat/have_strsep +printf "Checking for timegm... " +if ${CC} -o compat/have_timegm "$srcdir"/compat/have_timegm.c > /dev/null 2>&1 +then + printf "Yes.\n" + have_timegm="1" +else + printf "No (will use our own instead).\n" + have_timegm="0" +fi +rm -f compat/have_timegm + printf "Checking for standard version of getpwuid_r... " if ${CC} -o compat/check_getpwuid "$srcdir"/compat/check_getpwuid.c > /dev/null 2>&1 then diff --git a/parse-time-string/parse-time-string.c b/parse-time-string/parse-time-string.c index 584067d3..ccad422b 100644 --- a/parse-time-string/parse-time-string.c +++ b/parse-time-string/parse-time-string.c @@ -32,6 +32,7 @@ #include <sys/time.h> #include <sys/types.h> +#include "compat.h" #include "parse-time-string.h" /* |