Commit the new time stuff, even though I haven't made it threadsafe yet.

At least people can play with it.  Also, fix a buglet in setenv.c.

21 files changed, 1879 insertions, 2203 deletions

diff --git a/libc/misc/time/Makefile b/libc/misc/time/Makefile
index 3e0845799..425e2713d 100644
--- a/libc/misc/time/Makefile
+++ b/libc/misc/time/Makefile
@@ -24,13 +24,19 @@
 TOPDIR=../../../
 include $(TOPDIR)Rules.mak
 
-CSRC=localtime.c gmtime.c asctime.c ctime.c asc_conv.c tm_conv.c mktime.c \
-	localtime_r.c gmtime_r.c asctime_r.c ctime_r.c utimes.c adjtime.c \
-	clock.c difftime.c ftime.c strftime.c strptime.c __time_locale.c \
-	__time_static.c
+MSRC= time.c
+MOBJ= asctime.o asctime_r.o clock.o ctime.o ctime_r.o gmtime.o gmtime_r.o \
+	localtime.o localtime_r.o mktime.o strftime.o strptime.o tzset.o \
+	_time_t2tm.o __time_tm.o _time_mktime.o
 
+ifeq ($(HAS_FLOATING_POINT),true)
+	MOBJ += difftime.o 
+endif
+
+CSRC= adjtime.c ftime.c
 COBJS=$(patsubst %.c,%.o, $(CSRC))
-OBJS=$(COBJS)
+
+OBJS=$(COBJS) $(MOBJ)
 
 all: $(OBJS) $(LIBC)
 
@@ -39,6 +45,10 @@ $(LIBC): ar-target
 ar-target: $(OBJS)
 	$(AR) $(ARFLAGS) $(LIBC) $(OBJS)
 
+$(MOBJ): $(MSRC)
+	$(CC) $(CFLAGS) -DTARGET_ARCH=$(TARGET_ARCH) -DL_$* $< -c -o $*.o
+	$(STRIPTOOL) -x -R .note -R .comment $*.o
+
 $(COBJS): %.o : %.c
 	$(CC) $(CFLAGS) -c $< -o $@
 	$(STRIPTOOL) -x -R .note -R .comment $*.o
