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

- Fixed handling of manpage subdirectories:

Browse Source 
catman /usr/share/man/man8
  cd /usr/share/man; catman man8

- Don't print false warnings about invalid cat pages which are
  machine-specific cat page subdirectories (visible with -v).

- Fixed one memory leak.
This commit is contained in:
Ruslan Ermilov 2004-12-22 15:24:48 +00:00
parent 85c5243c1d
commit 0ab4b27257
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=139182
1 changed files with 12 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
usr.bin/catman/catman.c
View File

@ -39,6 +39,7 @@ __FBSDID("$FreeBSD$");
#include <fcntl.h>
#include <locale.h>
#include <langinfo.h>
#include <libgen.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@ -271,22 +272,6 @@ get_cat_section(char *section)
return cat_section;
}
/*
* Converts .../man/manXXX to .../man.
*/
static char *
get_mandir(char *section)
{
char *slash;
char *mandir;
slash = strrchr(section, '/');
mandir = (char *) malloc(slash - section + 1);
strncpy(mandir, section, slash - section);
mandir[slash - section] = '\0';
return mandir;
}
/*
* Tests to see if the given directory has already been visited.
*/
@ -578,7 +563,11 @@ scan_section(char *mandir, char *section, char *cat_section)
if (cmp == 0)
continue;
/* we have an unexpected page */
snprintf(cat_path, sizeof cat_path, "%s/%s", cat_section,
page_name);
if (!is_manpage_name(page_name)) {
if (test_path(cat_path, NULL) & TEST_DIR)
continue;
junk_reason = "invalid cat page name";
} else if (!is_gzipped(page_name) && e + 1 < nexpected &&
strncmp(page_name, expected[e + 1], strlen(page_name)) == 0 &&
@ -586,8 +575,6 @@ scan_section(char *mandir, char *section, char *cat_section)
junk_reason = "cat page unused due to existing " GZ_EXT;
} else
junk_reason = "cat page without man page";
snprintf(cat_path, sizeof cat_path, "%s/%s", cat_section,
page_name);
junk(mandir, cat_path, junk_reason);
}
free(entries);
@ -612,6 +599,7 @@ process_section(char *mandir, char *section)
cat_section = get_cat_section(section);
if (make_writable_dir(mandir, cat_section))
scan_section(mandir, section, cat_section);
free(cat_section);
}
static int
@ -671,6 +659,7 @@ process_argument(const char *arg)
{
char *dir;
char *mandir;
char *section;
char *parg;
parg = strdup(arg);
@ -694,8 +683,11 @@ process_argument(const char *arg)
}
break;
case MAN_SECTION_DIR: {
mandir = get_mandir(dir);
process_mandir(mandir, dir);
mandir = strdup(dirname(dir));
section = strdup(basename(dir));
process_mandir(mandir, section);
free(mandir);
free(section);
break;
}
default: