Changeset 182

Timestamp:

Dec 17, 2017, 5:51:59 PM (7 years ago)

Author:

Gregg Young

Message:

Fix to restore ability to use relative paths in the configuration.. Ticket #82

File:

• trunk/src/cfte.cpp (modified) (4 diffs)

trunk/src/cfte.cpp ¶

@@ -2129 +2129 @@
 #else // if PT_UNIXISH
 #if defined(OS2)
-#       define SEARCH_PATH_LEN 25
+#       define SEARCH_PATH_LEN 26
 #else
 #       define SEARCH_PATH_LEN 21
@@ -2137 +2137 @@
         const char *pg = getenv("EFTEDIR");
 #if defined(OS2)
-        snprintf(dirs[0], MAXPATH, "%s/config/%s", pg, CfgName);
-        snprintf(dirs[1], MAXPATH, "%s/%s", pg, CfgName); //EFTEDIR can be full path to config files
-        snprintf(dirs[2], MAXPATH, "%s/local/%s", pg, CfgName);
+        
+        snprintf(dirs[0], MAXPATH, "%s%s", last, CfgName);
+        snprintf(dirs[1], MAXPATH, "%s/config/%s", pg, CfgName);
+        snprintf(dirs[2], MAXPATH, "%s/%s", pg, CfgName); //EFTEDIR can be full path to config files
         snprintf(dirs[3], MAXPATH, "%s/../%s", pg, CfgName);
         ExePath = (char *) malloc(MAXPATH);
@@ -2175 +2176 @@
         snprintf(dirs[23], MAXPATH, "/Program Files (x86)/efte/config/%s", CfgName);
         snprintf(dirs[24], MAXPATH, "/Program Files (x86)/efte/%s", CfgName);
+        snprintf(dirs[25], MAXPATH, "%s/local/%s", pg, CfgName);
+
 #else // if OS2
         snprintf(dirs[0], MAXPATH, "%s/config/%s", pg, CfgName);
@@ -2225 +2228 @@
         if (!stricmp(lastCfg, Cfg))
             DieError(1, "File '%s' is (o)including itself", Cfg);
-        strlcpy(lastCfg, Cfg, sizeof(lastCfg));
+        if (found) {
+            strlcpy(lastCfg, Cfg, sizeof(lastCfg));
+        }
         if (found == false && stricmp(Cfg, "edefault.fte") && !checked && !optional) {
             ChoiceInfo *choice;