diff --git a/libc/misc/time/README b/libc/misc/time/README
deleted file mode 100644
index da4f4e67f..000000000
--- a/libc/misc/time/README
+++ /dev/null
@@ -1,8 +0,0 @@
-Copyright (C) 1996 Robert de Bath <robert@mayday.compulink.co.uk>
-This file is part of the Linux-8086 C library and is distributed
-under the GNU Library General Public License.
-
-There are two ways of converting the time_t to a struct tm, I'm not
-quite sure which is better.
-
--Robert
diff --git a/libc/misc/time/__time_locale.c b/libc/misc/time/__time_locale.c
deleted file mode 100644
index 0d78a0a67..000000000
--- a/libc/misc/time/__time_locale.c
+++ /dev/null
@@ -1,30 +0,0 @@
-#ifndef __UCLIBC_HAS_LOCALE__
-char const __weekday_name[][10] =
-  {
-    "Sunday", "Monday", "Tuesday", "Wednesday",
-    "Thursday", "Friday", "Saturday"
-  };
-char const __ab_weekday_name[][4] =
-  {
-    "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"
-  };
-char const __month_name[][10] =
-  {
-    "January", "February", "March", "April", "May", "June",
-    "July", "August", "September", "October", "November", "December"
-  };
-char const __ab_month_name[][4] =
-  {
-    "Jan", "Feb", "Mar", "Apr", "May", "Jun",
-    "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
-  };
-
-const unsigned short int __mon_yday[2][13] =
-  {
-    /* Normal years.  */
-    { 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334, 365 },
-    /* Leap years.  */
-    { 0, 31, 60, 91, 121, 152, 182, 213, 244, 274, 305, 335, 366 }
-  };
-#endif
-
diff --git a/libc/misc/time/__time_static.c b/libc/misc/time/__time_static.c
deleted file mode 100644
index d921ced90..000000000
--- a/libc/misc/time/__time_static.c
+++ /dev/null
@@ -1,17 +0,0 @@
-
-#include <time.h>
-
-/* These globals are exported by the C library */
-char *__tzname[2] = { (char *) "GMT", (char *) "GMT" };
-int __daylight = 0;
-long int __timezone = 0L;
-/* Grumble */
-weak_alias (__tzname, tzname);
-weak_alias (__daylight, daylight);
-weak_alias (__timezone, timezone);
-
-
-/* static data for gmtime() and localtime() */
-struct tm __tmb;
-
-
diff --git a/libc/misc/time/asc_conv.c b/libc/misc/time/asc_conv.c
deleted file mode 100644
index 50c7e0834..000000000
--- a/libc/misc/time/asc_conv.c
+++ /dev/null
@@ -1,80 +0,0 @@
-#include <features.h>
-#include <ctype.h>
-#include <langinfo.h>
-#include <string.h>
-#include <time.h>
-
-/*
- * Internal ascii conversion routine, avoid use of printf, it's a bit big!
- */
-
-/*
- * Modified      Manuel Novoa III       Jan 2001
- *
- * Removed static function "hit" and did time-field fills inline and
- * put day, hour, min, and sec conversions in a loop using a small
- * table to reduce code size.
- *
- * Made daysp[] and mons[] const to move them from bss to text.
- *
- * Also fixed day conversion ... ANSI says no leading 0.
- *
- * Modified	Erik Andersen	    May 2002
- * Changed to optionally support real locales.
- *
- */
-
-#ifdef __UCLIBC_HAS_LOCALE__
-/* This is defined in locale/C-time.c in the GNU libc.  */
-extern const struct locale_data _nl_C_LC_TIME;
-#define __ab_weekday_name(DAY) (_nl_C_LC_TIME.values[_NL_ITEM_INDEX (ABDAY_1)+(DAY)].string)
-#define __ab_month_name(MON)   (_nl_C_LC_TIME.values[_NL_ITEM_INDEX (ABMON_1)+(MON)].string)
-#else
-extern char const __ab_weekday_name[][4];
-extern char const __ab_month_name[][4];
-#define __ab_weekday_name(DAY) (__ab_weekday_name[DAY])
-#define __ab_month_name(MON)   (__ab_month_name[MON])
-#endif
-
-void __asctime(register char *buffer, struct tm *ptm)
-{
-	char *p;
-	int tmp, i, tm_field[4];
-	/*                              012345678901234567890123456 */
-	static const char template[] = "??? ??? 00 00:00:00 0000\n";
-
-	/* Since we need memcpy below, use it here instead of strcpy. */
-	memcpy(buffer, template, sizeof(template));
-
-	if ((ptm->tm_wday >= 0) && (ptm->tm_wday <= 6)) {
-		memcpy(buffer, __ab_weekday_name(ptm->tm_wday), 3);
-	}
-
-	if ((ptm->tm_mon >= 0) && (ptm->tm_mon <= 11)) {
-		memcpy(buffer + 4, __ab_month_name(ptm->tm_mon), 3);
-	}
-
-	tm_field[0] = ptm->tm_mday;
-	tm_field[1] = ptm->tm_hour;
-	tm_field[2] = ptm->tm_min;
-	tm_field[3] = ptm->tm_sec;
-
-	p = buffer + 9;
-	for (i=0 ; i<4 ; i++) {
-		tmp = tm_field[i];
-		*p-- += tmp % 10;
-		*p += (tmp/10) % 10;
-		p += 4 ;				/* skip to end of next field */
-	}
-
-	tmp = ptm->tm_year + 1900;
-	p = buffer + 23;
-	for (i=0 ; i<4 ; i++) {
-		*p-- += tmp % 10;
-		tmp /= 10;
-	}
-
-	if (buffer[8] == '0') {
-		buffer[8] = ' ';
-	}
-}
diff --git a/libc/misc/time/asctime.c b/libc/misc/time/asctime.c
deleted file mode 100644
index 9d5772335..000000000
--- a/libc/misc/time/asctime.c
+++ /dev/null
@@ -1,18 +0,0 @@
-
-#include <time.h>
-#include <errno.h>
-
-extern void __asctime();
-
-
-char * asctime (__const struct tm *timeptr)
-{
-    static char __time_buf[26];
-    if (timeptr == NULL) {
-	__set_errno (EINVAL);
-	return NULL;
-    }
-    __asctime(__time_buf, timeptr);
-    return __time_buf;
-}
-
diff --git a/libc/misc/time/asctime_r.c b/libc/misc/time/asctime_r.c
deleted file mode 100644
index 215031949..000000000
--- a/libc/misc/time/asctime_r.c
+++ /dev/null
@@ -1,16 +0,0 @@
-
-#include <time.h>
-#include <errno.h>
-
-extern void __asctime();
-
-char *asctime_r(__const struct tm *timeptr, char *buf)
-{
-    if (timeptr == NULL || buf == NULL) {
-	__set_errno (EINVAL);
-	return NULL;
-    }
-    __asctime(buf, timeptr);
-    return buf;
-}
-
diff --git a/libc/misc/time/clock.c b/libc/misc/time/clock.c
deleted file mode 100644
index 139d35868..000000000
--- a/libc/misc/time/clock.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/* Copyright (C) 1991, 1992, 1996, 1999 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#include <time.h>
-#include <unistd.h>
-#include <sys/times.h>
-
-/* Return the time used by the program so far (user time + system time).  */
-clock_t
-clock (void)
-{
-  struct tms buf;
-  long clk_tck = CLK_TCK;
-
-  /* We don't check for errors here.  The only error the kernel
-     returns is EFAULT if the value cannot be written to the struct we
-     pass a pointer to.  Otherwise the kernel returns an `unsigned
-     long' value which is the number of jiffies since system start.
-     But this number can be negative (when read as `long') when the
-     system is up for some time.  Ignoring errors should therefore
-     have no negative impacts but solve the problem.  */
-  times (&buf);
-
-  return
-      (clk_tck <= CLOCKS_PER_SEC) ? 
-      ((unsigned long) buf.tms_utime + buf.tms_stime) * (CLOCKS_PER_SEC / clk_tck) : 
-      ((unsigned long) buf.tms_utime + buf.tms_stime) / (clk_tck / CLOCKS_PER_SEC);
-}
diff --git a/libc/misc/time/ctime.c b/libc/misc/time/ctime.c
deleted file mode 100644
index 027f5d5a7..000000000
--- a/libc/misc/time/ctime.c
+++ /dev/null
@@ -1,14 +0,0 @@
-
-#include <time.h>
-#include <sys/time.h>
-
-char * ctime (const time_t *t)
-{
-
-    /* According to IEEE Std 1003.1-2001: The ctime() function shall
-     * convert the time pointed to by clock, representing time in
-     * seconds since the Epoch, to local time in the form of a string.
-     * It shall be equivalent to: asctime(localtime(clock)) */
-    return asctime (localtime (t));
-}
-
diff --git a/libc/misc/time/ctime_r.c b/libc/misc/time/ctime_r.c
deleted file mode 100644
index 1b323a258..000000000
--- a/libc/misc/time/ctime_r.c
+++ /dev/null
@@ -1,10 +0,0 @@
-
-#include <time.h>
-#include <sys/time.h>
-
-char * ctime_r(const time_t *t, char *buf)
-{
-    struct tm tm;
-    return asctime_r(localtime_r(t, &tm), buf);
-} 
-
diff --git a/libc/misc/time/difftime.c b/libc/misc/time/difftime.c
deleted file mode 100644
index 88a9244ba..000000000
--- a/libc/misc/time/difftime.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/* Copyright (C) 1991, 1994, 1996 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#include <time.h>
-#include <limits.h>
-#include <sys/types.h>
-
-
-/* Return the difference between TIME1 and TIME0.  */
-double difftime (time_t time1, time_t time0)
-{
-  /* Algorithm courtesy Paul Eggert (eggert@twinsun.com).  */
-
-  time_t delta, hibit;
-
-  if (sizeof (time_t) < sizeof (double))
-    return (double) time1 - (double) time0;
-  if (sizeof (time_t) < sizeof (long double))
-    return (long double) time1 - (long double) time0;
-
-  if (time1 < time0)
-    return - difftime (time0, time1);
-
-  /* As much as possible, avoid loss of precision by computing the
-    difference before converting to double.  */
-  delta = time1 - time0;
-  if (delta >= 0)
-    return delta;
-
-  /* Repair delta overflow.  */
-  hibit = (~ (time_t) 0) << ((sizeof (time_t) * CHAR_BIT) - 1);
-
-  /* The following expression rounds twice, which means the result may not
-     be the closest to the true answer.  For example, suppose time_t is
-     64-bit signed int, long_double is IEEE 754 double with default
-     rounding, time1 = 9223372036854775807 and time0 = -1536.  Then the
-     true difference is 9223372036854777343, which rounds to
-     9223372036854777856 with a total error of 513.  But delta overflows to
-     -9223372036854774273, which rounds to -9223372036854774784, and
-     correcting this by subtracting 2 * (long_double) hibit (i.e. by adding
-     2**64 = 18446744073709551616) yields 9223372036854776832, which rounds
-     to 9223372036854775808 with a total error of 1535 instead.  This
-     problem occurs only with very large differences.  It's too painful to
-     fix this portably.  We are not alone in this problem; many C compilers
-     round twice when converting large unsigned types to small floating
-     types, so if time_t is unsigned the "return delta" above has the same
-     double-rounding problem.  */
-  return delta - 2 * (long double) hibit;
-}
diff --git a/libc/misc/time/gmtime.c b/libc/misc/time/gmtime.c
deleted file mode 100644
index e9d648037..000000000
--- a/libc/misc/time/gmtime.c
+++ /dev/null
@@ -1,13 +0,0 @@
-
-#include <time.h>
-
-extern void __tm_conv();
-
-/* Our static data lives in __time_static.c */
-extern struct tm __tmb;
-
-struct tm *gmtime(__const time_t *timep)
-{
-    __tm_conv(&__tmb, timep, 0L);
-    return &__tmb;
-}
diff --git a/libc/misc/time/gmtime_r.c b/libc/misc/time/gmtime_r.c
deleted file mode 100644
index a1502e275..000000000
--- a/libc/misc/time/gmtime_r.c
+++ /dev/null
@@ -1,12 +0,0 @@
-
-#include <time.h>
-
-extern void __tm_conv();
-
-struct tm *gmtime_r(timep, tp)
-__const time_t *timep;
-struct tm *tp;
-{
-	__tm_conv(tp, timep, 0L);
-	return tp;
-}
diff --git a/libc/misc/time/localtime.c b/libc/misc/time/localtime.c
deleted file mode 100644
index 22f5035e9..000000000
--- a/libc/misc/time/localtime.c
+++ /dev/null
@@ -1,24 +0,0 @@
-
-#include <time.h>
-#include <sys/time.h>
-
-/* Our static data lives in __time_static.c */
-extern struct tm __tmb;
-
-
-extern void __tm_conv();
-
-struct tm *localtime(__const time_t *timep)
-{
-    struct timezone tz;
-    time_t offt;
-
-    gettimeofday((void *) 0, &tz);
-
-    offt = -tz.tz_minuteswest * 60L;
-
-    /* tmb.tm_isdst = ? */
-    __tm_conv(&__tmb, timep, offt);
-
-    return &__tmb;
-}
diff --git a/libc/misc/time/localtime_r.c b/libc/misc/time/localtime_r.c
deleted file mode 100644
index 139864506..000000000
--- a/libc/misc/time/localtime_r.c
+++ /dev/null
@@ -1,22 +0,0 @@
-
-#include <time.h>
-#include <sys/time.h>
-
-extern void __tm_conv();
-
-struct tm *localtime_r(timep, tp)
-__const time_t *timep;
-struct tm *tp;
-{
-	struct timezone tz;
-	time_t offt;
-
-	gettimeofday((void *) 0, &tz);
-
-	offt = -tz.tz_minuteswest * 60L;
-
-	/* tmb.tm_isdst = ? */
-	__tm_conv(tp, timep, offt);
-
-	return tp;
-}
diff --git a/libc/misc/time/mktime.c b/libc/misc/time/mktime.c
deleted file mode 100644
index 065126e0e..000000000
--- a/libc/misc/time/mktime.c
+++ /dev/null
@@ -1,327 +0,0 @@
-/* Convert a `struct tm' to a time_t value.
-   Copyright (C) 1993, 94, 95, 96, 97, 98, 99 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Paul Eggert (eggert@twinsun.com).
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-/* Define this to have a standalone program to test this implementation of
-   mktime.  */
-
-#include <features.h>
-/* Assume that leap seconds are not possible */
-#undef LEAP_SECONDS_POSSIBLE 
-#include <sys/types.h>		/* Some systems define `time_t' here.  */
-#include <time.h>
-#include <limits.h>
-
-#if 0
-#ifndef CHAR_BIT
-# define CHAR_BIT 8
-#endif
-
-/* The extra casts work around common compiler bugs.  */
-#define TYPE_SIGNED(t) (! ((t) 0 < (t) -1))
-/* The outer cast is needed to work around a bug in Cray C 5.0.3.0.
-   It is necessary at least when t == time_t.  */
-#define TYPE_MINIMUM(t) ((t) (TYPE_SIGNED (t) \
-			      ? ~ (t) 0 << (sizeof (t) * CHAR_BIT - 1) : (t) 0))
-#define TYPE_MAXIMUM(t) ((t) (~ (t) 0 - TYPE_MINIMUM (t)))
-
-#ifndef INT_MIN
-# define INT_MIN TYPE_MINIMUM (int)
-#endif
-#ifndef INT_MAX
-# define INT_MAX TYPE_MAXIMUM (int)
-#endif
-
-#ifndef TIME_T_MIN
-# define TIME_T_MIN TYPE_MINIMUM (time_t)
-#endif
-#ifndef TIME_T_MAX
-# define TIME_T_MAX TYPE_MAXIMUM (time_t)
-#endif
-
-#define TM_YEAR_BASE 1900
-#define EPOCH_YEAR 1970
-
-
-/* How many days come before each month (0-12).  */
-extern const unsigned short int __mon_yday[2][13];
-
-
-
-/* Yield the difference between (YEAR-YDAY HOUR:MIN:SEC) and (*TP),
-   measured in seconds, ignoring leap seconds.
-   YEAR uses the same numbering as TM->tm_year.
-   All values are in range, except possibly YEAR.
-   If TP is null, return a nonzero value.
-   If overflow occurs, yield the low order bits of the correct answer.  */
-static time_t
-__ydhms_tm_diff (int year, int yday, int hour, int min, int sec,
-	       const struct tm *tp)
-{
-    if (!tp)
-	return 1;
-    else
-    {
-	/* Compute intervening leap days correctly even if year is negative.
-	   Take care to avoid int overflow.  time_t overflow is OK, since
-	   only the low order bits of the correct time_t answer are needed.
-	   Don't convert to time_t until after all divisions are done, since
-	   time_t might be unsigned.  */
-	int a4 = (year >> 2) + (TM_YEAR_BASE >> 2) - ! (year & 3);
-	int b4 = (tp->tm_year >> 2) + (TM_YEAR_BASE >> 2) - ! (tp->tm_year & 3);
-	int a100 = a4 / 25 - (a4 % 25 < 0);
-	int b100 = b4 / 25 - (b4 % 25 < 0);
-	int a400 = a100 >> 2;
-	int b400 = b100 >> 2;
-	int intervening_leap_days = (a4 - b4) - (a100 - b100) + (a400 - b400);
-	time_t years = year - (time_t) tp->tm_year;
-	time_t days = (365 * years + intervening_leap_days
-		+ (yday - tp->tm_yday));
-	return (60 * (60 * (24 * days + (hour - tp->tm_hour))
-		    + (min - tp->tm_min))
-		+ (sec - tp->tm_sec));
-    }
-}
-
-/* Use CONVERT to convert *T to a broken down time in *TP.
-   If *T is out of range for conversion, adjust it so that
-   it is the nearest in-range value and then convert that.  */
-static struct tm *
-__ranged_convert (struct tm *(*convert) (const time_t *, struct tm *),
-		time_t *t, struct tm *tp)
-{
-    struct tm *r;
-
-    if (! (r = (*convert) (t, tp)) && *t)
-    {
-	time_t bad = *t;
-	time_t ok = 0;
-	struct tm tm;
-
-	/* BAD is a known unconvertible time_t, and OK is a known good one.
-	   Use binary search to narrow the range between BAD and OK until
-	   they differ by 1.  */
-	while (bad != ok + (bad < 0 ? -1 : 1))
-	{
-	    time_t mid = *t = (bad < 0
-		    ? bad + ((ok - bad) >> 1)
-		    : ok + ((bad - ok) >> 1));
-	    if ((r = (*convert) (t, tp)))
-	    {
-		tm = *r;
-		ok = mid;
-	    }
-	    else
-		bad = mid;
-	}
-
-	if (!r && ok)
-	{
-	    /* The last conversion attempt failed;
-	       revert to the most recent successful attempt.  */
-	    *t = ok;
-	    *tp = tm;
-	    r = tp;
-	}
-    }
-
-    return r;
-}
-
-
-/* Convert *TP to a time_t value, inverting
-   the monotonic and mostly-unit-linear conversion function CONVERT.
-   Use *OFFSET to keep track of a guess at the offset of the result,
-   compared to what the result would be for UTC without leap seconds.
-   If *OFFSET's guess is correct, only one CONVERT call is needed.  */
-time_t __mktime_internal (struct tm *tp, 
-	struct tm *(*convert) (const time_t *, struct tm *), time_t *offset)
-{
-    time_t t, dt, t0, t1, t2;
-    struct tm tm;
-
-    /* The maximum number of probes (calls to CONVERT) should be enough
-       to handle any combinations of time zone rule changes, solar time,
-       leap seconds, and oscillations around a spring-forward gap.
-       POSIX.1 prohibits leap seconds, but some hosts have them anyway.  */
-    int remaining_probes = 6;
-
-    /* Time requested.  Copy it in case CONVERT modifies *TP; this can
-       occur if TP is localtime's returned value and CONVERT is localtime.  */
-    int sec = tp->tm_sec;
-    int min = tp->tm_min;
-    int hour = tp->tm_hour;
-    int mday = tp->tm_mday;
-    int mon = tp->tm_mon;
-    int year_requested = tp->tm_year;
-    int isdst = tp->tm_isdst;
-
-    /* Ensure that mon is in range, and set year accordingly.  */
-    int mon_remainder = mon % 12;
-    int negative_mon_remainder = mon_remainder < 0;
-    int mon_years = mon / 12 - negative_mon_remainder;
-    int year = year_requested + mon_years;
-
-    /* The other values need not be in range:
-       the remaining code handles minor overflows correctly,
-       assuming int and time_t arithmetic wraps around.
-       Major overflows are caught at the end.  */
-
-    /* Calculate day of year from year, month, and day of month.
-       The result need not be in range.  */
-    int yday = ((__mon_yday[__isleap (year + TM_YEAR_BASE)]
-		[mon_remainder + 12 * negative_mon_remainder])
-	    + mday - 1);
-
-    int sec_requested = sec;
-#if LEAP_SECONDS_POSSIBLE
-    /* Handle out-of-range seconds specially,
-       since __ydhms_tm_diff assumes every minute has 60 seconds.  */
-    if (sec < 0)
-	sec = 0;
-    if (59 < sec)
-	sec = 59;
-#endif
-
-    /* Invert CONVERT by probing.  First assume the same offset as last time.
-       Then repeatedly use the error to improve the guess.  */
-
-    tm.tm_year = EPOCH_YEAR - TM_YEAR_BASE;
-    tm.tm_yday = tm.tm_hour = tm.tm_min = tm.tm_sec = 0;
-    t0 = __ydhms_tm_diff (year, yday, hour, min, sec, &tm);
-
-    for (t = t1 = t2 = t0 + *offset;
-	    (dt = __ydhms_tm_diff (year, yday, hour, min, sec,
-				 __ranged_convert (convert, &t, &tm)));
-	    t1 = t2, t2 = t, t += dt)
-	if (t == t1 && t != t2
-		&& (isdst < 0 || tm.tm_isdst < 0
-		    || (isdst != 0) != (tm.tm_isdst != 0)))
-	    /* We can't possibly find a match, as we are oscillating
-	       between two values.  The requested time probably falls
-	       within a spring-forward gap of size DT.  Follow the common
-	       practice in this case, which is to return a time that is DT
-	       away from the requested time, preferring a time whose
-	       tm_isdst differs from the requested value.  In practice,
-	       this is more useful than returning -1.  */
-	    break;
-	else if (--remaining_probes == 0)
-	    return -1;
-
-    /* If we have a match, check whether tm.tm_isdst has the requested
-       value, if any.  */
-    if (dt == 0 && isdst != tm.tm_isdst && 0 <= isdst && 0 <= tm.tm_isdst)
-    {
-	/* tm.tm_isdst has the wrong value.  Look for a neighboring
-	   time with the right value, and use its UTC offset.
-Heuristic: probe the previous three calendar quarters (approximately),
-looking for the desired isdst.  This isn't perfect,
-but it's good enough in practice.  */
-	int quarter = 7889238; /* seconds per average 1/4 Gregorian year */
-	int i;
-
-	/* If we're too close to the time_t limit, look in future quarters.  */
-	if (t < TIME_T_MIN + 3 * quarter)
-	    quarter = -quarter;
-
-	for (i = 1; i <= 3; i++)
-	{
-	    time_t ot = t - i * quarter;
-	    struct tm otm;
-	    __ranged_convert (convert, &ot, &otm);
-	    if (otm.tm_isdst == isdst)
-	    {
-		/* We found the desired tm_isdst.
-		   Extrapolate back to the desired time.  */
-		t = ot + __ydhms_tm_diff (year, yday, hour, min, sec, &otm);
-		__ranged_convert (convert, &t, &tm);
-		break;
-	    }
-	}
-    }
-
-    *offset = t - t0;
-
-#if LEAP_SECONDS_POSSIBLE
-    if (sec_requested != tm.tm_sec)
-    {
-	/* Adjust time to reflect the tm_sec requested, not the normalized value.
-	   Also, repair any damage from a false match due to a leap second.  */
-	t += sec_requested - sec + (sec == 0 && tm.tm_sec == 60);
-	if (! (*convert) (&t, &tm))
-	    return -1;
-    }
-#endif
-
-    if (TIME_T_MAX / INT_MAX / 366 / 24 / 60 / 60 < 3)
-    {
-	/* time_t isn't large enough to rule out overflows in __ydhms_tm_diff,
-	   so check for major overflows.  A gross check suffices,
-	   since if t has overflowed, it is off by a multiple of
-	   TIME_T_MAX - TIME_T_MIN + 1.  So ignore any component of
-	   the difference that is bounded by a small value.  */
-
-	double dyear = (double) year_requested + mon_years - tm.tm_year;
-	double dday = 366 * dyear + mday;
-	double dsec = 60 * (60 * (24 * dday + hour) + min) + sec_requested;
-
-	/* On Irix4.0.5 cc, dividing TIME_T_MIN by 3 does not produce
-	   correct results, ie., it erroneously gives a positive value
-	   of 715827882.  Setting a variable first then doing math on it
-	   seems to work.  (ghazi@caip.rutgers.edu) */
-
-	const time_t time_t_max = TIME_T_MAX;
-	const time_t time_t_min = TIME_T_MIN;
-
-	if (time_t_max / 3 - time_t_min / 3 < (dsec < 0 ? - dsec : dsec))
-	    return -1;
-    }
-
-    *tp = tm;
-    return t;
-}
-
-
-
-/* Convert *TP to a time_t value.  */
-time_t mktime (struct tm *tp)
-{
-    static time_t localtime_offset;
-    /* POSIX.1 8.1.1 requires that whenever mktime() is called, the
-       time zone names contained in the external variable `tzname' shall
-       be set as if the tzset() function had been called.  */
-    tzset ();
-
-    return __mktime_internal (tp, localtime_r, &localtime_offset);
-}
-#else
-
-/* Convert *TP to a time_t value.  */
-time_t mktime (struct tm *tp)
-{
-    time_t m_secs=tp->tm_min*60;
-    time_t h_secs=tp->tm_hour*3600;
-    time_t d_secs=tp->tm_yday*86400;
-    time_t y_secs=(tp->tm_year-70)*31536000;
-    time_t l_secs1=((tp->tm_year-69)/4)*86400;
-    time_t l_secs2=((tp->tm_year-1)/100)*86400;
-    time_t l_secs3=((tp->tm_year+299)/400)*86400;
-    return m_secs+h_secs+d_secs+y_secs+l_secs1-l_secs2+l_secs3+tp->tm_gmtoff;
-}
-#endif
diff --git a/libc/misc/time/strftime.c b/libc/misc/time/strftime.c
deleted file mode 100644
index bde0d93d8..000000000
--- a/libc/misc/time/strftime.c
+++ /dev/null
@@ -1,395 +0,0 @@
-/* Copyright (C) 1991, 92, 93, 94, 95, 96 Free Software Foundation, Inc.
-This file is part of the GNU C Library.
-
-The GNU C Library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public License as
-published by the Free Software Foundation; either version 2 of the
-License, or (at your option) any later version.
-
-The GNU C Library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Library General Public License for more details.
-
-You should have received a copy of the GNU Library General Public
-License along with the GNU C Library; see the file COPYING.LIB.  If
-not, write to the Free Software Foundation, Inc., 675 Mass Ave,
-Cambridge, MA 02139, USA.  */
-
-
-#include <stddef.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include <sys/types.h>		/* Some systems define `time_t' here.  */
-#include <sys/time.h>
-#include <time.h>
-#include <ctype.h>
-#include <limits.h>
-
-static unsigned int week (const struct tm *const, int, int);
-
-#define	add(n, f)							      \
-  do									      \
-    {									      \
-      i += (n);								      \
-      if (i >= maxsize)							      \
-	return 0;							      \
-      else								      \
-	if (p)								      \
-	  {								      \
-	    f;								      \
-	    p += (n);							      \
-	  }								      \
-    } while (0)
-#define	cpy(n, s)	add((n), memcpy((void *) p, (void *) (s), (n)))
-
-#ifdef _LIBC
-#define	fmt(n, args)	add((n), if (sprintf args != (n)) return 0)
-#else
-#define	fmt(n, args)	add((n), sprintf args; if (strlen (p) != (n)) return 0)
-#endif
-
-
-
-/* Return the week in the year specified by TP,
-   with weeks starting on STARTING_DAY.  */
-static unsigned int week(const struct tm *const tp , int starting_day , int max_preceding )
-{
-  int wday, dl, base;
-
-  wday = tp->tm_wday - starting_day;
-  if (wday < 0)
-    wday += 7;
-
-  /* Set DL to the day in the year of the first day of the week
-     containing the day specified in TP.  */
-  dl = tp->tm_yday - wday;
-
-  /* For the computation following ISO 8601:1988 we set the number of
-     the week containing January 1st to 1 if this week has more