diff options
author | des <des@FreeBSD.org> | 2001-01-28 20:17:14 +0000 |
---|---|---|
committer | des <des@FreeBSD.org> | 2001-01-28 20:17:14 +0000 |
commit | 96febcd0b89fea8df1984603f4e78dc5f7cebc3e (patch) | |
tree | 110a6832265b9fb92dcf26efa6a6ead487c077c3 /gnu | |
parent | f611d5aa5dbd3ff80fba6e3cb804e6903c1aeffa (diff) | |
download | FreeBSD-src-96febcd0b89fea8df1984603f4e78dc5f7cebc3e.zip FreeBSD-src-96febcd0b89fea8df1984603f4e78dc5f7cebc3e.tar.gz |
Revert part of previous commit and initialize locale_nroff to " -Tascii"
so man(1) works properly when no locale is set.
Spotted by: bde
Diffstat (limited to 'gnu')
-rw-r--r-- | gnu/usr.bin/man/man/man.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/gnu/usr.bin/man/man/man.c b/gnu/usr.bin/man/man/man.c index 2e558c8..250cae4 100644 --- a/gnu/usr.bin/man/man/man.c +++ b/gnu/usr.bin/man/man/man.c @@ -92,7 +92,8 @@ static char *alt_system_name; #ifdef __FreeBSD__ /* short_locale without country suffix */ -static char *locale, *short_locale, *locale_nroff; +static char *locale, *short_locale; +static char *locale_nroff = " -Tascii"; static int use_original; struct ltable { char *lcode; @@ -101,7 +102,7 @@ struct ltable { static struct ltable ltable[] = { {"KOI8-R", " -Tkoi8-r"}, {"ISO_8859-1", " -Tlatin1"}, - {NULL, " -Tascii"} + {NULL, NULL} }; #endif @@ -479,10 +480,11 @@ man_getopt (argc, argv) tmp = short_locale + 3; for (pltable = ltable; pltable->lcode != NULL; pltable++) { - if (strcmp(pltable->lcode, tmp) == 0) + if (strcmp(pltable->lcode, tmp) == 0) { + locale_nroff = pltable->nroff; break; + } } - locale_nroff = pltable->nroff; } } #endif |