Refactor|Console|libdoomsday: Use de::Path for the default config path

skyjake · Jun 19, 2014 · feafb82 · feafb82
1 parent ca9db5b
commit feafb82
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 12 deletions.
diff --git a/doomsday/client/include/con_config.h b/doomsday/client/include/con_config.h
@@ -1,8 +1,8 @@
 /** @file con_config.h  Config file IO.
  * @ingroup console
  *
- * @authors Copyright © 2003-2013 Jaakko Keränen <jaakko.keranen@iki.fi>
- * @authors Copyright © 2006-2013 Daniel Swanson <danij@dengine.net>
+ * @authors Copyright © 2003-2014 Jaakko Keränen <jaakko.keranen@iki.fi>
+ * @authors Copyright © 2006-2014 Daniel Swanson <danij@dengine.net>
  *
  * @par License
  * GPL: http://www.gnu.org/licenses/gpl.html
@@ -22,13 +22,14 @@
 #define DENG_CONSOLE_CONFIG_H
 
 #include "dd_share.h"
+#include <de/Path>
 
 // Flags for Con_ParseCommands:
 #define CPCF_SET_DEFAULT            0x1
 #define CPCF_ALLOW_SAVE_STATE       0x2
 #define CPCF_ALLOW_SAVE_BINDINGS    0x4
 
-bool Con_ParseCommands(char const *fileName, int flags = 0);
+bool Con_ParseCommands(de::Path const &fileName, int flags = 0);
 
 /**
  * Saves all bindings, aliases and archiveable console variables.

diff --git a/doomsday/client/src/con_config.cpp b/doomsday/client/src/con_config.cpp
@@ -44,7 +44,7 @@
 
 using namespace de;
 
-static filename_t cfgFile;
+static Path cfgFile;
 static int flagsAllow;
 
 static void writeHeaderComment(FILE *file)
@@ -225,15 +225,14 @@ static bool writeState(Path const &filePath, Path const &bindingsFileName = "")
     return true;
 }
 
-bool Con_ParseCommands(char const *fileName, int flags)
+bool Con_ParseCommands(Path const &fileName, int flags)
 {
     bool const setDefault = (flags & CPCF_SET_DEFAULT) != 0;
 
     // Is this supposed to be the default?
     if(setDefault)
     {
-        strncpy(cfgFile, fileName, FILENAME_T_MAXLEN);
-        cfgFile[FILENAME_T_LASTINDEX] = '\0';
+        cfgFile = fileName;
     }
 
     // Update the allowed operations.

diff --git a/doomsday/client/src/dd_main.cpp b/doomsday/client/src/dd_main.cpp
@@ -1207,14 +1207,14 @@ static int DD_ActivateGameWorker(void *context)
         }
 
         LOG_SCR_MSG("Parsing primary config \"%s\"...") << NativePath(configFile).pretty();
-        Con_ParseCommands(configFile.toUtf8().constData(), CPCF_SET_DEFAULT | CPCF_ALLOW_SAVE_STATE);
+        Con_ParseCommands(configFile, CPCF_SET_DEFAULT | CPCF_ALLOW_SAVE_STATE);
 
 #ifdef __CLIENT__
         // Apply default control bindings for this game.
         B_BindGameDefaults();
 
         // Read bindings for this game and merge with the working set.
-        Con_ParseCommands(App_CurrentGame().bindingConfig().toUtf8().constData(), CPCF_ALLOW_SAVE_BINDINGS);
+        Con_ParseCommands(App_CurrentGame().bindingConfig(), CPCF_ALLOW_SAVE_BINDINGS);
 #endif
     }
 

diff --git a/doomsday/libdoomsday/include/doomsday/console/exec.h b/doomsday/libdoomsday/include/doomsday/console/exec.h
@@ -24,6 +24,7 @@
 #include "dd_share.h"
 #include "dd_types.h"
 #include <de/game/Game>
+#include <de/Path>
 
 #include <de/shell/Lexicon> // known words
 #include <cstdio>
@@ -69,7 +70,7 @@ LIBDOOMSDAY_PUBLIC void Con_Ticker(timespan_t time);
 LIBDOOMSDAY_PUBLIC int Con_Execute(byte src, char const *command, int silent, dd_bool netCmd);
 LIBDOOMSDAY_PUBLIC int Con_Executef(byte src, int silent, char const *command, ...) PRINTF_F(3,4);
 
-LIBDOOMSDAY_PUBLIC dd_bool Con_Parse(char const *fileName, dd_bool silently);
+LIBDOOMSDAY_PUBLIC dd_bool Con_Parse(de::Path const &fileName, dd_bool silently);
 
 #ifdef __cplusplus
 } // extern "C"

diff --git a/doomsday/libdoomsday/src/console/exec.cpp b/doomsday/libdoomsday/src/console/exec.cpp
@@ -869,7 +869,7 @@ static void readLine(char *buffer, size_t len, FileHandle *file)
     }
 }
 
-dd_bool Con_Parse(char const *fileName, dd_bool silently)
+dd_bool Con_Parse(Path const &fileName, dd_bool silently)
 {
     try
     {
@@ -906,7 +906,7 @@ dd_bool Con_Parse(char const *fileName, dd_bool silently)
     }
     catch(FS1::NotFoundError const &)
     {} // Ignore.
-    LOG_SCR_WARNING("Failed to open \"%s\" for write") << fileName;
+    LOG_SCR_WARNING("Failed to open \"%s\" for write") << NativePath(fileName).pretty();
     return false;
 }