Unsplit vendor import of tzcode 2010nvendor/tzcode/unsplit

Historically, to work around CVS limitations, imports on the tzcode
vendor branch were split into subdirectories, which were then merged to
their respective counterparts in contrib.  In the Git era, this split is
unnecessary and adds more work.

Undo the split for the most recent vendor import of tzcode 2010n to
prepare for the vendor import of tzcode 2022c.

46 files changed, 0 insertions, 298 deletions

diff --git a/unused/Makefile b/Makefile
index 892d11619b58..892d11619b58 100644
--- a/unused/Makefile
+++ b/Makefile
diff --git a/zic/README b/README
index 427b6a015195..427b6a015195 100644
--- a/zic/README
+++ b/README
diff --git a/zic/Theory b/Theory
index b1e6bd5c9d5d..b1e6bd5c9d5d 100644
--- a/zic/Theory
+++ b/Theory
diff --git a/libc/stdtime/asctime.c b/asctime.c
index 52586c6aedf2..52586c6aedf2 100644
--- a/libc/stdtime/asctime.c
+++ b/asctime.c
diff --git a/unused/checktab.awk b/checktab.awk
index 80ad7d570158..80ad7d570158 100644
--- a/unused/checktab.awk
+++ b/checktab.awk
diff --git a/unused/date.1 b/date.1
index a3e00731f955..a3e00731f955 100644
--- a/unused/date.1
+++ b/date.1
diff --git a/unused/date.1.txt b/date.1.txt
index 2910aaac370c..2910aaac370c 100644
--- a/unused/date.1.txt
+++ b/date.1.txt
diff --git a/unused/date.c b/date.c
index 6a6d2cdaffcd..6a6d2cdaffcd 100644
--- a/unused/date.c
+++ b/date.c
diff --git a/libc/stdtime/difftime.c b/difftime.c
index da779773bfdd..da779773bfdd 100644
--- a/libc/stdtime/difftime.c
+++ b/difftime.c
diff --git a/zic/ialloc.c b/ialloc.c
index 1fc2035f4529..1fc2035f4529 100644
--- a/zic/ialloc.c
+++ b/ialloc.c
diff --git a/unused/itca.jpg b/itca.jpg
index 89a7119c0ccc..89a7119c0ccc 100644
--- a/unused/itca.jpg
+++ b/itca.jpg
diff --git a/libc/stdtime/localtime.c b/localtime.c
index 13c11aa928df..13c11aa928df 100644
--- a/libc/stdtime/localtime.c
+++ b/localtime.c
diff --git a/unused/newctime.3 b/newctime.3
index a0239de5c0a4..a0239de5c0a4 100644
--- a/unused/newctime.3
+++ b/newctime.3
diff --git a/unused/newctime.3.txt b/newctime.3.txt
index ba311400474a..ba311400474a 100644
--- a/unused/newctime.3.txt
+++ b/newctime.3.txt
diff --git a/unused/newstrftime.3 b/newstrftime.3
index cd70974b8e15..cd70974b8e15 100644
--- a/unused/newstrftime.3
+++ b/newstrftime.3
diff --git a/unused/newstrftime.3.txt b/newstrftime.3.txt
index ea210a869f4a..ea210a869f4a 100644
--- a/unused/newstrftime.3.txt
+++ b/newstrftime.3.txt
diff --git a/unused/newtzset.3 b/newtzset.3
index 07c5e0c605a7..07c5e0c605a7 100644
--- a/unused/newtzset.3
+++ b/newtzset.3
diff --git a/unused/newtzset.3.txt b/newtzset.3.txt
index 9d7d02233ee0..9d7d02233ee0 100644
--- a/unused/newtzset.3.txt
+++ b/newtzset.3.txt
diff --git a/libc/stdtime/private.h b/private.h
index 008d468ac787..008d468ac787 100644
--- a/libc/stdtime/private.h
+++ b/private.h
diff --git a/zic/scheck.c b/scheck.c
index 74d9b07c149b..74d9b07c149b 100644
--- a/zic/scheck.c
+++ b/scheck.c
diff --git a/libc/stdtime/strftime.c b/strftime.c
index d036d07690f6..d036d07690f6 100644
--- a/libc/stdtime/strftime.c
+++ b/strftime.c
diff --git a/libc/stdtime/time2posix.3 b/time2posix.3
index 64ea048f8182..64ea048f8182 100644
--- a/libc/stdtime/time2posix.3
+++ b/time2posix.3
diff --git a/unused/time2posix.3.txt b/time2posix.3.txt
index 1bcf168e2e6c..1bcf168e2e6c 100644
--- a/unused/time2posix.3.txt
+++ b/time2posix.3.txt
diff --git a/unused/tz-art.htm b/tz-art.htm
index ff2afa906244..ff2afa906244 100644
--- a/unused/tz-art.htm
+++ b/tz-art.htm
diff --git a/unused/tz-link.htm b/tz-link.htm
index 26235100b98b..26235100b98b 100644
--- a/unused/tz-link.htm
+++ b/tz-link.htm
diff --git a/libc/stdtime/tzfile.5 b/tzfile.5
index 9383ebf3618c..9383ebf3618c 100644
--- a/libc/stdtime/tzfile.5
+++ b/tzfile.5
diff --git a/unused/tzfile.5.txt b/tzfile.5.txt
index 6e563e6bc6f5..6e563e6bc6f5 100644
--- a/unused/tzfile.5.txt
+++ b/tzfile.5.txt
diff --git a/libc/stdtime/tzfile.h b/tzfile.h
index 3a9eee305a53..3a9eee305a53 100644
--- a/libc/stdtime/tzfile.h
+++ b/tzfile.h
diff --git a/unused/tzselect.8 b/tzselect.8
index 515b0ed51bfd..515b0ed51bfd 100644
--- a/unused/tzselect.8
+++ b/tzselect.8
diff --git a/unused/tzselect.8.txt b/tzselect.8.txt
index a492401b8219..a492401b8219 100644
--- a/unused/tzselect.8.txt
+++ b/tzselect.8.txt
diff --git a/unused/tzselect.ksh b/tzselect.ksh
index 7b805336ab5d..7b805336ab5d 100644
--- a/unused/tzselect.ksh
+++ b/tzselect.ksh
diff --git a/unused/usno1988 b/usno1988
index 5766d9b057b9..5766d9b057b9 100644
--- a/unused/usno1988
+++ b/usno1988
diff --git a/unused/usno1989 b/usno1989
index e242cb90d374..e242cb90d374 100644
--- a/unused/usno1989
+++ b/usno1989
diff --git a/unused/usno1989a b/usno1989a
index b197b85bb1d1..b197b85bb1d1 100644
--- a/unused/usno1989a
+++ b/usno1989a
diff --git a/unused/usno1995 b/usno1995
index 8b9ec8d601d4..8b9ec8d601d4 100644
--- a/unused/usno1995
+++ b/usno1995
diff --git a/unused/usno1997 b/usno1997
index e18fcdfcdcbf..e18fcdfcdcbf 100644
--- a/unused/usno1997
+++ b/usno1997
diff --git a/unused/usno1998 b/usno1998
index c3c6991aa61e..c3c6991aa61e 100644
--- a/unused/usno1998
+++ b/usno1998
diff --git a/unused/workman.sh b/workman.sh
index 2fbb7e211c6c..2fbb7e211c6c 100644
--- a/unused/workman.sh
+++ b/workman.sh
diff --git a/zic/zdump.8 b/zdump.8
index 90940a6bce8b..90940a6bce8b 100644
--- a/zic/zdump.8
+++ b/zdump.8
diff --git a/unused/zdump.8.txt b/zdump.8.txt
index 78c647f7636b..78c647f7636b 100644
--- a/unused/zdump.8.txt
+++ b/zdump.8.txt
diff --git a/zic/zdump.c b/zdump.c
index 67bed06bc398..67bed06bc398 100644
--- a/zic/zdump.c
+++ b/zdump.c
diff --git a/zic/zic.8 b/zic.8
index 7a7324ab48ba..7a7324ab48ba 100644
--- a/zic/zic.8
+++ b/zic.8
diff --git a/unused/zic.8.txt b/zic.8.txt
index 1feada21482b..1feada21482b 100644
--- a/unused/zic.8.txt
+++ b/zic.8.txt
diff --git a/zic/zic.c b/zic.c
index a75d8c75e88c..a75d8c75e88c 100644
--- a/zic/zic.c
+++ b/zic.c
diff --git a/zic/private.h b/zic/private.h
deleted file mode 100644
index 008d468ac787..000000000000
--- a/zic/private.h
+++ /dev/null
@@ -1,298 +0,0 @@
-#ifndef PRIVATE_H
-
-#define PRIVATE_H
-
-/*
-** This file is in the public domain, so clarified as of
-** 1996-06-05 by Arthur David Olson.
-*/
-
-/*
-** This header is for use ONLY with the time conversion code.
-** There is no guarantee that it will remain unchanged,
-** or that it will remain at all.
-** Do NOT copy it to any system include directory.
-** Thank you!
-*/
-
-/*
-** ID
-*/
-
-#ifndef lint
-#ifndef NOID
-static char	privatehid[] = "@(#)private.h	8.6";
-#endif /* !defined NOID */
-#endif /* !defined lint */
-
-#define GRANDPARENTED	"Local time zone must be set--see zic manual page"
-
-/*
-** Defaults for preprocessor symbols.
-** You can override these in your C compiler options, e.g. `-DHAVE_ADJTIME=0'.
-*/
-
-#ifndef HAVE_ADJTIME
-#define HAVE_ADJTIME		1
-#endif /* !defined HAVE_ADJTIME */
-
-#ifndef HAVE_GETTEXT
-#define HAVE_GETTEXT		0
-#endif /* !defined HAVE_GETTEXT */
-
-#ifndef HAVE_INCOMPATIBLE_CTIME_R
-#define HAVE_INCOMPATIBLE_CTIME_R	0
-#endif /* !defined INCOMPATIBLE_CTIME_R */
-
-#ifndef HAVE_SETTIMEOFDAY
-#define HAVE_SETTIMEOFDAY	3
-#endif /* !defined HAVE_SETTIMEOFDAY */
-
-#ifndef HAVE_SYMLINK
-#define HAVE_SYMLINK		1
-#endif /* !defined HAVE_SYMLINK */
-
-#ifndef HAVE_SYS_STAT_H
-#define HAVE_SYS_STAT_H		1
-#endif /* !defined HAVE_SYS_STAT_H */
-
-#ifndef HAVE_SYS_WAIT_H
-#define HAVE_SYS_WAIT_H		1
-#endif /* !defined HAVE_SYS_WAIT_H */
-
-#ifndef HAVE_UNISTD_H
-#define HAVE_UNISTD_H		1
-#endif /* !defined HAVE_UNISTD_H */
-
-#ifndef HAVE_UTMPX_H
-#define HAVE_UTMPX_H		0
-#endif /* !defined HAVE_UTMPX_H */
-
-#ifndef LOCALE_HOME
-#define LOCALE_HOME		"/usr/lib/locale"
-#endif /* !defined LOCALE_HOME */
-
-#if HAVE_INCOMPATIBLE_CTIME_R
-#define asctime_r _incompatible_asctime_r
-#define ctime_r _incompatible_ctime_r
-#endif /* HAVE_INCOMPATIBLE_CTIME_R */
-
-/*
-** Nested includes
-*/
-
-#include "sys/types.h"	/* for time_t */
-#include "stdio.h"
-#include "errno.h"
-#include "string.h"
-#include "limits.h"	/* for CHAR_BIT et al. */
-#include "time.h"
-#include "stdlib.h"
-
-#if HAVE_GETTEXT
-#include "libintl.h"
-#endif /* HAVE_GETTEXT */
-
-#if HAVE_SYS_WAIT_H
-#include <sys/wait.h>	/* for WIFEXITED and WEXITSTATUS */
-#endif /* HAVE_SYS_WAIT_H */
-
-#ifndef WIFEXITED
-#define WIFEXITED(status)	(((status) & 0xff) == 0)
-#endif /* !defined WIFEXITED */
-#ifndef WEXITSTATUS
-#define WEXITSTATUS(status)	(((status) >> 8) & 0xff)
-#endif /* !defined WEXITSTATUS */
-
-#if HAVE_UNISTD_H
-#include "unistd.h"	/* for F_OK, R_OK, and other POSIX goodness */
-#endif /* HAVE_UNISTD_H */
-
-#ifndef F_OK
-#define F_OK	0
-#endif /* !defined F_OK */
-#ifndef R_OK
-#define R_OK	4
-#endif /* !defined R_OK */
-
-/* Unlike <ctype.h>'s isdigit, this also works if c < 0 | c > UCHAR_MAX. */
-#define is_digit(c) ((unsigned)(c) - '0' <= 9)
-
-/*
-** Define HAVE_STDINT_H's default value here, rather than at the
-** start, since __GLIBC__'s value depends on previously-included
-** files.
-** (glibc 2.1 and later have stdint.h, even with pre-C99 compilers.)
-*/
-#ifndef HAVE_STDINT_H
-#define HAVE_STDINT_H \
-	(199901 <= __STDC_VERSION__ || \
-	2 < (__GLIBC__ + (0 < __GLIBC_MINOR__)))
-#endif /* !defined HAVE_STDINT_H */
-
-#if HAVE_STDINT_H
-#include "stdint.h"
-#endif /* !HAVE_STDINT_H */
-
-#ifndef INT_FAST64_MAX
-/* Pre-C99 GCC compilers define __LONG_LONG_MAX__ instead of LLONG_MAX.  */
-#if defined LLONG_MAX || defined __LONG_LONG_MAX__
-typedef long long	int_fast64_t;
-#else /* ! (defined LLONG_MAX || defined __LONG_LONG_MAX__) */
-#if (LONG_MAX >> 31) < 0xffffffff
-Please use a compiler that supports a 64-bit integer type (or wider);
-you may need to compile with "-DHAVE_STDINT_H".
-#endif /* (LONG_MAX >> 31) < 0xffffffff */
-typedef long		int_fast64_t;
-#endif /* ! (defined LLONG_MAX || defined __LONG_LONG_MAX__) */
-#endif /* !defined INT_FAST64_MAX */
-
-#ifndef INT32_MAX
-#define INT32_MAX 0x7fffffff
-#endif /* !defined INT32_MAX */
-#ifndef INT32_MIN
-#define INT32_MIN (-1 - INT32_MAX)
-#endif /* !defined INT32_MIN */
-
-/*
-** Workarounds for compilers/systems.
-*/
-
-/*
-** Some time.h implementations don't declare asctime_r.
-** Others might define it as a macro.
-** Fix the former without affecting the latter.
-*/
-
-#ifndef asctime_r
-extern char *	asctime_r(struct tm const *, char *);
-#endif
-
-/*
-** Private function declarations.
-*/
-
-char *		icalloc(int nelem, int elsize);
-char *		icatalloc(char * old, const char * new);
-char *		icpyalloc(const char * string);
-char *		imalloc(int n);
-void *		irealloc(void * pointer, int size);
-void		icfree(char * pointer);
-void		ifree(char * pointer);
-const char *	scheck(const char * string, const char * format);
-
-/*
-** Finally, some convenience items.
-*/
-
-#ifndef TRUE
-#define TRUE	1
-#endif /* !defined TRUE */
-
-#ifndef FALSE
-#define FALSE	0
-#endif /* !defined FALSE */
-
-#ifndef TYPE_BIT
-#define TYPE_BIT(type)	(sizeof (type) * CHAR_BIT)
-#endif /* !defined TYPE_BIT */
-
-#ifndef TYPE_SIGNED
-#define TYPE_SIGNED(type) (((type) -1) < 0)
-#endif /* !defined TYPE_SIGNED */
-
-/*
-** Since the definition of TYPE_INTEGRAL contains floating point numbers,
-** it cannot be used in preprocessor directives.
-*/
-
-#ifndef TYPE_INTEGRAL
-#define TYPE_INTEGRAL(type) (((type) 0.5) != 0.5)
-#endif /* !defined TYPE_INTEGRAL */
-
-#ifndef INT_STRLEN_MAXIMUM
-/*
-** 302 / 1000 is log10(2.0) rounded up.
-** Subtract one for the sign bit if the type is signed;
-** add one for integer division truncation;
-** add one more for a minus sign if the type is signed.
-*/
-#define INT_STRLEN_MAXIMUM(type) \
-	((TYPE_BIT(type) - TYPE_SIGNED(type)) * 302 / 1000 + \
-	1 + TYPE_SIGNED(type))
-#endif /* !defined INT_STRLEN_MAXIMUM */
-
-/*
-** INITIALIZE(x)
-*/
-
-#ifndef GNUC_or_lint
-#ifdef lint
-#define GNUC_or_lint
-#endif /* defined lint */
-#ifndef lint
-#ifdef __GNUC__
-#define GNUC_or_lint
-#endif /* defined __GNUC__ */
-#endif /* !defined lint */
-#endif /* !defined GNUC_or_lint */
-
-#ifndef INITIALIZE
-#ifdef GNUC_or_lint
-#define INITIALIZE(x)	((x) = 0)
-#endif /* defined GNUC_or_lint */
-#ifndef GNUC_or_lint
-#define INITIALIZE(x)
-#endif /* !defined GNUC_or_lint */
-#endif /* !defined INITIALIZE */
-
-/*
-** For the benefit of GNU folk...
-** `_(MSGID)' uses the current locale's message library string for MSGID.
-** The default is to use gettext if available, and use MSGID otherwise.
-*/
-
-#ifndef _
-#if HAVE_GETTEXT
-#define _(msgid) gettext(msgid)
-#else /* !HAVE_GETTEXT */
-#define _(msgid) msgid
-#endif /* !HAVE_GETTEXT */
-#endif /* !defined _ */
-
-#ifndef TZ_DOMAIN
-#define TZ_DOMAIN "tz"
-#endif /* !defined TZ_DOMAIN */
-
-#if HAVE_INCOMPATIBLE_CTIME_R
-#undef asctime_r
-#undef ctime_r
-char *asctime_r(struct tm const *, char *);
-char *ctime_r(time_t const *, char *);
-#endif /* HAVE_INCOMPATIBLE_CTIME_R */
-
-#ifndef YEARSPERREPEAT
-#define YEARSPERREPEAT		400	/* years before a Gregorian repeat */
-#endif /* !defined YEARSPERREPEAT */
-
-/*
-** The Gregorian year averages 365.2425 days, which is 31556952 seconds.
-*/
-
-#ifndef AVGSECSPERYEAR
-#define AVGSECSPERYEAR		31556952L
-#endif /* !defined AVGSECSPERYEAR */
-
-#ifndef SECSPERREPEAT
-#define SECSPERREPEAT		((int_fast64_t) YEARSPERREPEAT * (int_fast64_t) AVGSECSPERYEAR)
-#endif /* !defined SECSPERREPEAT */
-
-#ifndef SECSPERREPEAT_BITS
-#define SECSPERREPEAT_BITS	34	/* ceil(log2(SECSPERREPEAT)) */
-#endif /* !defined SECSPERREPEAT_BITS */
-
-/*
-** UNIX was a registered trademark of The Open Group in 2003.
-*/
-
-#endif /* !defined PRIVATE_H */
diff --git a/unused/zoneinfo2tdf.pl b/zoneinfo2tdf.pl
index f34ca3e99c31..f34ca3e99c31 100755
--- a/unused/zoneinfo2tdf.pl
+++ b/zoneinfo2tdf.pl