summary refs log tree commit diff
path: root/timezone/zic.c
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2007-03-26 12:57:50 +0000
committerJakub Jelinek <jakub@redhat.com>2007-03-26 12:57:50 +0000
commit0479e5819b90cdc64d52764c5cd7739439188682 (patch)
treece95e8933c0fd8a4ba9d45935680e7ad25a8f79c /timezone/zic.c
parent697d37b182040cc68cfc7785fddd340b2f51d9cc (diff)
downloadglibc-0479e5819b90cdc64d52764c5cd7739439188682.tar.gz
glibc-0479e5819b90cdc64d52764c5cd7739439188682.tar.xz
glibc-0479e5819b90cdc64d52764c5cd7739439188682.zip
[BZ #4276]
* timezone/africa: Update from tzdata2007d. 
* timezone/asia: Likewise. 
* timezone/australasia: Likewise. 
* timezone/backward: Likewise. 
* timezone/europe: Likewise. 
* timezone/iso3166.tab: Likewise. 
* timezone/leapseconds: Likewise. 
* timezone/northamerica: Likewise. 
* timezone/southamerica: Likewise. 
* timezone/zone.tab: Likewise.
	* timezone/private.h: Update from tzcode2007d.
	* timezone/zdump.c: Likewise.
	* timezone/zic.c: Likewise.
2007-03-26  Jakub Jelinek  <jakub@redhat.com>

	[BZ #4276]
	* timezone/africa: Update from tzdata2007d.
	* timezone/asia: Likewise.
	* timezone/australasia: Likewise.
	* timezone/backward: Likewise.
	* timezone/europe: Likewise.
	* timezone/iso3166.tab: Likewise.
	* timezone/leapseconds: Likewise.
	* timezone/northamerica: Likewise.
	* timezone/southamerica: Likewise.
	* timezone/zone.tab: Likewise.

	* timezone/private.h: Update from tzcode2007d.
	* timezone/zdump.c: Likewise.
	* timezone/zic.c: Likewise.
Diffstat (limited to 'timezone/zic.c')
-rw-r--r--timezone/zic.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/timezone/zic.c b/timezone/zic.c
index f7393ea7ba..592dfe5219 100644
--- a/timezone/zic.c
+++ b/timezone/zic.c
@@ -3,7 +3,7 @@
 ** 2006-07-17 by Arthur David Olson.
 */
 
-static char	elsieid[] = "@(#)zic.c	8.7";
+static char	elsieid[] = "@(#)zic.c	8.11";
 
 #include "private.h"
 #include "locale.h"
@@ -2024,7 +2024,7 @@ const int			zonecount;
 
 wp = ecpyalloc(_("no POSIX environment variable for zone"));
 		wp = ecatalloc(wp, " ");
-		wp = ecatalloc(wp, zpfirst->z_name); 
+		wp = ecatalloc(wp, zpfirst->z_name);
 		warning(wp);
 		ifree(wp);
 	}
@@ -2451,9 +2451,12 @@ register char *	cp;
 			else while ((*dp = *cp++) != '"')
 				if (*dp != '\0')
 					++dp;
-				else	error(_(
+				else {
+					error(_(
 						"Odd number of quotation marks"
 						));
+					exit(1);
+				}
 		} while (*cp != '\0' && *cp != '#' &&
 			(!isascii(*cp) || !isspace((unsigned char) *cp)));
 		if (isascii(*cp) && isspace((unsigned char) *cp))
@@ -2641,7 +2644,7 @@ wp = _("time zone abbreviation differs from POSIX standard");
 
 static int
 mkdirs(argname)
-char * const	argname;
+char *		argname;
 {
 	register char *	name;
 	register char *	cp;