1 files changed, 28 insertions, 3 deletions

diff --git a/miscutils/man.c b/miscutils/man.c
index deaf9e5ab..3954455b4 100644
--- a/miscutils/man.c
+++ b/miscutils/man.c
@@ -199,8 +199,7 @@ static char **add_MANPATH(char **man_path_list, int *count_mp, char *path)
         if (path) while (*path) {
                 char *next_path;
                 char **path_element;
-
-                next_path = strchr(path, ':');
+                next_path = strchr(path, PATH_SEP);
                 if (next_path) {
                         if (next_path == path) /* "::"? */
                                 goto next;
@@ -223,7 +222,7 @@ static char **add_MANPATH(char **man_path_list, int *count_mp, char *path)
                 if (!next_path)
                         break;
                 /* "path" may be a result of getenv(), be nice and don't mangle it */
-                *next_path = ':';
+                *next_path = PATH_SEP;
  next:
                 path = next_path + 1;
         }
@@ -260,11 +259,24 @@ int man_main(int argc UNUSED_PARAM, char **argv)
         int count_mp;
         int opt, not_found;
         char *token[2];
+#if ENABLE_PLATFORM_MINGW32
+        char **ptr;
+        char *relpath;
+        const char *mpl[] = { "/usr/man", "/usr/share/man", NULL, NULL };
+#endif
 
         INIT_G();
 
         opt = getopt32(argv, "^+" "aw" "\0" "-1"/*at least one arg*/);
         argv += optind;
+#if ENABLE_PLATFORM_MINGW32
+        /* add system drive prefix to filenames, if necessary */
+        for (ptr = argv; *ptr; ++ptr) {
+                if (strchr(*ptr, '/') || strchr(*ptr, '\\'))
+                        *ptr = xabsolute_path(*ptr);
+        }
+        chdir_system_drive();
+#endif
 
         conf_sec_list = xstrdup("0p:1:1p:2:3:3p:4:5:6:7:8:9");
 
@@ -302,11 +314,24 @@ int man_main(int argc UNUSED_PARAM, char **argv)
         }
         config_close(parser);
 
+#if ENABLE_PLATFORM_MINGW32
+        /* allow man pages to be stored relative to the executable */
+        relpath = exe_relative_path("man");
+
+        if (!man_path_list) {
+                mpl[2] = relpath;
+                man_path_list = (char**)mpl;
+        }
+        else {
+                man_path_list = add_MANPATH(man_path_list, &count_mp, relpath);
+        }
+#else
         if (!man_path_list) {
                 static const char *const mpl[] ALIGN_PTR = { "/usr/man", "/usr/share/man", NULL };
                 man_path_list = (char**)mpl;
                 /*count_mp = 2; - not used below anyway */
         }
+#endif
 
         {
                 /* environment overrides setting from man.config */