man: fix breakage: must not die on lines with < 2 tokens

This commit is contained in:
Denis Vlasenko 2008-07-20 17:43:21 +00:00
parent 09aaf78ad5
commit 1e8034e614

View File

@ -106,13 +106,15 @@ int man_main(int argc UNUSED_PARAM, char **argv)
if (parser) { if (parser) {
/* go through man configuration file and search relevant paths, sections */ /* go through man configuration file and search relevant paths, sections */
char *token[2]; char *token[2];
while (config_read(parser, token, 2, 2, "# \t", PARSE_LAST_IS_GREEDY)) { while (config_read(parser, token, 2, 0, "# \t", PARSE_LAST_IS_GREEDY)) {
if (!token[1])
continue;
if (strcmp("MANPATH", token[0]) == 0) { if (strcmp("MANPATH", token[0]) == 0) {
man_path_list = xrealloc_vector(man_path_list, 4, count_mp);
man_path_list[count_mp] = xstrdup(token[1]); man_path_list[count_mp] = xstrdup(token[1]);
count_mp++; count_mp++;
/* man_path_list is NULL terminated */ /* man_path_list is NULL terminated */
man_path_list[count_mp] = NULL; man_path_list[count_mp] = NULL;
man_path_list = xrealloc_vector(man_path_list, 4, count_mp);
} }
if (strcmp("MANSECT", token[0]) == 0) { if (strcmp("MANSECT", token[0]) == 0) {
free(sec_list); free(sec_list);