time: move time functions out of lib.c into time.c.

* Makefile (OBJS): Add new time.o.

* eval.c (eval_init): Registration of time functions is
removed from here; it is done in time_init now, in time.c.

* hash.c: Must #include "time.h" now.

* lib.c (time_s, time_local_s, time_utc_s, time_string_s,
time_parse_s, year_s, month_s, day_s, hour_s, min_s, sec_s,
dst_s, gmtoff_s, zone_s): Variable definitions removed.
These are now in time.c. Also declared in time.h.
(time_sec, time_sec_usec, gmtime_r, localtime_r, string_time,
time_string_local, time_string_utc, broken_time_list,
tm_to_time_struct, broken_time_struct, time_fields_local,
time_fields_utc, time_struct_local, time_struct_utc,
time_fields_to_tm, time_struct_to_tm, make_time_impl,
make_time, epoch_tm, strptime_wrap, time_parse, setenv,
unsetenv, timegm_hack, make_time_utc, time_meth,
time_string_meth, time_parse_meth, time_parse_local,
time_parse_utc): Functions removed. These are now in time.c.
(time_init): Removed, and now in time.c as an external
function.

* lib.h (time_sec, time_sec_usec, time_string_local,
time_string_utc, time_fields_local, time_fields_utc,
time_struct_local, time_struct_utc, make_time, make_time_utc,
time_parse, time_parse_local, time_parse_utc): Declarations
removed. Now in time.h.

* rand.c: Must #include "time.h" now.

* time.c: New file.

* time.h: New file.

1 files changed, 1 insertions, 454 deletions

diff --git a/lib.c b/lib.c
index 0f7595c4..6e46039f 100644
--- a/lib.c
+++ b/lib.c
@@ -35,9 +35,7 @@
 #include <errno.h>
 #include <wchar.h>
 #include <math.h>
-#include <time.h>
 #include <signal.h>
-#include <sys/time.h>
 #include <assert.h>
 #include "config.h"
 #include "alloca.h"
@@ -64,6 +62,7 @@
 #include "eval.h"
 #include "vm.h"
 #include "sysif.h"
+#include "time.h"
 #include "regex.h"
 #include "parser.h"
 #include "syslog.h"
@@ -131,9 +130,6 @@ val list_f, less_f, greater_f;
 
 val prog_string;
 
-val time_s, time_local_s, time_utc_s, time_string_s, time_parse_s;
-val year_s, month_s, day_s, hour_s, min_s, sec_s, dst_s, gmtoff_s, zone_s;
-
 static val env_list;
 static val recycled_conses;
 
@@ -12976,455 +12972,6 @@ val display_width(val obj)
             obj, nao);
 }
 
