From 7105f09c38d2a68418a8e273060ffc6af258f57d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dag-Erling=20Sm=C3=B8rgrav?= Date: Sun, 28 Jan 2001 20:17:14 +0000 Subject: [PATCH] Revert part of previous commit and initialize locale_nroff to " -Tascii" so man(1) works properly when no locale is set. Spotted by: bde --- gnu/usr.bin/man/man/man.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/gnu/usr.bin/man/man/man.c b/gnu/usr.bin/man/man/man.c index 2e558c8cfb7..250cae4f309 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