989d921f5d
I'm very pleased to announce the release of our new website and documentation using the new toolchain with Hugo and AsciiDoctor. To get more information about the new toolchain please read the FreeBSD Documentation Project Primer[1], Hugo docs[2] and AsciiDoctor docs[3]. Acknowledgment: Benedict Reuschling <bcr@> Glen Barber <gjb@> Hiroki Sato <hrs@> Li-Wen Hsu <lwhsu@> Sean Chittenden <seanc@> The FreeBSD Foundation [1] https://docs.FreeBSD.org/en/books/fdp-primer/ [2] https://gohugo.io/documentation/ [3] https://docs.asciidoctor.org/home/ Approved by: doceng, core
70 lines
2.2 KiB
Diff
70 lines
2.2 KiB
Diff
--- contrib/tzcode/zic/zdump.c.orig
|
|
+++ contrib/tzcode/zic/zdump.c
|
|
@@ -212,24 +212,16 @@
|
|
return;
|
|
cp = abbrp;
|
|
wp = NULL;
|
|
- while (isascii((unsigned char) *cp) && isalpha((unsigned char) *cp))
|
|
+ while (isascii((unsigned char) *cp) &&
|
|
+ (isalnum((unsigned char)*cp) || *cp == '-' || *cp == '+'))
|
|
++cp;
|
|
- if (cp - abbrp == 0)
|
|
- wp = _("lacks alphabetic at start");
|
|
- else if (cp - abbrp < 3)
|
|
- wp = _("has fewer than 3 alphabetics");
|
|
+ if (cp - abbrp < 3)
|
|
+ wp = _("has fewer than 3 characters");
|
|
else if (cp - abbrp > 6)
|
|
- wp = _("has more than 6 alphabetics");
|
|
- if (wp == NULL && (*cp == '+' || *cp == '-')) {
|
|
- ++cp;
|
|
- if (isascii((unsigned char) *cp) &&
|
|
- isdigit((unsigned char) *cp))
|
|
- if (*cp++ == '1' && *cp >= '0' && *cp <= '4')
|
|
- ++cp;
|
|
- if (*cp != '\0')
|
|
- wp = _("differs from POSIX standard");
|
|
- }
|
|
- if (wp == NULL)
|
|
+ wp = _("has more than 6 characters");
|
|
+ else if (*cp)
|
|
+ wp = "has characters other than ASCII alphanumerics, '-' or '+'";
|
|
+ else
|
|
return;
|
|
(void) fflush(stdout);
|
|
(void) fprintf(stderr,
|
|
--- contrib/tzcode/zic/zic.c.orig
|
|
+++ contrib/tzcode/zic/zic.c
|
|
@@ -2615,29 +2615,15 @@
|
|
register const char * cp;
|
|
register char * wp;
|
|
|
|
- /*
|
|
- ** Want one to ZIC_MAX_ABBR_LEN_WO_WARN alphabetics
|
|
- ** optionally followed by a + or - and a number from 1 to 14.
|
|
- */
|
|
cp = string;
|
|
wp = NULL;
|
|
while (isascii((unsigned char) *cp) &&
|
|
- isalpha((unsigned char) *cp))
|
|
+ (isalnum((unsigned char)*cp) || *cp == '-' || *cp == '+'))
|
|
++cp;
|
|
- if (cp - string == 0)
|
|
-wp = _("time zone abbreviation lacks alphabetic at start");
|
|
if (noise && cp - string > 3)
|
|
-wp = _("time zone abbreviation has more than 3 alphabetics");
|
|
+wp = _("time zone abbreviation has more than 3 characters");
|
|
if (cp - string > ZIC_MAX_ABBR_LEN_WO_WARN)
|
|
-wp = _("time zone abbreviation has too many alphabetics");
|
|
- if (wp == NULL && (*cp == '+' || *cp == '-')) {
|
|
- ++cp;
|
|
- if (isascii((unsigned char) *cp) &&
|
|
- isdigit((unsigned char) *cp))
|
|
- if (*cp++ == '1' &&
|
|
- *cp >= '0' && *cp <= '4')
|
|
- ++cp;
|
|
- }
|
|
+wp = _("time zone abbreviation has too many characters");
|
|
if (*cp != '\0')
|
|
wp = _("time zone abbreviation differs from POSIX standard");
|
|
if (wp != NULL) {
|