Changeset 763 for trunk/dll/comp.c

Timestamp:

Aug 5, 2007, 2:16:17 AM (18 years ago)

Author:

Gregg Young

Message:

Replaced sprintf path building with BldFullPathName at functions for quoting path and file names

File:

• trunk/dll/comp.c (modified) (11 diffs)

trunk/dll/comp.c

@@ -72 +72 @@
   char *mask, *enddir;
   HDIR hdir = HDIR_CREATE;
-  ULONG nm = 1L;
+  ULONG nm = 1;
 
   fb = xmalloc(sizeof(FILEFINDBUF4), pszSrcFile, __LINE__);
@@ -103 +103 @@
                     fb->ftimeLastWrite.minutes,
                     fb->ftimeLastWrite.twosecs,
-                    fb->attrFile, (fb->cbList > 4L) ? (fb->cbList / 2L) : 0L);
+                    fb->attrFile, (fb->cbList > 4) ? (fb->cbList / 2) : 0);
           // Skip . and ..
           else if (recurse &&
@@ -111 +111 @@
             SnapShot(mask, fp, recurse);
           }
-          nm = 1L;
+          nm = 1;
         } while (!DosFindNext(hdir, fb, sizeof(FILEFINDBUF4), &nm));
         DosFindClose(hdir);
@@ -358 +358 @@
   PCNRITEM pci, pciD, pciNextS, pciNextD;
   CHAR newname[CCHMAXPATH], dirname[CCHMAXPATH], *p;
+  PSZ pszNewName = newname;
   APIRET rc;
 
@@ -458 +459 @@
           case IDM_MOVE:
             if (hwndCnrS == WinWindowFromID(cmp->hwnd, COMP_RIGHTDIR))
-              // 02 Aug 07 SHL fixme to replace this kind of stuff with _makepath or equivalent
-              sprintf(newname, "%s%s%s",
-                      cmp->leftdir,
-                      cmp->leftdir[strlen(cmp->leftdir) - 1] == '\\' ?
-                        NullStr : "\\",
-                        pci->pszDisplayName);
-            else
-              sprintf(newname, "%s%s%s",
-                      cmp->rightdir,
-                      cmp->rightdir[strlen(cmp->rightdir) - 1] == '\\' ?
-                        NullStr : "\\",
-                      pci->pszDisplayName);
+              // 02 Aug 07 SHL fixme to replace this kind of stuff with _makepath or equivalent
+              BldFullPathName(pszNewName, cmp->leftdir, pci->pszDisplayName);
+              //sprintf(newname, "%s%s%s",
+              //        cmp->leftdir,
+              //        cmp->leftdir[strlen(cmp->leftdir) - 1] == '\\' ?
+              //        NullStr : "\\",
+              //        pci->pszDisplayName);
+            else
+              BldFullPathName(pszNewName, cmp->rightdir, pci->pszDisplayName);
+              //sprintf(newname, "%s%s%s",
+              //        cmp->rightdir,
+              //        cmp->rightdir[strlen(cmp->rightdir) - 1] == '\\' ?
+              //        NullStr : "\\",
+              //        pci->pszDisplayName);
             // Make directory if required
             strcpy(dirname, newname);
@@ -548 +551 @@
 
           case IDM_COPY:
-            if (hwndCnrS == WinWindowFromID(cmp->hwnd, COMP_RIGHTDIR))
-              sprintf(newname, "%s%s%s",
-                      cmp->leftdir,
-                      cmp->leftdir[strlen(cmp->leftdir) - 1] == '\\' ?
-                        NullStr : "\\",
-                      pci->pszDisplayName);
-            else
-              sprintf(newname, "%s%s%s",
-                      cmp->rightdir,
-                      cmp->rightdir[strlen(cmp->rightdir) - 1] == '\\' ?
-                        NullStr : "\\",
-                      pci->pszDisplayName);
+            if (hwndCnrS == WinWindowFromID(cmp->hwnd, COMP_RIGHTDIR))
+              BldFullPathName(pszNewName, cmp->leftdir, pci->pszDisplayName);
+              //sprintf(newname, "%s%s%s",
+              //        cmp->leftdir,
+              //        cmp->leftdir[strlen(cmp->leftdir) - 1] == '\\' ?
+              //        NullStr : "\\",
+              //        pci->pszDisplayName);
+            else
+              BldFullPathName(pszNewName, cmp->rightdir, pci->pszDisplayName);
+              //sprintf(newname, "%s%s%s",
+              //        cmp->rightdir,
+              //        cmp->rightdir[strlen(cmp->rightdir) - 1] == '\\' ?
+              //        NullStr : "\\",
+              //        pci->pszDisplayName);
             // Make directory if required
             strcpy(dirname, newname);
@@ -709 +714 @@
   FILEFINDBUF4 *ffb4, *pffb;
   HDIR hDir;
-  ULONG nm, fl = 0, ulM = 64;
+  ULONG nm, fl = 0, ulM = FilesToGet;
   APIRET rc;
 
@@ -717 +722 @@
   }
 
-  if (!recurse)
-    ulM = FilesToGet;
+  //if (!recurse)
+  //  ulM = FilesToGet;
   maskstr = xmalloc(CCHMAXPATH, pszSrcFile, __LINE__);
   if (!maskstr)
@@ -812 +817 @@
   HWND hwndLeft, hwndRight;
   CHAR szBuf[CCHMAXPATH];
+  PSZ pszBuf = szBuf;
   CNRINFO cnri;
 
@@ -1093 +1099 @@
 
           if (x <= 0) {
-            // File appears on left side
-            sprintf(szBuf, "%s%s%s", cmp->leftdir,
-                    (cmp->leftdir[strlen(cmp->leftdir) - 1] == '\\') ?
-                    NullStr : "\\", filesl[l]->fname);
+            // File appears on left side
+            BldFullPathName(pszBuf, cmp->leftdir, filesl[l]->fname);
+            //sprintf(szBuf, "%s%s%s", cmp->leftdir,
+            //        (cmp->leftdir[strlen(cmp->leftdir) - 1] == '\\') ?
+            //        NullStr : "\\", filesl[l]->fname);
             pcil->pszFileName = xstrdup(szBuf, pszSrcFile, __LINE__);
             pcil->pszDisplayName = pcil->pszFileName + lenl;
@@ -1131 +1138 @@
 
           if (x >= 0) {
-            // File appears on right side
-            sprintf(szBuf, "%s%s%s", cmp->rightdir,
-                    (cmp->rightdir[strlen(cmp->rightdir) - 1] == '\\') ?
-                    NullStr : "\\", filesr[r]->fname);
+            // File appears on right side
+            BldFullPathName(pszBuf, cmp->rightdir, filesl[r]->fname);
+            //sprintf(szBuf, "%s%s%s", cmp->rightdir,
+            //        (cmp->rightdir[strlen(cmp->rightdir) - 1] == '\\') ?
+            //        NullStr : "\\", filesr[r]->fname);
             pcir->pszFileName = xstrdup(szBuf, pszSrcFile, __LINE__);   // 31 Jul 07 SHL
             pcir->pszDisplayName = pcir->pszFileName + lenr;