Win32: Fixed -userdir paths not ending in a directory separator

Ensure -userdir path is always closed.
skyjake · Jan 2, 2012 · cc9d0fe · cc9d0fe
1 parent 6b3d86e
commit cc9d0fe
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/doomsday/engine/unix/src/dd_uinit.c b/doomsday/engine/unix/src/dd_uinit.c
@@ -253,7 +253,16 @@ static void determineGlobalPaths(application_t* app)
     // The -userdir option sets the working directory.
     if(ArgCheckWith("-userdir", 1))
     {
-        directory_t* temp = Dir_New(ArgNext());
+        filename_t runtimePath;
+        directory_t* temp;
+
+        strncpy(runtimePath, ArgNext(), FILENAME_T_MAXLEN);
+        Dir_CleanPath(runtimePath, FILENAME_T_MAXLEN);
+        // Ensure the path is closed with a directory separator.
+        if(runtimePath[strlen(runtimePath)-1] != '/')
+            strncat(runtimePath, "/", FILENAME_T_MAXLEN);
+
+        temp = Dir_New(runtimePath);
         app->usingUserDir = Dir_SetCurrent(Dir_Path(temp));
         if(app->usingUserDir)
         {

diff --git a/doomsday/engine/win32/src/dd_winit.c b/doomsday/engine/win32/src/dd_winit.c
@@ -364,7 +364,16 @@ static void determineGlobalPaths(application_t* app)
     // The -userdir option sets the working directory.
     if(ArgCheckWith("-userdir", 1))
     {
-        directory_t* temp = Dir_ConstructFromPathDir(ArgNext());
+        filename_t runtimePath;
+        directory_t* temp;
+
+        strncpy(runtimePath, ArgNext(), FILENAME_T_MAXLEN);
+        Dir_CleanPath(runtimePath, FILENAME_T_MAXLEN);
+        // Ensure the path is closed with a directory separator.
+        if(runtimePath[strlen(runtimePath)-1] != '/')
+            strncat(runtimePath, "/", FILENAME_T_MAXLEN);
+
+        temp = Dir_New(runtimePath);
         app->usingUserDir = Dir_SetCurrent(Dir_Path(temp));
         if(app->usingUserDir)
         {