lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-08-01 10:06:57 +03:00
Code Activity

Update tzcode from upstream git and support --with-bugurl for it.

Browse Source
This commit is contained in:
Joseph Myers
2012-11-13 22:25:45 +00:00
parent 8ca8931812
commit e27d476a65
5 changed files with 27 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
timezone/zic.c
View File

@ -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 == '-')) {