utils: Return plain drive letter as base/pathname for drive letters on Windows

diff --git a/src/libstrongswan/utils/utils.c b/src/libstrongswan/utils/utils.c
index 1b3765a6937604a7d99be49bf8a5f387c8132aab..2829aba77f1bcfe2cb08e8290816a2a0a9ea32cb 100644 (file)
--- a/src/libstrongswan/utils/utils.c
+++ b/src/libstrongswan/utils/utils.c
@@ -241,6 +241,15 @@ char* path_dirname(const char *path)
        }
        if (!pos)
        {
+#ifdef WIN32
+               if (path && strlen(path))
+               {
+                       if ((isalpha(path[0]) && path[1] == ':'))
+                       {       /* if just a drive letter given, return that as dirname */
+                               return chunk_clone(chunk_from_chars(path[0], ':', 0)).ptr;
+                       }
+               }
+#endif
                return strdup(".");
        }
        while (pos > path && *pos == DIRECTORY_SEPARATOR[0])