freecnc-paths.patch

   1 --- freecnc-20050409/src/vfs/vfs.cpp~   2005-03-26 00:49:21.000000000 +0100
   2 +++ freecnc-20050409/src/vfs/vfs.cpp    2005-04-09 23:26:39.000000000 +0200
   3 @@ -48,7 +48,11 @@
   4      externals->loadArchive(tempstr.c_str());
   5  #if defined _WIN32
   6  #else
   7 -    externals->loadArchive("/etc/freecnc/");
   8 +    char f[1024];
   9 +    sprintf(f, "%s/.freecnc/", getenv("HOME_ETC") ? getenv("HOME_ETC") : getenv("HOME"));
  10 +    externals->loadArchive(f);
  11 +    externals->loadArchive("/etc/");
  12 +    externals->loadArchive("/usr/share/freecnc/");
  13  #endif
  14
  15      try {
  16 --- freecnc-20050409/src/freecnc.cpp~   2005-03-26 00:49:18.000000000 +0100
  17 +++ freecnc-20050409/src/freecnc.cpp    2005-04-09 23:35:21.000000000 +0200
  18 @@ -67,7 +67,7 @@
  19      }
  20
  21      const string& binpath = determineBinaryLocation(argv[0]);
  22 -    string lf(binpath);
  23 +    string lf("/tmp");
  24      lf += "/freecnc.log";
  25
  26      VFS_PreInit(binpath.c_str());
  27 --- freecnc-20050409/src/misc/args.cpp.orig     2005-04-10 00:40:22.000000000 +0200
  28 +++ freecnc-20050409/src/misc/args.cpp  2005-04-10 01:33:21.000000000 +0200
  29 @@ -55,6 +55,15 @@
  30      return config;
  31  }
  32
  33 +std::string ConfigPath(std::string filename)
  34 +{
  35 +    std::string f;
  36 +    f=getenv("HOME_ETC") ? getenv("HOME_ETC") : getenv("HOME");
  37 +    f+="/.freecnc/";
  38 +    f+=filename;
  39 +    return f;
  40 +}
  41 +
  42  /** function to parse command line arguments
  43   * @param number of arguments
  44   * @param pointer to array of arguments
  45 @@ -69,8 +78,8 @@
  46      shared_ptr<INIFile> internal_ini;
  47
  48      try {
  49 -        freecnc_ini = GetConfig("freecnc.ini");
  50 -        internal_ini = GetConfig("internal-global.ini");
  51 +        freecnc_ini = GetConfig(ConfigPath("freecnc.ini"));
  52 +        internal_ini = GetConfig(ConfigPath("internal-global.ini"));
  53      } catch(runtime_error& e) {
  54          logger->error("%s\n",e.what());
  55          return false;