man: proper handling of default path and config file

Don't overwrite the default path when the path relative to the
executable is added.

Remove trailing carriage returns when parsing the configuration
file.

2 files changed, 8 insertions, 0 deletions

diff --git a/libbb/parse_config.c b/libbb/parse_config.c
index 8701b010c..f7a2b81b9 100644
--- a/libbb/parse_config.c
+++ b/libbb/parse_config.c
@@ -115,6 +115,10 @@ static int get_line_with_continuation(parser_t *parser)
                 parser->lineno++;
                 if (line[len - 1] == '\n')
                         len--;
+#if ENABLE_PLATFORM_MINGW32
+                if (line[len - 1] == '\r')
+                        len--;
+#endif
                 if (len == 0 || line[len - 1] != '\\')
                         break;
                 len--;
diff --git a/miscutils/man.c b/miscutils/man.c
index b2d42b043..3c1a79085 100644
--- a/miscutils/man.c
+++ b/miscutils/man.c
@@ -309,6 +309,10 @@ int man_main(int argc UNUSED_PARAM, char **argv)
         {
                 char *exepath = xstrdup(bb_busybox_exec_path);
                 char *relpath = concat_path_file(dirname(exepath), "man");
+                if (count_mp == 0) {
+                        /* default must match path set above */
+                        man_path_list = add_MANPATH(man_path_list, &count_mp, "/usr/man");
+                }
                 man_path_list = add_MANPATH(man_path_list, &count_mp, relpath);
                 free(relpath);
                 free(exepath);