From: Adam Gołębiowski Date: Sun, 10 Apr 2005 10:35:28 +0000 (+0000) Subject: - reverted (doesn't work) X-Git-Url: http://git.pld-linux.org/?p=packages%2Ffreecnc.git;a=commitdiff_plain;h=985242a19d789d9af84cfdb3b4c3efd2cacb12c2 - reverted (doesn't work) Changed files: freecnc-paths.patch -> 1.3 --- diff --git a/freecnc-paths.patch b/freecnc-paths.patch index d9ae8e8..41f96b6 100644 --- a/freecnc-paths.patch +++ b/freecnc-paths.patch @@ -24,32 +24,3 @@ lf += "/freecnc.log"; VFS_PreInit(binpath.c_str()); ---- freecnc-20050409/src/misc/args.cpp.orig 2005-04-10 00:40:22.000000000 +0200 -+++ freecnc-20050409/src/misc/args.cpp 2005-04-10 01:33:21.000000000 +0200 -@@ -55,6 +55,15 @@ - return config; - } - -+std::string ConfigPath(std::string filename) -+{ -+ std::string f; -+ f=getenv("HOME_ETC") ? getenv("HOME_ETC") : getenv("HOME"); -+ f+="/.freecnc/"; -+ f+=filename; -+ return f; -+} -+ - /** function to parse command line arguments - * @param number of arguments - * @param pointer to array of arguments -@@ -69,8 +78,8 @@ - shared_ptr internal_ini; - - try { -- freecnc_ini = GetConfig("freecnc.ini"); -- internal_ini = GetConfig("internal-global.ini"); -+ freecnc_ini = GetConfig(ConfigPath("freecnc.ini")); -+ internal_ini = GetConfig(ConfigPath("internal-global.ini")); - } catch(runtime_error& e) { - logger->error("%s\n",e.what()); - return false;