Changeset 1398 for trunk/dll/pathutil.c

Timestamp:

Feb 21, 2009, 6:43:00 PM (16 years ago)

Author:

Gregg Young

Message:

Move embeded strings to PCSZ variables or string table; Eliminate Error2 functions Runtime_Error with NULL format string returns "No data" error. Change declares from PSZ to PCSZ in functions where the variable isn't changed. Added btm as an executable file type in several additional places. Use fProtectOnly to prevent attempt to execute Dos and Win programs on "Protect only" installs in several additional places.

File:

• trunk/dll/pathutil.c (modified) (10 diffs)

trunk/dll/pathutil.c

@@ -37 +37 @@
 #include "wrappers.h"                   // xmalloc
 #include "fortify.h"
+#include "stristr.h"                    //stristr
 
 static PSZ pszSrcFile = __FILE__;
@@ -51 +52 @@
  */
 
-PSZ BldFullPathName(PSZ pszFullPathName, PSZ pszPathName, PSZ pszFileName)
+PSZ BldFullPathName(PSZ pszFullPathName, PCSZ pszPathName, PCSZ pszFileName)
 {
   UINT c = pszPathName ? strlen(pszPathName) : 0;
@@ -70 +71 @@
  */
 
-PSZ BldQuotedFullPathName(PSZ pszFullPathName, PSZ pszPathName, PSZ pszFileName)
+PSZ BldQuotedFullPathName(PSZ pszFullPathName, PCSZ pszPathName, PCSZ pszFileName)
 {
   UINT c = pszPathName ? strlen(pszPathName) : 0;
@@ -146 +147 @@
   strcpy(szCmdLine, pszCmdLine_);
   if (szCmdLine[0] != '\0') {
-    offsetexe = strstr(strlwr(pszCmdLine_), ".exe");
-    offsetcmd = strstr(strlwr(pszCmdLine_), ".cmd");
-    offsetcom = strstr(strlwr(pszCmdLine_), ".com");
-    offsetbtm = strstr(strlwr(pszCmdLine_), ".btm");
-    offsetbat = strstr(strlwr(pszCmdLine_), ".bat");
+    offsetexe = stristr(pszCmdLine_, PCSZ_DOTEXE);
+    offsetcmd = stristr(pszCmdLine_, PCSZ_DOTCMD);
+    offsetcom = stristr(pszCmdLine_, PCSZ_DOTCOM);
+    offsetbtm = stristr(pszCmdLine_, PCSZ_DOTBTM);
+    offsetbat = stristr(pszCmdLine_, PCSZ_DOTBAT);
     if (offsetexe)
       offset = offsetexe;
@@ -184 +185 @@
                pszCmdLine_);
       if (!offsetexe && !offsetcom) {
-        FullPath = searchapath("PATH", szCmdLine);
+        FullPath = searchapath(PCSZ_PATH, szCmdLine);
         if (*FullPath)
           ret = 0;
@@ -224 +225 @@
         ret = DosQueryAppType(szCmdLine, &ulAppType); // exe automatically appended
         if (!ret)
-          strcat(szCmdLine, ".exe");
+          strcat(szCmdLine, PCSZ_DOTEXE);
         else {
-          strcat(szCmdLine, ".com");
+          strcat(szCmdLine, PCSZ_DOTCOM);
           ret = DosQueryAppType(szCmdLine, &ulAppType);
           if (ret) {
             offset = strrchr(szCmdLine, '.' );
             *offset = 0;
-            strcat(szCmdLine, ".cmd");
-            FullPath = searchapath("PATH", szCmdLine);
+            strcat(szCmdLine, PCSZ_DOTCMD);
+            FullPath = searchapath(PCSZ_PATH, szCmdLine);
             if (*FullPath)
               ret = 0;
             else {
               *offset = 0;
-              strcat(szCmdLine, ".bat");
-              FullPath = searchapath("PATH", szCmdLine);
+              strcat(szCmdLine, PCSZ_DOTBAT);
+              FullPath = searchapath(PCSZ_PATH, szCmdLine);
               if (*FullPath)
                 ret = 0;
               else {
                 *offset = 0;
-                strcat(szCmdLine, ".bmt");
-                FullPath = searchapath("PATH", szCmdLine);
+                strcat(szCmdLine, PCSZ_DOTBTM);
+                FullPath = searchapath(PCSZ_PATH, szCmdLine);
                 if (*FullPath)
                   ret = 0;
@@ -262 +263 @@
             ret = DosQueryAppType(szCmdLine, &ulAppType);
             if (!ret) {
-              strcat(szCmdLine, ".exe");
+              strcat(szCmdLine, PCSZ_DOTEXE);
               break;
             }
             else {
-              strcat(szCmdLine, ".com");
+              strcat(szCmdLine, PCSZ_DOTCOM);
               ret = DosQueryAppType(szCmdLine, &ulAppType);
               if (ret) {
                 offset = strrchr(szCmdLine, '.' );
                 *offset = 0;
-                strcat(szCmdLine, ".cmd");
-                FullPath = searchapath("PATH", szCmdLine);
+                strcat(szCmdLine, PCSZ_DOTCMD);
+                FullPath = searchapath(PCSZ_PATH, szCmdLine);
                 if (*FullPath) {
                   ret = 0;
@@ -279 +280 @@
                 else {
                   *offset = 0;
-                  strcat(szCmdLine, ".bat");
-                  FullPath = searchapath("PATH", szCmdLine);
+                  strcat(szCmdLine, PCSZ_DOTBAT);
+                  FullPath = searchapath(PCSZ_PATH, szCmdLine);
                   if (*FullPath) {
                     ret = 0;
@@ -287 +288 @@
                   else {
                     *offset = 0;
-                    strcat(szCmdLine, ".bmt");
-                    FullPath = searchapath("PATH", szCmdLine);
+                    strcat(szCmdLine, PCSZ_DOTBTM);
+                    FullPath = searchapath(PCSZ_PATH, szCmdLine);
                     if (*FullPath) {
                       ret = 0;
@@ -349 +350 @@
              GetPString(IDS_QUOTESINARGSTEXT),
              pszCmdLine_);
-    FullPath = searchapath("PATH", szCmdLine);
+    FullPath = searchapath(PCSZ_PATH, szCmdLine);
     BldQuotedFileName(pszNewCmdLine, szCmdLine);
     //printf("%d %s ", ret, szCmdLine); fflush(stdout);