man: a forgotten chunk of lask commit (config file parser fixes)

diff --git a/miscutils/man.c b/miscutils/man.c
index adb85b81c3707d111dc71a6530091cbdab3f96a0..5c8e2a4e5b32ca804bcb817f29864232a446b382 100644 (file)
--- a/miscutils/man.c
+++ b/miscutils/man.c
@@ -104,26 +104,22 @@ int man_main(int argc UNUSED_PARAM, char **argv)
 
        /* Parse man.conf */
        parser = config_open("/etc/man.conf");
-       if (parser) {
-               /* go through man configuration file and search relevant paths, sections */
-               char *token[2];
-               while (config_read(parser, token, 2, 0, "# \t", PARSE_LAST_IS_GREEDY)) {
-                       if (!token[1])
-                               continue;
-                       if (strcmp("MANPATH", token[0]) == 0) {
-                               man_path_list[count_mp] = xstrdup(token[1]);
-                               count_mp++;
-                               /* man_path_list is NULL terminated */
-                               man_path_list[count_mp] = NULL;
-                               man_path_list = xrealloc_vector(man_path_list, 4, count_mp);
-                       }
-                       if (strcmp("MANSECT", token[0]) == 0) {
-                               free(sec_list);
-                               sec_list = xstrdup(token[1]);
-                       }
-               }
-               config_close(parser);
-       }
+       while (config_read(parser, token, 2, 0, "# \t", PARSE_NORMAL)) {
+               if (!token[1])
+                       continue;
+               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]);
+                       count_mp++;
+                       /* man_path_list is NULL terminated */
+                       man_path_list[count_mp] = NULL;
+               }
+               if (strcmp("MANSECT", token[0]) == 0) {
+                       free(sec_list);
+                       sec_list = xstrdup(token[1]);
+               }
+       }
+       config_close(parser);
 
 // TODO: my man3/getpwuid.3.gz contains just one line:
 // .so man3/getpwnam.3