From 38474b93d2397618cf0a8a6c87251f4743c1bbf0 Mon Sep 17 00:00:00 2001 From: Blake Jones Date: Sun, 4 Nov 2012 20:16:02 +1700 Subject: [PATCH] [PATCH 10/10] timegm: add portable implementation (Solaris support) --- 12/9949d1d52b3c2a2b1655df3ca7b1311d35a46f | 133 ++++++++++++++++++++++ 1 file changed, 133 insertions(+) create mode 100644 12/9949d1d52b3c2a2b1655df3ca7b1311d35a46f diff --git a/12/9949d1d52b3c2a2b1655df3ca7b1311d35a46f b/12/9949d1d52b3c2a2b1655df3ca7b1311d35a46f new file mode 100644 index 000000000..59a94c352 --- /dev/null +++ b/12/9949d1d52b3c2a2b1655df3ca7b1311d35a46f @@ -0,0 +1,133 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id AEE03431FB6 + for ; Sat, 3 Nov 2012 20:24:19 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 0 +X-Spam-Level: +X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none] + autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id wmoXqTgaSg+O for ; + Sat, 3 Nov 2012 20:24:19 -0700 (PDT) +Received: from foo.net (70-36-235-136.dsl.static.sonic.net [70.36.235.136]) + (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 07590431FAF + for ; Sat, 3 Nov 2012 20:24:18 -0700 (PDT) +Received: from foo.net (localhost [127.0.0.1]) + by foo.net (8.14.5+Sun/8.14.5) with ESMTP id qA43GHLR025715; + Sat, 3 Nov 2012 20:16:17 -0700 (PDT) +Received: (from blakej@localhost) + by foo.net (8.14.5+Sun/8.14.5/Submit) id qA43GHCQ025714; + Sat, 3 Nov 2012 20:16:17 -0700 (PDT) +From: Blake Jones +To: notmuch@notmuchmail.org +Subject: [PATCH 10/10] timegm: add portable implementation (Solaris support) +Date: Sat, 3 Nov 2012 20:16:02 -0700 +Message-Id: <1351998962-25135-11-git-send-email-blakej@foo.net> +X-Mailer: git-send-email 1.7.3.2 +In-Reply-To: <1351998962-25135-1-git-send-email-blakej@foo.net> +References: <1351998962-25135-1-git-send-email-blakej@foo.net> +X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-2.0.2 + (foo.net [127.0.0.1]); Sat, 03 Nov 2012 20:16:17 -0700 (PDT) +X-Mailman-Approved-At: Sun, 04 Nov 2012 01:30:19 -0800 +Cc: Blake Jones +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Sun, 04 Nov 2012 03:24:19 -0000 + +The timegm(3) function is a non-standard extension to libc which is +available in GNU libc and on some BSDs. Although SunOS had this +function in its libc, Solaris (unfortunately) removed it. This patch +implements a very simple version of timegm() which is good enough for +parse-time-string.c. + +Although notmuch's idiom for portability is to test for native +availability and put alternate versions in compat/, that approach led to +a compilation problem in this case. libnotmuch.a includes a call to +parse_time_string() from parse-time-vrp.o, and parse_time_string() in +libparse-time-string.a needs to call timegm(). An attempt to create +compat/timegm.c caused the link to fail, because libparse-time-string.a +acquired a dependency on the new timegm.o in libnotmuch.a, and the +linker only does a single pass on each ".a" looking for dependencies. +This seems to be the case both for the GNU linker and the Solaris +linker. A different possible workaround would have been to include +libnotmuch.a multiple times on the link line, but that seemed like a +brittle way to track this dependency. +--- + parse-time-string/parse-time-string.c | 37 ++++++++++++++++++++++++++++++++- + 1 file changed, 36 insertions(+), 1 deletion(-) + +diff --git a/parse-time-string/parse-time-string.c b/parse-time-string/parse-time-string.c +index 584067d..28901af 100644 +--- a/parse-time-string/parse-time-string.c ++++ b/parse-time-string/parse-time-string.c +@@ -1315,6 +1315,41 @@ fixup_ampm (struct state *state) + return 0; + } + ++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. ++ */ ++static time_t ++local_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); ++} ++ + /* Combine absolute and relative fields, and round. */ + static int + create_output (struct state *state, time_t *t_out, const time_t *ref, +@@ -1465,7 +1500,7 @@ create_output (struct state *state, time_t *t_out, const time_t *ref, + if (is_field_set (state, TM_TZ)) { + /* tm is in specified TZ, convert to UTC for timegm(3). */ + tm.tm_min -= get_field (state, TM_TZ); +- t = timegm (&tm); ++ t = local_timegm (&tm); + } else { + /* tm is in local time. */ + t = mktime (&tm); +-- +1.7.9.2 + -- 2.26.2