d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Backout 1.38->1.41 (functional) changes pending the proper solution.

Browse Source 
/usr/share/man/cat? is only allowed to store -Tascii formatted data.

Requested by:	ache
This commit is contained in:
ru 2001-02-14 13:16:16 +00:00
parent 1ab4a2d504
commit 617687c44c
1 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
gnu/usr.bin/man/man/man.c
View File

@ -92,17 +92,15 @@ static char *alt_system_name;
#ifdef __FreeBSD__ #ifdef __FreeBSD__
/* short_locale without country suffix */ /* short_locale without country suffix */
static char *locale, *short_locale; static char *locale, *short_locale, *locale_opts, *locale_nroff;
static char *roff_dev = "ascii", *roff_ldev = "ascii";
static int use_original; static int use_original;
struct ltable { struct ltable {
char *lcode; char *lcode;
char *ldev; /* roff device for localized manpages. */ char *nroff;
char *odev; /* roff device for original manpages. */
}; };
static struct ltable ltable[] = { static struct ltable ltable[] = {
{"KOI8-R", "koi8-r", "ascii"}, {"KOI8-R", "koi8-r"},
{"ISO_8859-1", "latin1", "latin1"}, {"ISO_8859-1", "latin1"},
{NULL} {NULL}
}; };
#endif #endif
@ -482,8 +480,7 @@ man_getopt (argc, argv)
tmp = short_locale + 3; tmp = short_locale + 3;
for (pltable = ltable; pltable->lcode != NULL; pltable++) { for (pltable = ltable; pltable->lcode != NULL; pltable++) {
if (strcmp(pltable->lcode, tmp) == 0) { if (strcmp(pltable->lcode, tmp) == 0) {
roff_ldev = pltable->ldev; locale_nroff = pltable->nroff;
roff_dev = pltable->odev;
break; break;
} }
} }
@ -949,7 +946,8 @@ parse_roff_directive (cp, file, buf, bufsize)
#ifdef __FreeBSD__ #ifdef __FreeBSD__
char lbuf[FILENAME_MAX]; char lbuf[FILENAME_MAX];
snprintf(lbuf, sizeof(lbuf), "%s -T%s", NEQN, roff_dev); snprintf(lbuf, sizeof(lbuf), "%s -T%s", NEQN,
locale_opts == NULL ? "ascii" : locale_opts);
add_directive (&first, lbuf, file, buf, bufsize); add_directive (&first, lbuf, file, buf, bufsize);
#else #else
add_directive (&first, NEQN, file, buf, bufsize); add_directive (&first, NEQN, file, buf, bufsize);
@ -1027,7 +1025,8 @@ parse_roff_directive (cp, file, buf, bufsize)
#ifdef __FreeBSD__ #ifdef __FreeBSD__
char lbuf[FILENAME_MAX]; char lbuf[FILENAME_MAX];
snprintf(lbuf, sizeof(lbuf), "%s -T%s", NROFF, roff_dev); snprintf(lbuf, sizeof(lbuf), "%s -T%s", NROFF,
locale_opts == NULL ? "ascii" : locale_opts);
add_directive (&first, lbuf, file, buf, bufsize); add_directive (&first, lbuf, file, buf, bufsize);
#else #else
add_directive (&first, NROFF " -Tascii", file, buf, bufsize); add_directive (&first, NROFF " -Tascii", file, buf, bufsize);
@ -1573,7 +1572,6 @@ man (name)
#ifdef __FreeBSD__ #ifdef __FreeBSD__
int l_found; int l_found;
char buf[FILENAME_MAX]; char buf[FILENAME_MAX];
char *roff_odev;
#endif #endif
found = 0; found = 0;
@ -1591,8 +1589,7 @@ man (name)
#ifdef __FreeBSD__ #ifdef __FreeBSD__
l_found = 0; l_found = 0;
if (locale != NULL) { if (locale != NULL) {
roff_odev = roff_dev; locale_opts = locale_nroff;
roff_dev = roff_ldev;
snprintf(buf, sizeof(buf), "%s/%s", *mp, locale); snprintf(buf, sizeof(buf), "%s/%s", *mp, locale);
if (is_directory (buf)) if (is_directory (buf))
l_found = try_section (buf, section, name, glob); l_found = try_section (buf, section, name, glob);
@ -1601,7 +1598,7 @@ man (name)
if (is_directory (buf)) if (is_directory (buf))
l_found = try_section (buf, section, name, glob); l_found = try_section (buf, section, name, glob);
} }
roff_dev = roff_odev; locale_opts = NULL;
} }
if (!l_found) { if (!l_found) {
#endif #endif
@ -1629,8 +1626,7 @@ man (name)
#ifdef __FreeBSD__ #ifdef __FreeBSD__
l_found = 0; l_found = 0;
if (locale != NULL) { if (locale != NULL) {
roff_odev = roff_dev; locale_opts = locale_nroff;
roff_dev = roff_ldev;
snprintf(buf, sizeof(buf), "%s/%s", *mp, locale); snprintf(buf, sizeof(buf), "%s/%s", *mp, locale);
if (is_directory (buf)) if (is_directory (buf))
l_found = try_section (buf, *sp, name, glob); l_found = try_section (buf, *sp, name, glob);
@ -1639,7 +1635,7 @@ man (name)
if (is_directory (buf)) if (is_directory (buf))
l_found = try_section (buf, *sp, name, glob); l_found = try_section (buf, *sp, name, glob);
} }
roff_dev = roff_odev; locale_opts = NULL;
} }
if (!l_found) { if (!l_found) {
#endif #endif