[src/trunk]: src/lib/libutil Always use localtime_r; I don't think any of thi...

[dholland <dholland%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/7003287e0477
branches:  trunk
changeset: 342603:7003287e0477
user:      dholland <dholland%NetBSD.org@localhost>
date:      Thu Dec 31 10:31:07 2015 +0000

description:
Always use localtime_r; I don't think any of this code is tripping
itself up, but it's still good practice for library functions to not
trash static libc state. Might be relevant to PR 50574.

diffstat:

 lib/libutil/parsedate.y |  30 ++++++++++++++----------------
 1 files changed, 14 insertions(+), 16 deletions(-)

diffs (78 lines):

diff -r b4db40ca0657 -r 7003287e0477 lib/libutil/parsedate.y
--- a/lib/libutil/parsedate.y   Thu Dec 31 10:21:02 2015 +0000
+++ b/lib/libutil/parsedate.y   Thu Dec 31 10:31:07 2015 +0000
@@ -14,7 +14,7 @@
 
 #include <sys/cdefs.h>
 #ifdef __RCSID
-__RCSID("$NetBSD: parsedate.y,v 1.25 2015/12/31 09:12:57 dholland Exp $");
+__RCSID("$NetBSD: parsedate.y,v 1.26 2015/12/31 10:31:07 dholland Exp $");
 #endif
 
 #include <stdio.h>
@@ -686,15 +686,15 @@
 {
     time_t     StartDay;
     time_t     FutureDay;
-    struct tm  *tm;
+    struct tm  tm;
 
-    if ((tm = localtime(&Start)) == NULL)
+    if (localtime_r(&Start, &tm) == NULL)
        return -1;
-    StartDay = (tm->tm_hour + 1) % 24;
+    StartDay = (tm.tm_hour + 1) % 24;
 
-    if ((tm = localtime(&Future)) == NULL)
+    if (localtime_r(&Future, &tm) == NULL)
        return -1;
-    FutureDay = (tm->tm_hour + 1) % 24;
+    FutureDay = (tm.tm_hour + 1) % 24;
 
     return (Future - Start) + (StartDay - FutureDay) * 60L * 60L;
 }
@@ -707,14 +707,13 @@
     time_t     DayNumber
 )
 {
-    struct tm  *tm;
+    struct tm  tm;
     time_t     now;
 
     now = Start;
-    tm = localtime(&now);
-    if (tm == NULL)
+    if (localtime_r(&now, &tm) == NULL)
        return -1;
-    now += SECSPERDAY * ((DayNumber - tm->tm_wday + 7) % 7);
+    now += SECSPERDAY * ((DayNumber - tm.tm_wday + 7) % 7);
     now += 7 * SECSPERDAY * (DayOrdinal <= 0 ? DayOrdinal : DayOrdinal - 1);
     return DSTcorrect(Start, now);
 }
@@ -727,21 +726,20 @@
     time_t     Timezone
 )
 {
-    struct tm  *tm;
+    struct tm  tm;
     time_t     Month;
     time_t     Year;
 
     if (RelMonth == 0)
        return 0;
-    tm = localtime(&Start);
-    if (tm == NULL)
+    if (localtime_r(&Start, &tm) == NULL)
        return -1;
-    Month = 12 * (tm->tm_year + 1900) + tm->tm_mon + RelMonth;
+    Month = 12 * (tm.tm_year + 1900) + tm.tm_mon + RelMonth;
     Year = Month / 12;
     Month = Month % 12 + 1;
     return DSTcorrect(Start,
-           Convert(Month, (time_t)tm->tm_mday, Year,
-               (time_t)tm->tm_hour, (time_t)tm->tm_min, (time_t)tm->tm_sec,
+           Convert(Month, (time_t)tm.tm_mday, Year,
+               (time_t)tm.tm_hour, (time_t)tm.tm_min, (time_t)tm.tm_sec,
                Timezone, MER24, DSTmaybe));
 }