[[ TimeZoneLibrary ]] Tweak timezone library for use with LCB

livecodeali · livecodeali · commit 38776781b9c6 · 2018-02-20T16:46:23.000Z
This patch exposes tzsetlcl to enable setting the locale manually
by calling into the library, and adds the ability to set the
search path for the timezone database files.
diff --git a/extensions/libraries/timezone/tz/localtime.c b/extensions/libraries/timezone/tz/localtime.c
@@ -12,6 +12,7 @@
 
 #define LOCALTIME_IMPLEMENTATION
 #include "private.h"
+#include "tz.h"
 
 #include "tzfile.h"
 #include <fcntl.h>
@@ -357,7 +358,46 @@ union input_buffer {
 };
 
 /* TZDIR with a trailing '/' rather than a trailing '\0'.  */
-static char const tzdirslash[sizeof TZDIR] = TZDIR "/";
+static char *s_tzdirslash = NULL;
+
+bool tzsetdir(const char* dir)
+{
+    if (s_tzdirslash != NULL)
+        free(s_tzdirslash);
+    
+    size_t t_length = strlen(dir);
+    s_tzdirslash = malloc(t_length + 2);
+    if (s_tzdirslash == NULL)
+        return false;
+    
+    strcpy(s_tzdirslash, dir);
+    s_tzdirslash[t_length] = '/';
+    // Nul terminate
+    s_tzdirslash[t_length + 1] = '\0';
+    return true;
+}
+
+static const char* tzgetdirslash()
+{
+    if (s_tzdirslash == NULL)
+        tzsetdir(TZDIR);
+    
+    return s_tzdirslash;
+}
+
+#define tzdirslash tzgetdirslash()
+#ifdef _WINDOWS
+#include <windows.h>
+#ifndef PATH_MAX
+#define PATH_MAX MAX_PATH
+#endif
+#endif
+
+#if !defined(__HAVE_SSIZE_T__)
+typedef intptr_t ssize_t;
+
+#	define SSIZE_MAX INTPTR_MAX
+#endif
 
 /* Local storage needed for 'tzloadbody'.  */
 union local_storage {
@@ -372,7 +412,7 @@ union local_storage {
 
   /* The file name to be opened.  */
   char fullname[BIGGEST(sizeof (struct file_analysis),
-			sizeof tzdirslash + 1024)];
+			PATH_MAX)];
 };
 
 /* Load tz data from the file named NAME into *SP.  Read extended
@@ -409,14 +449,14 @@ tzloadbody(char const *name, struct state *sp, bool doextend,
 #endif
 	if (!doaccess) {
 		size_t namelen = strlen(name);
-		if (sizeof lsp->fullname - sizeof tzdirslash <= namelen)
+		if (sizeof lsp->fullname - strlen(tzdirslash) <= namelen)
 		  return ENAMETOOLONG;
 
 		/* Create a string "TZDIR/NAME".  Using sprintf here
 		   would pull in stdio (and would fail if the
 		   resulting string length exceeded INT_MAX!).  */
-		memcpy(lsp->fullname, tzdirslash, sizeof tzdirslash);
-		strcpy(lsp->fullname + sizeof tzdirslash, name);
+		memcpy(lsp->fullname, tzdirslash, strlen(tzdirslash));
+		strcpy(lsp->fullname + strlen(tzdirslash), name);
 
 		/* Set doaccess if '.' (as in "../") shows up in name.  */
 		if (strchr(name, '.'))
@@ -1316,7 +1356,7 @@ zoneinit(struct state *sp, char const *name)
   }
 }
 
-static void
+void
 tzsetlcl(char const *name)
 {
   struct state *sp = lclptr;
@@ -1353,7 +1393,8 @@ tzsetwall(void)
 static void
 tzset_unlocked(void)
 {
-  tzsetlcl(getenv("TZ"));
+  // Control locale externally using tzsetlcl
+  //tzsetlcl(getenv("TZ"));
 }
 
 void
@@ -1536,11 +1577,13 @@ localtime_tzset(time_t const *timep, struct tm *tmp, bool setname)
   return tmp;
 }
 
+#if 0
 struct tm *
 localtime(const time_t *timep)
 {
   return localtime_tzset(timep, &tm, true);
 }
+#endif
 
 struct tm *
 localtime_r(const time_t *timep, struct tm *tmp)
@@ -1582,11 +1625,13 @@ gmtime_r(const time_t *timep, struct tm *tmp)
   return gmtsub(gmtptr, timep, 0, tmp);
 }
 
+#if 0
 struct tm *
 gmtime(const time_t *timep)
 {
   return gmtime_r(timep, &tm);
 }
+#endif 
 
 #ifdef STD_INSPIRED
 
@@ -1731,6 +1776,7 @@ timesub(const time_t *timep, int_fast32_t offset,
 	return NULL;
 }
 
+#if 0
 char *
 ctime(const time_t *timep)
 {
@@ -1743,6 +1789,7 @@ ctime(const time_t *timep)
   struct tm *tmp = localtime(timep);
   return tmp ? asctime(tmp) : NULL;
 }
+#endif
 
 char *
 ctime_r(const time_t *timep, char *buf)
@@ -2163,7 +2210,7 @@ mktime_z(struct state *sp, struct tm *tmp)
 #endif
 
 time_t
-mktime(struct tm *tmp)
+mktime_tz(struct tm *tmp)
 {
   time_t t;
   int err = lock();
diff --git a/extensions/libraries/timezone/tz/private.h b/extensions/libraries/timezone/tz/private.h
@@ -104,6 +104,12 @@
 # define NETBSD_INSPIRED 1
 #endif
 
+#ifdef WIN32
+#undef HAVE_UNISTD_H
+#undef HAVE_SYS_WAIT_H
+#undef HAVE_POSIX_DECLS
+#endif
+
 #if HAVE_INCOMPATIBLE_CTIME_R
 #define asctime_r _incompatible_asctime_r
 #define ctime_r _incompatible_ctime_r