-val time_sec(void)
-{
-  struct timeval tv;
-  if (gettimeofday(&tv, 0) == -1)
-    return nil;
-  return num(tv.tv_sec);
-}
-
-val time_sec_usec(void)
-{
-  struct timeval tv;
-  if (gettimeofday(&tv, 0) == -1)
-    return nil;
-  return cons(num_time(tv.tv_sec), num(tv.tv_usec));
-}
-
-#if !HAVE_GMTIME_R
-struct tm *gmtime_r(const time_t *timep, struct tm *result);
-struct tm *localtime_r(const time_t *timep, struct tm *result);
-
-struct tm *gmtime_r(const time_t *timep, struct tm *result)
-{
-  struct tm *hack = gmtime(timep);
-  *result = *hack;
-  return hack;
-}
-
-struct tm *localtime_r(const time_t *timep, struct tm *result)
-{
-  struct tm *hack = localtime(timep);
-  *result = *hack;
-  return hack;
-}
-#endif
-
-static val string_time(struct tm *(*break_time_fn)(const time_t *, struct tm *),
-                       char *format, time_t time)
-{
-  char buffer[512] = "";
-  struct tm broken_out_time;
-
-  if (break_time_fn(&time, &broken_out_time) == 0)
-    return nil;
-
-#if HAVE_TM_ZONE
-  if (strcmp(broken_out_time.TM_ZONE, "GMT") == 0)
-    broken_out_time.TM_ZONE = "UTC";
-#endif
-
-  if (strftime(buffer, sizeof buffer, format, &broken_out_time) == 0)
-    buffer[0] = 0;
-
-  {
-    wchar_t *wctime = utf8_dup_from(buffer);
-    return string_own(wctime);
-  }
-}
-
-val time_string_local(val time, val format)
-{
-  val self = lit("time-string-local");
-  time_t secs = c_time(time, self);
-  const wchar_t *wcfmt = c_str(format);
-  char *u8fmt = utf8_dup_to(wcfmt);
-  val timestr = string_time(localtime_r, u8fmt, secs);
-  free(u8fmt);
-  return timestr;
-}
-
-val time_string_utc(val time, val format)
-{
-  val self = lit("time-string-utc");
-  time_t secs = c_time(time, self);
-  const wchar_t *wcfmt = c_str(format);
-  char *u8fmt = utf8_dup_to(wcfmt);
-  val timestr = string_time(gmtime_r, u8fmt, secs);
-  free(u8fmt);
-  return timestr;
-}
-
-static val broken_time_list(struct tm *tms)
-{
-  return list(num(tms->tm_year + 1900),
-              num_fast(tms->tm_mon + 1),
-              num_fast(tms->tm_mday),
-              num_fast(tms->tm_hour),
-              num_fast(tms->tm_min),
-              num_fast(tms->tm_sec),
-              tms->tm_isdst ? t : nil,
-              nao);
-}
-
-static void tm_to_time_struct(val time_struct, struct tm *ptm)
-{
-  slotset(time_struct, year_s, num(ptm->tm_year + 1900));
-  slotset(time_struct, month_s, num_fast(ptm->tm_mon + 1));
-  slotset(time_struct, day_s, num_fast(ptm->tm_mday));
-  slotset(time_struct, hour_s, num_fast(ptm->tm_hour));
-  slotset(time_struct, min_s, num_fast(ptm->tm_min));
-  slotset(time_struct, sec_s, num_fast(ptm->tm_sec));
-  slotset(time_struct, dst_s, tnil(ptm->tm_isdst));
-#if HAVE_TM_GMTOFF
-  slotset(time_struct, gmtoff_s, num_fast(ptm->TM_GMTOFF));
-#endif
-#if HAVE_TM_ZONE
-  slotset(time_struct, zone_s, if2(ptm->TM_ZONE, string_utf8(ptm->TM_ZONE)));
-#endif
-}
-
-static val broken_time_struct(struct tm *tms)
-{
-  args_decl(args, ARGS_MIN);
-  val ts = make_struct(time_s, nil, args);
-
-  tm_to_time_struct(ts, tms);
-
-  return ts;
-}
-
-val time_fields_local(val time)
-{
-  val self = lit("time-fields-local");
-  struct tm tms;
-  time_t secs = c_time(time, self);
-
-  if (localtime_r(&secs, &tms) == 0)
-    return nil;
-
-  return broken_time_list(&tms);
-}
-
-val time_fields_utc(val time)
-{
-  val self = lit("time-fields-utc");
-  struct tm tms;
-  time_t secs = c_time(time, self);
-
-  if (gmtime_r(&secs, &tms) == 0)
-    return nil;
-
-  return broken_time_list(&tms);
-}
-
-val time_struct_local(val time)
-{
-  val self = lit("time-struct-local");
-  struct tm tms;
-  time_t secs = c_time(time, self);
-
-  if (localtime_r(&secs, &tms) == 0)
-    return nil;
-
-  return broken_time_struct(&tms);
-}
-
-val time_struct_utc(val time)
-{
-  val self = lit("time-struct-utc");
-  struct tm tms;
-  time_t secs = c_time(time, self);
-
-  if (gmtime_r(&secs, &tms) == 0)
-    return nil;
-
-  return broken_time_struct(&tms);
-}
-
-static void time_fields_to_tm(struct tm *ptm,
-                              val year, val month, val day,
-                              val hour, val min, val sec, val dst,
-                              val self)
-{
-  uses_or2;
-  ptm->tm_year = c_num(or2(year, zero), self) - 1900;
-  ptm->tm_mon = c_num(or2(month, zero), self) - 1;
-  ptm->tm_mday = c_num(or2(day, zero), self);
-  ptm->tm_hour = c_num(or2(hour, zero), self);
-  ptm->tm_min = c_num(or2(min, zero), self);
-  ptm->tm_sec = c_num(or2(sec, zero), self);
-
-  if (!dst)
-    ptm->tm_isdst = 0;
-  else if (dst == auto_k)
-    ptm->tm_isdst = -1;
-  else
-    ptm->tm_isdst = 1;
-
-#if HAVE_TM_GMTOFF
-  ptm->TM_GMTOFF = 0;
-#endif
-#if HAVE_TM_ZONE
-  ptm->TM_ZONE = 0;
-#endif
-}
-
-static void time_struct_to_tm(struct tm *ptm, val time_struct, val strict,
-                              val self)
-{
-  val year = slot(time_struct, year_s);
-  val month = slot(time_struct, month_s);
-  val day = slot(time_struct, day_s);
-  val hour = slot(time_struct, hour_s);
-  val min = slot(time_struct, min_s);
-  val sec = slot(time_struct, sec_s);
-  val dst = slot(time_struct, dst_s);
-
-  if (!strict) {
-    year = (year ? year : zero);
-    month = (month ? month : zero);
-    day = (day ? day : zero);
-    hour = (hour ? hour : zero);
-    min = (min ? min : zero);
-    sec = (sec ? sec : zero);
-  }
-
-  time_fields_to_tm(ptm, year, month, day, hour, min, sec, dst, self);
-}
-
-static val make_time_impl(time_t (*pmktime)(struct tm *),
-                          val year, val month, val day,
-                          val hour, val minute, val second,
-                          val isdst, val self)
-{
-  struct tm local = all_zero_init;
-  time_t time;
-
-  time_fields_to_tm(&local, year, month, day,
-                    hour, minute, second, isdst, self);
-  time = pmktime(&local);
-
-  return time == -1 ? nil : num_time(time);
-}
-
-val make_time(val year, val month, val day,
-              val hour, val minute, val second,
-              val isdst)
-{
-  val self = lit("make-time");
-  return make_time_impl(mktime, year, month, day, hour, minute, second,
-                        isdst, self);
-}
-
-#if HAVE_STRPTIME
-
-static struct tm epoch_tm(void)
-{
-  struct tm ep = all_zero_init;
-  ep.tm_year = 70;
-  ep.tm_mday = 1;
-  return ep;
-}
-
-static int strptime_wrap(val string, val format, struct tm *ptms)
-{
-  const wchar_t *w_str = c_str(string);
-  const wchar_t *w_fmt = c_str(format);
-  char *str = utf8_dup_to(w_str);
-  char *fmt = utf8_dup_to(w_fmt);
-  char *ptr = strptime(str, fmt, ptms);
-  int ret = ptr != 0;
-  free(fmt);
-  free(str);
-  return ret;
-}
-
-val time_parse(val format, val string)
-{
-  struct tm tms = epoch_tm();
-  int ret = strptime_wrap(string, format, &tms);
-  return ret ? broken_time_struct(&tms) : nil;
-}
-
-#endif
-
-#if !HAVE_SETENV
-
-void setenv(const char *name, const char *value, int overwrite)
-{
-  int len = strlen(name)+1+strlen(value)+1;
-  char *str = (char *) chk_malloc(len);
-  (void) overwrite;
-  sprintf(str, "%s=%s", name, value);
-  putenv(str);
-}
-
-void unsetenv(const char *name)
-{
-  setenv(name, "", 1);
-}
-
-#endif
-
-
-#if !HAVE_TIMEGM
-
-static time_t timegm_hack(struct tm *tm)
-{
-    time_t ret;
-    char *tz;
-
-    tz = getenv("TZ");
-    setenv("TZ", "UTC", 1);
-#if HAVE_TZSET
-    tzset();
-#endif
-    ret = mktime(tm);
-    if (tz)
-        setenv("TZ", tz, 1);
-    else
-        unsetenv("TZ");
-#if HAVE_TZSET
-    tzset();
-#endif
-
-    env_list = nil;
-    return ret;
-}
-#endif
-
-val make_time_utc(val year, val month, val day,
-                  val hour, val minute, val second,
-                  val isdst)
-{
-  val self = lit("make-time-utc");
-#if HAVE_TIMEGM
-  time_t (*pmktime)(struct tm *) = timegm;
-#else
-  time_t (*pmktime)(struct tm *) = timegm_hack;
-#endif
-
-  return make_time_impl(pmktime, year, month, day, hour, minute, second,
-                        isdst, self);
-}
-
-static val time_meth(val utc_p, val time_struct)
-{
-  val year = slot(time_struct, year_s);
-  val month = slot(time_struct, month_s);
-  val day = slot(time_struct, day_s);
-  val hour = slot(time_struct, hour_s);
-  val min = slot(time_struct, min_s);
-  val sec = slot(time_struct, sec_s);
-  val dst = slot(time_struct, dst_s);
-
-  return (utc_p ? make_time_utc : make_time)(year, month, day,
-                                             hour, min, sec, dst);
-}
-
-static val time_string_meth(val time_struct, val format)
-{
-  val self = lit("(meth time-string)");
-  struct tm tms = all_zero_init;
-  time_struct_to_tm(&tms, time_struct, t, self);
-  char buffer[512] = "";
-  char *fmt = utf8_dup_to(c_str(format));
-
-  if (strftime(buffer, sizeof buffer, fmt, &tms) == 0)
-    buffer[0] = 0;
-
-  free(fmt);
-
-  return string_own(utf8_dup_from(buffer));
-}
-
-#if HAVE_STRPTIME
-
-static val time_parse_meth(val time_struct, val format, val string)
-{
-  val self = lit("(meth time-parse)");
-  struct tm tms = all_zero_init;
-  time_struct_to_tm(&tms, time_struct, nil, self);
-  val ret = nil;
-
-  {
-    const wchar_t *w_str = c_str(string);
-    const wchar_t *w_fmt = c_str(format);
-    char *str = utf8_dup_to(w_str);
-    char *fmt = utf8_dup_to(w_fmt);
-    char *ptr = strptime(str, fmt, &tms);
-
-    if (ptr != 0) {
-      tm_to_time_struct(time_struct, &tms);
-      ret = string_utf8(ptr);
-    }
-
-    free(fmt);
-    free(str);
-  }
-
-  return ret;
-}
-
-val time_parse_local(val format, val string)
-{
-  struct tm tms = epoch_tm();
-  if (!strptime_wrap(string, format, &tms))
-    return nil;
-  return num(mktime(&tms));
-}
-
-val time_parse_utc(val format, val string)
-{
-  struct tm tms = epoch_tm();
-  if (!strptime_wrap(string, format, &tms))
-    return nil;
-#if HAVE_TIMEGM
-  return num_time(timegm(&tms));
-#else
-  return num_time(timegm_hack(&tms));
-#endif
-}
-
-#endif
-
-static void time_init(void)
-{
-  val time_st;
-
-  time_s = intern(lit("time"), user_package);
-  time_local_s = intern(lit("time-local"), user_package);
-  time_utc_s = intern(lit("time-utc"), user_package);
-  time_string_s = intern(lit("time-string"), user_package);
-  time_parse_s = intern(lit("time-parse"), user_package);
-  year_s = intern(lit("year"), user_package);
-  month_s = intern(lit("month"), user_package);
-  day_s = intern(lit("day"), user_package);
-  hour_s = intern(lit("hour"), user_package);
-  min_s = intern(lit("min"), user_package);
-  sec_s = intern(lit("sec"), user_package);
-  dst_s = intern(lit("dst"), user_package);
-  gmtoff_s = intern(lit("gmtoff"), user_package);
-  zone_s = intern(lit("zone"), user_package);
-
-  time_st = make_struct_type(time_s, nil,
-                             list(time_local_s, time_utc_s,
-                                  time_string_s, time_parse_s, nao),
-                             list(year_s, month_s, day_s,
-                                  hour_s, min_s, sec_s, dst_s,
-                                  gmtoff_s, zone_s, nao),
-                             nil, nil, nil, nil);
-
-  static_slot_set(time_st, time_local_s, func_f1(nil, time_meth));
-  static_slot_set(time_st, time_utc_s, func_f1(t, time_meth));
-  static_slot_set(time_st, time_string_s, func_n2(time_string_meth));
-#if HAVE_STRPTIME
-  static_slot_set(time_st, time_parse_s, func_n3(time_parse_meth));
-#endif
-}
-
 void init(val *stack_bottom)
 {
   int gc_save;