about summary refs log tree commit diff
path: root/timezone/zic.c
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2012-11-13 22:25:45 +0000
committerJoseph Myers <joseph@codesourcery.com>2012-11-13 22:25:45 +0000
commite27d476a652874ad8556fcdb06d877ebabb3e9c7 (patch)
tree076cd90c6e6d6dcf584493c8e332e3abe309665e /timezone/zic.c
parent8ca8931812236803335e0aa13d4c3158bf6c67de (diff)
downloadglibc-e27d476a652874ad8556fcdb06d877ebabb3e9c7.tar.gz
glibc-e27d476a652874ad8556fcdb06d877ebabb3e9c7.tar.xz
glibc-e27d476a652874ad8556fcdb06d877ebabb3e9c7.zip
Update tzcode from upstream git and support --with-bugurl for it.
Diffstat (limited to 'timezone/zic.c')
-rw-r--r--timezone/zic.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/timezone/zic.c b/timezone/zic.c
index 64af1b21b3..a5202a1ac3 100644
--- a/timezone/zic.c
+++ b/timezone/zic.c
@@ -426,8 +426,8 @@ usage(FILE *stream, int status)
 [ --version ] [ --help ] [ -v ] [ -l localtime ] [ -p posixrules ] \\\n\
 \t[ -d directory ] [ -L leapseconds ] [ -y yearistype ] [ filename ... ]\n\
 \n\
-Report bugs to tz@elsie.nci.nih.gov.\n"),
-		       progname, progname);
+Report bugs to %s.\n"),
+		       progname, progname, REPORT_BUGS_TO);
 	exit(status);
 }
 
@@ -462,7 +462,7 @@ main(int argc, char **argv)
 	}
 	for (i = 1; i < argc; ++i)
 		if (strcmp(argv[i], "--version") == 0) {
-			(void) printf("%s\n", TZVERSION);
+			(void) printf("zic %s%s\n", PKGVERSION, TZVERSION);
 			exit(EXIT_SUCCESS);
 		} else if (strcmp(argv[i], "--help") == 0) {
 			usage(stdout, EXIT_SUCCESS);
@@ -2534,8 +2534,8 @@ newabbr(const char *const string)
 				++cp;
 		if (cp - string == 0)
 mp = _("time zone abbreviation lacks alphabetic at start");
-		if (noise && cp - string > 3)
-mp = _("time zone abbreviation has more than 3 alphabetics");
+		if (noise && cp - string < 3)
+mp = _("time zone abbreviation has fewer than 3 alphabetics");
 		if (cp - string > ZIC_MAX_ABBR_LEN_WO_WARN)
 mp = _("time zone abbreviation has too many alphabetics");
 		if (mp == NULL && (*cp == '+' || *cp == '-')) {