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

Handle numeric keys by checking a "default" file. Handle number-less keys

Browse Source 
by failing, since comparing up to the length of the key (0) against the
begin line for a key in the help file will always succeed, and print what
is wholly bogus output.
This commit is contained in:
Juli Mallett 2002-05-23 14:58:22 +00:00
parent d88b2458a5
commit a8ca0a178e
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
usr.bin/help/help.c
View File

@ -28,6 +28,11 @@ __FBSDID("$FreeBSD$");
*/
#define _PATH_LIBHELP "/usr/lib/help"
/*
* The file we check if all else fails.
*/
#define _PATH_DEFAULT _PATH_LIBHELP "/default"
int help(const char *);
int
@ -98,9 +103,20 @@ help(const char *key)
keynumber = key;
key = keyname;
*p = '\0';
snprintf(path, sizeof(path), _PATH_LIBHELP "/%s", keybase);
/*
* Try the default help file if we have a numeric key.
* Or else, use the non-numeric part of the key.
*/
if (strlen(keybase) == 0) {
strlcpy(path, _PATH_DEFAULT, sizeof(path));
} else {
snprintf(path, sizeof(path), _PATH_LIBHELP "/%s", keybase);
}
free(keybase);
numlen = strlen(keynumber);
if (!numlen) {
goto fail;
}
helpfile = fopen(path, "r");
if (helpfile == NULL) {