[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
gmtime_r
From: |
Kevin Ryde |
Subject: |
gmtime_r |
Date: |
Sat, 20 Mar 2004 08:11:13 +1000 |
User-agent: |
Gnus/5.110002 (No Gnus v0.2) Emacs/21.3 (gnu/linux) |
* stime.c (scm_gmtime): Use gmtime_r when available, for thread safety.
--- stime.c.~1.86.~ 2004-03-07 09:04:24.000000000 +1000
+++ stime.c 2004-03-18 15:15:33.000000000 +1000
@@ -397,6 +397,13 @@
}
#undef FUNC_NAME
+/* tm_zone is normally a pointer, not an array within struct tm, so we might
+ have to worry about the lifespan of what it points to. The posix specs
+ don't seem to say anything about this, let's assume for gmtime that
+ tm_zone will be a constant and therefore no protection or anything is
+ needed in between it returning and our making a copy of the string in
+ filltime(). */
+
SCM_DEFINE (scm_gmtime, "gmtime", 1, 0, 0,
(SCM time),
"Return an object representing the broken down components of\n"
@@ -405,26 +412,33 @@
#define FUNC_NAME s_scm_gmtime
{
timet itime;
- struct tm *bd_time;
- SCM result;
+ struct tm bd_buf, *bd_time;
const char *zname;
itime = SCM_NUM2LONG (1, time);
- SCM_DEFER_INTS;
+
/* POSIX says gmtime sets errno, but C99 doesn't say that.
Give a sensible default value in case gmtime doesn't set it. */
errno = EINVAL;
+
+#if HAVE_GMTIME_R
+ bd_time = gmtime_r (&itime, &bd_buf);
+#else
+ SCM_DEFER_INTS;
bd_time = gmtime (&itime);
+ if (bd_time != NULL)
+ bd_buf = *bd_time;
+ SCM_ALLOW_INTS;
+#endif
if (bd_time == NULL)
SCM_SYSERROR;
+
#if HAVE_STRUCT_TM_TM_ZONE
- zname = bd_time->tm_zone;
+ zname = bd_buf.tm_zone;
#else
zname = "GMT";
#endif
- result = filltime (bd_time, 0, zname);
- SCM_ALLOW_INTS;
- return result;
+ return filltime (&bd_buf, 0, zname);
}
#undef FUNC_NAME
[Prev in Thread] |
Current Thread |
[Next in Thread] |