Update from tzcode2001c.

diff --git a/timezone/private.h b/timezone/private.h
index d7e2548..76614d2 100644 (file)
--- a/timezone/private.h
+++ b/timezone/private.h
@@ -21,7 +21,7 @@
 
 #ifndef lint
 #ifndef NOID
-static char    privatehid[] = "@(#)private.h   7.51";
+static char    privatehid[] = "@(#)private.h   7.52";
 #endif /* !defined NOID */
 #endif /* !defined lint */
 
@@ -54,6 +54,10 @@ static char  privatehid[] = "@(#)private.h   7.51";
 #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 */
@@ -123,16 +127,6 @@ static char        privatehid[] = "@(#)private.h   7.51";
 */
 
 /*
-** SunOS 4.1.1 cc lacks const.
-*/
-
-#ifndef const
-#ifndef __STDC__
-#define const
-#endif /* !defined __STDC__ */
-#endif /* !defined const */
-
-/*
 ** SunOS 4.1.1 cc lacks prototypes.
 */
 

diff --git a/timezone/zic.c b/timezone/zic.c
index 6f2f657..8e028eb 100644 (file)
--- a/timezone/zic.c
+++ b/timezone/zic.c
@@ -1,15 +1,21 @@
 #ifndef lint
 #ifndef NOID
-static char    elsieid[] = "@(#)zic.c  7.101";
+static char    elsieid[] = "@(#)zic.c  7.102";
 #endif /* !defined NOID */
 #endif /* !defined lint */
 
 #include "private.h"
 #include "locale.h"
 #include "tzfile.h"
-#ifdef unix
-#include "sys/stat.h"                  /* for umask manifest constants */
-#endif /* defined unix */
+
+#if HAVE_SYS_STAT_H
+#include "sys/stat.h"
+#endif
+#ifdef S_IRUSR
+#define MKDIR_UMASK (S_IRUSR|S_IWUSR|S_IXUSR|S_IRGRP|S_IXGRP|S_IROTH|S_IXOTH)
+#else
+#define MKDIR_UMASK 0755
+#endif
 
 /*
 ** On some ancient hosts, predicates like `isspace(C)' are defined
@@ -2198,7 +2204,7 @@ char * const      argname;
                        ** created by some other multiprocessor, so we get
                        ** to do extra checking.
                        */
-                       if (mkdir(name, S_IRUSR|S_IWUSR|S_IXUSR|S_IRGRP|S_IXGRP|S_IROTH|S_IXOTH) != 0) {
+                       if (mkdir(name, MKDIR_UMASK) != 0) {
                                const char *e = strerror(errno);
 
                                if (errno != EEXIST || !itsdir(name)) {