From: Blake Jones <blakej@foo.net>
To: notmuch@notmuchmail.org
Cc: Blake Jones <blakej@foo.net>
Subject: [PATCH 10/10] timegm: add portable implementation (Solaris support)
Date: Sat, 3 Nov 2012 20:16:02 -0700 [thread overview]
Message-ID: <1351998962-25135-11-git-send-email-blakej@foo.net> (raw)
In-Reply-To: <1351998962-25135-1-git-send-email-blakej@foo.net>
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
next prev parent reply other threads:[~2012-11-04 3:24 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-04 3:15 [PATCH 00/10] Solaris support Blake Jones
2012-11-04 3:15 ` [PATCH 01/10] getpwuid: check for standards compliance (Solaris support) Blake Jones
2012-11-04 3:15 ` [PATCH 02/10] asctime: " Blake Jones
2012-11-04 3:15 ` [PATCH 03/10] gethostbyname: check for libnsl " Blake Jones
2012-11-04 3:15 ` [PATCH 04/10] configure: check for -Wl,-rpath " Blake Jones
2012-11-04 3:15 ` [PATCH 05/10] install: check for non-SysV version " Blake Jones
2012-11-04 21:31 ` Jani Nikula
2012-11-05 5:27 ` Blake Jones
2012-11-05 11:29 ` Jani Nikula
2012-11-05 14:52 ` Blake Jones
2012-11-04 3:15 ` [PATCH 06/10] strsep: check for availability " Blake Jones
2012-11-04 3:15 ` [PATCH 07/10] gen-version-script: parse Solaris "nm" output " Blake Jones
2012-11-04 3:16 ` [PATCH 08/10] notmuch-config: header for index() prototype " Blake Jones
2012-11-04 21:16 ` Jani Nikula
2012-11-04 21:47 ` Tomi Ollila
2012-11-05 4:52 ` Blake Jones
2012-11-04 3:16 ` [PATCH 09/10] debugger.c: correct return type from getppid() " Blake Jones
2012-11-04 3:16 ` Blake Jones [this message]
2012-11-04 10:21 ` [PATCH 10/10] timegm: add portable implementation " Jani Nikula
2012-11-04 15:40 ` Blake Jones
2012-11-04 20:58 ` Jani Nikula
2012-11-05 4:50 ` Blake Jones
2012-11-05 12:09 ` Tomi Ollila
2012-11-05 15:47 ` Blake Jones
2012-11-05 17:36 ` Tomi Ollila
2012-11-05 18:33 ` Blake Jones
2012-11-04 21:35 ` [PATCH 00/10] Solaris support Jani Nikula
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://notmuchmail.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1351998962-25135-11-git-send-email-blakej@foo.net \
--to=blakej@foo.net \
--cc=notmuch@notmuchmail.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://yhetil.org/notmuch.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).