Relative paths on the command line

The arguments of -file, -iwad, -def, -defs, -basedir, -userdir and resource directory options are now interpreted to be relative to the command line's initial directory.
skyjake · May 23, 2012 · 7633ae3 · 7633ae3
1 parent f9bb5b1
commit 7633ae3
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 9 deletions.
diff --git a/doomsday/engine/portable/src/dd_main.c b/doomsday/engine/portable/src/dd_main.c
@@ -1564,7 +1564,7 @@ boolean DD_Init(void)
 
         while(++p != CommandLine_Count() && !CommandLine_IsOption(p))
         {
-            const char* filePath = CommandLine_At(p);
+            const char* filePath = CommandLine_PathAt(p);
             directory_t* dir;
             Uri* searchPath;
 
@@ -1615,7 +1615,7 @@ boolean DD_Init(void)
 
                 while(++p != CommandLine_Count() && !CommandLine_IsOption(p))
                 {
-                    addToPathList(&gameResourceFileList, &numGameResourceFileList, CommandLine_At(p));
+                    addToPathList(&gameResourceFileList, &numGameResourceFileList, CommandLine_PathAt(p));
                 }
 
                 p--;/* For ArgIsOption(p) necessary, for p==Argc() harmless */

diff --git a/doomsday/engine/portable/src/def_main.c b/doomsday/engine/portable/src/def_main.c
@@ -869,11 +869,12 @@ static void readAllDefinitions(void)
     for(p = 0; p < CommandLine_Count(); ++p)
     {
         const char* arg = CommandLine_At(p);
-        if(!CommandLine_IsMatchingAlias("-def", arg) && !CommandLine_IsMatchingAlias("-defs", arg)) continue;
+        if(!CommandLine_IsMatchingAlias("-def", arg) &&
+           !CommandLine_IsMatchingAlias("-defs", arg)) continue;
 
         while(++p != CommandLine_Count() && !CommandLine_IsOption(p))
         {
-            const char* searchPath = CommandLine_At(p);
+            const char* searchPath = CommandLine_PathAt(p);
 
             Con_Message("  Processing '%s'...\n", F_PrettyPath(searchPath));
 

diff --git a/doomsday/engine/portable/src/sys_reslocator.c b/doomsday/engine/portable/src/sys_reslocator.c
@@ -793,7 +793,7 @@ void F_CreateNamespacesForFileResourcePaths(void)
 
         if(def->optOverridePath && CommandLine_CheckWith(def->optOverridePath, 1))
         {
-            const char* path = CommandLine_Next();
+            const char* path = CommandLine_NextAsPath();
             ddstring_t path2;
 
             // Override paths are added in reverse order.
@@ -810,7 +810,7 @@ void F_CreateNamespacesForFileResourcePaths(void)
 
         if(def->optFallbackPath && CommandLine_CheckWith(def->optFallbackPath, 1))
         {
-            Uri_SetUri3(uri, CommandLine_Next(), RC_NULL);
+            Uri_SetUri3(uri, CommandLine_NextAsPath(), RC_NULL);
             ResourceNamespace_AddSearchPath(rnamespace, def->searchPathFlags, uri, SPG_FALLBACK);
         }
     }}

diff --git a/doomsday/engine/unix/src/dd_uinit.c b/doomsday/engine/unix/src/dd_uinit.c
@@ -267,7 +267,7 @@ static void determineGlobalPaths(application_t* app)
         filename_t runtimePath;
         directory_t* temp;
 
-        strncpy(runtimePath, CommandLine_Next(), FILENAME_T_MAXLEN);
+        strncpy(runtimePath, CommandLine_NextAsPath(), FILENAME_T_MAXLEN);
         Dir_CleanPath(runtimePath, FILENAME_T_MAXLEN);
         // Ensure the path is closed with a directory separator.
         F_AppendMissingSlashCString(runtimePath, FILENAME_T_MAXLEN);
@@ -303,7 +303,7 @@ static void determineGlobalPaths(application_t* app)
      */
     if(CommandLine_CheckWith("-basedir", 1))
     {
-        strncpy(ddBasePath, CommandLine_Next(), FILENAME_T_MAXLEN);
+        strncpy(ddBasePath, CommandLine_NextAsPath(), FILENAME_T_MAXLEN);
     }
     else
     {

diff --git a/doomsday/engine/win32/src/dd_winit.c b/doomsday/engine/win32/src/dd_winit.c
@@ -370,7 +370,7 @@ static void determineGlobalPaths(application_t* app)
         filename_t runtimePath;
         directory_t* temp;
 
-        strncpy(runtimePath, CommandLine_Next(), FILENAME_T_MAXLEN);
+        strncpy(runtimePath, CommandLine_NextAsPath(), FILENAME_T_MAXLEN);
         Dir_CleanPath(runtimePath, FILENAME_T_MAXLEN);
         // Ensure the path is closed with a directory separator.
         F_AppendMissingSlashCString(runtimePath, FILENAME_T_MAXLEN);