From 38c097cae8e1da0a0b90ac81102795b2198646ca Mon Sep 17 00:00:00 2001
From: Ulrich Drepper <drepper@redhat.com>
Date: Tue, 17 Aug 1999 20:49:23 +0000
Subject: Update.

	* timezone/private.h: Update from tzcode1999e.
	* timezone/zic.c: Likewise.

	* timezone/africa: Update from tzdata1999e.
	* timezone/antarctica: Likewise.
	* timezone/asia: Likewise.
	* timezone/australasia: Likewise.
	* timezone/europe: Likewise.
	* timezone/leapseconds: Likewise.
	* timezone/northamerica: Likewise.
	* timezone/southamerica: Likewise.
---
 timezone/zic.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'timezone/zic.c')

diff --git a/timezone/zic.c b/timezone/zic.c
index de706e8316..ddf155f279 100644
--- a/timezone/zic.c
+++ b/timezone/zic.c
@@ -1,6 +1,6 @@
 #ifndef lint
 #ifndef NOID
-static char	elsieid[] = "@(#)zic.c	7.99";
+static char    elsieid[] = "@(#)zic.c  7.100";
 #endif /* !defined NOID */
 #endif /* !defined lint */
 
@@ -617,7 +617,7 @@ const char * const	tofile;
 		result = link(fromname, toname);
 #if (HAVE_SYMLINK - 0)
 		if (result != 0) {
-		        char *s = (char *) tofile;
+		        const char *s = tofile;
 		        register char *symlinkcontents = NULL;
 		        while ((s = strchr(s+1, '/')) != NULL)
 			        symlinkcontents = ecatalloc(symlinkcontents, "../");
@@ -1918,10 +1918,12 @@ const char * const	type;
 	buf = erealloc(buf, (int) (132 + strlen(yitcommand) + strlen(type)));
 	(void) sprintf(buf, "%s %d %s", yitcommand, year, type);
 	result = system(buf);
-	if (result == 0)
-		return TRUE;
-	if (result == (1 << 8))
-		return FALSE;
+	if (WIFEXITED(result)) switch (WEXITSTATUS(result)) {
+		case 0:
+			return TRUE;
+		case 1:
+			return FALSE;
+	}
 	error(_("Wild result from command execution"));
 	(void) fprintf(stderr, _("%s: command was '%s', result was %d\n"),
 		progname, buf, result);
-- 
cgit v1.2.3