Update.

1999-01-19  Ulrich Drepper  <drepper@cygnus.com>

	* timezone/zdump.c: Update from tzcode1999a.
	* timezone/zic.c: Likewise.

diff --git a/ChangeLog b/ChangeLog
index 48ff964..e580701 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+1999-01-19  Ulrich Drepper  <drepper@cygnus.com>
+
+       * timezone/zdump.c: Update from tzcode1999a.
+       * timezone/zic.c: Likewise.
+
 1999-01-19  Andreas Jaeger  <aj@arthur.rhein-neckar.de>
 
        * math/tgmath.h (nexttoward): Rename nextafterx to nexttoward.

diff --git a/NEWS b/NEWS
index c1571d4..ac56367 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -401,7 +401,7 @@ updwtmpx                    NEW: Unix98
 user2netname                   NEW: Secure RPC
 utmpxname                      NEW: Unix98
 versionsort                    NEW: GNU ext.
-versionsort64                  NEW: LFS
+versionsort64                  NEW: GNU ext.
 waitid                         NEW: Unix98
 wcscasecmp                     NEW: GNU ext.
 wcsncasecmp                    NEW: GNU ext.

diff --git a/timezone/zdump.c b/timezone/zdump.c
index 8c4f6ad..094e172 100644 (file)
--- a/timezone/zdump.c
+++ b/timezone/zdump.c
@@ -1,6 +1,6 @@
 #ifndef lint
 #ifndef NOID
-static char    elsieid[] = "@(#)zdump.c        7.27";
+static char    elsieid[] = "@(#)zdump.c        7.28";
 #endif /* !defined NOID */
 #endif /* !defined lint */
 
@@ -127,7 +127,7 @@ extern char *       optarg;
 extern int     optind;
 extern char *  tzname[2];
 
-static const char *abbr P((struct tm * tmp));
+static char *  abbr P((struct tm * tmp));
 static long    delta P((struct tm * newp, struct tm * oldp));
 static time_t  hunt P((char * name, time_t lot, time_t hit));
 static size_t  longest;
@@ -263,7 +263,7 @@ _("%s: usage is %s [ -v ] [ -c cutoff ] zonename ...\n"),
                show(argv[i], t, TRUE);
        }
        if (fflush(stdout) || ferror(stdout)) {
-               (void) fprintf(stderr, _("%s: Error writing standard output "),
+               (void) fprintf(stderr, _("%s: Error writing "),
                        argv[0]);
                (void) perror(_("standard output"));
                (void) exit(EXIT_FAILURE);
@@ -358,19 +358,15 @@ int       v;
        (void) printf("\n");
 }
 
-static const char *
+static char *
 abbr(tmp)
 struct tm *    tmp;
 {
-       register const char *result;
-       static const char nada;
+       register char * result;
+       static char     nada;
 
-#ifdef TM_ZONE
-       result = tmp->TM_ZONE;
-#else /* !defined TM_ZONE */
        if (tmp->tm_isdst != 0 && tmp->tm_isdst != 1)
                return &nada;
        result = tzname[tmp->tm_isdst];
-#endif /* !defined TM_ZONE */
        return (result == NULL) ? &nada : result;
 }

diff --git a/timezone/zic.c b/timezone/zic.c
index b6b43c7..040a605 100644 (file)
--- a/timezone/zic.c
+++ b/timezone/zic.c
@@ -1,6 +1,6 @@
 #ifndef lint
 #ifndef NOID
-static char    elsieid[] = "@(#)zic.c  7.95";
+static char    elsieid[] = "@(#)zic.c  7.96";
 #endif /* !defined NOID */
 #endif /* !defined lint */
 
@@ -381,7 +381,7 @@ int errnum;
        extern int      sys_nerr;
 
        return (errnum > 0 && errnum <= sys_nerr) ?
-               sys_errlist[errnum] : "Unknown system error";
+               sys_errlist[errnum] : _("Unknown system error");
 }
 #endif /* !(HAVE_STRERROR - 0) */
 
@@ -430,7 +430,7 @@ const char * const  string;
 {
        char *  cp;
 
-       cp = ecpyalloc("warning: ");
+       cp = ecpyalloc(_("warning: "));
        cp = ecatalloc(cp, string);
        error(cp);
        ifree(cp);