Changeset 909 for trunk/dll/systemf.c

Timestamp:

Jan 6, 2008, 9:02:31 PM (18 years ago)

Author:

Gregg Young

Message:

Added quoting code to commands, associations and avv; Minor clean up and fixed one problem with quoting logic; Added warning re %a for commands to work on selected files.

File:

• trunk/dll/systemf.c (modified) (2 diffs)

trunk/dll/systemf.c

@@ -1309 +1309 @@
 PSZ CheckApp_QuoteAddExe(PSZ pszPgm)
 {
-  char szTempPgm[CCHMAXPATH], tempcom[CCHMAXPATH], temparg[CCHMAXPATH];
-  char *offset, *offsetexe, *offsetcom, *offsetcmd, *offsetbtm, *offsetbat;
+  char szTempPgm[2048], tempcom[2048], temparg[2048];
+  char *offset = '\0', *offsetexe, *offsetcom, *offsetcmd, *offsetbtm, *offsetbat;
   APIRET ret;
   ULONG ulAppType;
@@ -1328 +1328 @@
     offsetbtm = strstr(strlwr(pszPgm), ".btm");
     offsetbat = strstr(strlwr(pszPgm), ".bat");
-    if (offsetbat){
-      if (strstr(strlwr(pszPgm), "command ") < offsetbat)
-        offset = pszPgm;
-      else
-        offset = offsetbat;
-    }
-    else if (offsetbtm){
-      if (strstr(strlwr(pszPgm), "4os2 ") < offsetbtm)
-        offset = pszPgm;
-      else
-        offset = offsetbtm;
-    }
-    else if (offsetcmd){
-      if (strstr(strlwr(pszPgm), "cmd ") < offsetcmd ||
-          strstr(strlwr(pszPgm), "4os2 ") < offsetcmd)
-        offset = pszPgm;
-      else
-        offset = offsetcmd;
-    }
-    else if (offsetcom)
-      offset = offsetcom;
-    else if (offsetexe)
+    if (offsetexe)
       offset = offsetexe;
-    else {
-      offset = pszPgm;
-    }
-    if (offset - pszPgm != 0){
+    else{
+      if (offsetcom)
+        offset = offsetcom;
+      else{
+        if (offsetcmd)
+          offset = offsetcmd;
+        else{
+          if (offsetbtm)
+            offset = offsetbtm;
+          else{
+            if (offsetbat)
+              offset = offsetexe;
+          }
+        }
+      }
+    }
+    if (offset){
       tempcom[offset + 4 - pszPgm] = '\0';
       strcpy(temparg, &pszPgm[offset + 4 - pszPgm]);