Changeset 773 for trunk/dll/seeall.c

Timestamp:

Aug 7, 2007, 11:23:27 PM (18 years ago)

Author:

Steven Levine

Message:

Correct some compare directories collector nits
Use BldQuoted... functions
Move BldQuoted... functions near primary callers
Add RUNTYPE_MASK
Use Runtime_Error2 more

File:

• trunk/dll/seeall.c (modified) (5 diffs)

trunk/dll/seeall.c

@@ -23 +23 @@
   30 Mar 07 GKY Remove GetPString for window class names
   03 Aug 07 GKY Enlarged and made setable everywhere Findbuf (speed file loading)
+  07 Aug 07 SHL Use BldQuotedFullPathName and BldQuotedFileName
 
 ***********************************************************************/
@@ -465 +466 @@
           x = 0;
           while (list[x]) {
-
             FILESTATUS3 fsa;
-            BOOL spaces;
-
-            if (needs_quoting(list[x])) {
-              spaces = TRUE;
-              strcat(szBuffer, "\"");
-            }
-            else
-              spaces = FALSE;
-            strcat(szBuffer, list[x]);
+            // BOOL spaces;
+            // if (needs_quoting(list[x])) {
+            //   spaces = TRUE;
+            //   strcat(szBuffer, "\"");
+            // }
+            // else
+            //   spaces = FALSE;
+            // strcat(szBuffer, list[x]);
             memset(&fsa, 0, sizeof(fsa));
             DosError(FERR_DISABLEHARDERR);
-            DosQueryPathInfo(list[x], FIL_STANDARD,
-                             &fsa, (ULONG) sizeof(fsa));
+            DosQueryPathInfo(list[x], FIL_STANDARD, &fsa, sizeof(fsa));
             if (fsa.attrFile & FILE_DIRECTORY) {
-              if (szBuffer[strlen(szBuffer) - 1] != '\\')
-                strcat(szBuffer, "\\");
-              strcat(szBuffer, "*");
-            }
-            if (spaces)
-              strcat(szBuffer, "\"");
+              BldQuotedFullPathName(szBuffer + strlen(szBuffer),
+                                    list[x], "*");
+              // if (szBuffer[strlen(szBuffer) - 1] != '\\')
+              //        strcat(szBuffer, "\\");
+              // strcat(szBuffer, "*");
+            }
+            else
+              BldQuotedFileName(szBuffer + strlen(szBuffer), list[x]);
+            // if (spaces)
+            //   strcat(szBuffer, "\"");
             x++;
             if (!list[x] || strlen(szBuffer) + strlen(list[x]) + 5 > 1024) {
-              runemf2(SEPARATE | WINDOWED |
-                      ((fArcStuffVisible) ? 0 :
-                       (BACKGROUND | MINIMIZED)) |
-                      WAIT, HWND_DESKTOP, NULL, NULL, "%s", szBuffer);
+              runemf2(SEPARATE | WINDOWED | WAIT |
+                      (fArcStuffVisible ? 0 : (BACKGROUND | MINIMIZED)),
+                      HWND_DESKTOP, NULL, NULL,
+                      "%s", szBuffer);
               DosSleep(1);
               *p = 0;
@@ -829 +831 @@
               maskspaces = TRUE;
             runemf2(SEPARATE | WINDOWED |
-                    ((fArcStuffVisible) ? 0 :
-                     (BACKGROUND | MINIMIZED)),
-                    HWND_DESKTOP,
-                    ex.extractdir,
-                    NULL,
+                    (fArcStuffVisible ? 0 : (BACKGROUND | MINIMIZED)),
+                    HWND_DESKTOP, ex.extractdir, NULL,
                     "%s %s %s%s%s",
                     ex.command,
                     ex.arcname,
-                    (maskspaces) ? "\"" : NullStr,
-                    (*ex.masks) ? ex.masks : "*",
-                    (maskspaces) ? "\"" : NullStr);
+                    maskspaces ? "\"" : NullStr,
+                    *ex.masks ? ex.masks : "*",
+                    maskspaces ? "\"" : NullStr);
           }
         }
@@ -3012 +3011 @@
       list = BuildAList(hwnd);
       if (!list)
-        Runtime_Error(pszSrcFile, __LINE__, "no data");
+        Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
       else {
         WinSetWindowText(pAD->hwndStatus, GetPString(IDS_DRAGGINGFILESTEXT));
@@ -4105 +4104 @@
 
             if (!list)
-              Runtime_Error(pszSrcFile, __LINE__, "no data");
+              Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
             else {
               switch (SHORT1FROMMP(mp1)) {