unix-time 0.4.6 → 0.4.7

raw patch · 5 files changed

+21/−11 lines, 5 filesPVP ok

version bump matches the API change (PVP)

API changes (from Hackage documentation)

Files

• Data/UnixTime/Conv.hs +1/−0
• cbits/conv.c +1/−1
• cbits/strftime.c +2/−1
• cbits/win_patch.c +16/−8
• unix-time.cabal +1/−1

@@ -71,6 +71,7 @@ -- This is a wrapper for strftime_l(). -- 'utMicroSeconds' is ignored. -- The result depends on the TZ environment variable.+--  formatUnixTime :: Format -> UnixTime -> IO ByteString formatUnixTime fmt t =

@@ -50,7 +50,7 @@     char *tz;     tz = getenv("TZ"); #if defined(_WIN32)-    _patch_setenv("TZ", "", 1);+    _patch_setenv("TZ", "UTC", 1); #else     setenv("TZ", "", 1); #endif

@@ -522,7 +522,8 @@ #ifdef ALTZONE 					diff = -altzone; #else /* !defined ALTZONE */-					continue;+					// Fix the daylight saving time, see #54.+					diff = -(_timezone - 3600 * t->tm_isdst); #endif /* !defined ALTZONE */ #endif /* !defined TM_GMTOFF */ 				if (diff < 0) {

@@ -100,18 +100,26 @@ };  -int _patch_setenv(const char *var, const char *val, int ovr) {-    BOOL b = SetEnvironmentVariableA(var, val);-    if (b) {-        return 0;-    } else {-        return 1;+int _patch_setenv(const char *var, const char *val, int _ovr) {+    if (val == NULL) {+        return _patch_unsetenv(var);     }+    int varlen = strlen(var);+    int vallen = strlen(val);+    int len = varlen + vallen + 2;+    char *sname = (char *)malloc(len);+    strcpy(sname, var);+    sname[varlen] = '=';+    strcpy(sname + varlen + 1, val);+    sname[varlen + vallen + 1] = '\0';+    int r = _putenv(sname);+    free(sname);+    return r; }  int _patch_unsetenv(const char *name) {-    int len = strlen(name);-    char *sname = (char *)malloc(len + 2);+    int len = strlen(name) + 2;+    char *sname = (char *)malloc(len);     strcpy(sname, name);     sname[len] = '=';     sname[len + 1] = '\0';

@@ -1,5 +1,5 @@ Name:                   unix-time-Version:                0.4.6+Version:                0.4.7 Author:                 Kazu Yamamoto <kazu@iij.ad.jp> Maintainer:             Kazu Yamamoto <kazu@iij.ad.jp> License:                BSD3