win32: move is_absolute_path()

Make is_absolute_path() a function rather than a macro and move it
from ash.c into mingw.c.

3 files changed, 10 insertions, 3 deletions

diff --git a/include/mingw.h b/include/mingw.h
index 5cb5cb88c..d48237add 100644
--- a/include/mingw.h
+++ b/include/mingw.h
@@ -561,3 +561,4 @@ void make_sparse(int fd, off_t start, off_t end);
 int skip_ansi_emulation(int reset);
 int unix_path(const char *path);
 int has_path(const char *file);
+int is_absolute_path(const char *path);
diff --git a/shell/ash.c b/shell/ash.c
index 5c6eb5759..2c99c3ead 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -322,8 +322,6 @@ typedef long arith_t;
 
 #if !ENABLE_PLATFORM_MINGW32
 # define is_absolute_path(path) ((path)[0] == '/')
-#else
-# define is_absolute_path(path) ((path)[0] == '/' || (path)[0] == '\\' || has_dos_drive_prefix(path))
 #endif
 
 #if !BB_MMU
@@ -3028,7 +3026,6 @@ updatepwd(const char *dir)
 {
 #if ENABLE_PLATFORM_MINGW32
 # define is_path_sep(x) ((x) == '/' || (x) == '\\')
-# define is_root(x) (is_path_sep(x[0]) && x[1] == '\0')
         /*
          * Due to Windows drive notion, getting pwd is a completely
          * different thing. Handle it in a separate routine
diff --git a/win32/mingw.c b/win32/mingw.c
index 6e1dc6a9a..c9b72ae98 100644
--- a/win32/mingw.c
+++ b/win32/mingw.c
@@ -1922,3 +1922,12 @@ int has_path(const char *file)
         return strchr(file, '/') || strchr(file, '\\') ||
                                 has_dos_drive_prefix(file);
 }
+
+/* This function is misnamed.  It's actually a test for 'is not a path
+ * relative to the current working directory'.  On Unix this is the
+ * same as 'is an absolute path' but Windows also has paths relative to
+ * current root and relative to current directory of another drive. */
+int is_absolute_path(const char *path)
+{
+        return path[0] == '/' || path[0] == '\\' || has_dos_drive_prefix(path);
+}