Changeset 837

Timestamp:

Sep 21, 2007, 9:17:59 PM (18 years ago)

Author:

Gregg Young

Message:

Fix for #144 crash when file names exceed max path; Initial xDosFindFirst/Next wrapper for performacne testing

Location:

trunk

Files:

• HISTORY (modified) (1 diff)
• dll/grep.c (modified) (6 diffs)

trunk/HISTORY

@@ -3 +3 @@
 3.08 (pending)
  o Rework filemask logic to match last extension and allow for string matching (Gregg)
+ o Fix trap on search where file name length exceeds maxpath (Gregg)
 
 3.07 

trunk/dll/grep.c

@@ -26 +26 @@
   26 Aug 07 GKY Improved performance of FillDups
   26 Aug 07 GKY DosSleep(1) in loops changed to (0)
+  21 Sep 07 GKY Fix trap on search that includes filenames that exceed maxpath
 
 ***********************************************************************/
@@ -411 +412 @@
   // step through all subdirectories
   DosError(FERR_DISABLEHARDERR);
-  if (!DosFindFirst(searchPath, &findHandle, (MUST_HAVE_DIRECTORY |
-                                              FILE_ARCHIVED | FILE_SYSTEM |
-                                              FILE_HIDDEN | FILE_READONLY),
-                    &ffb, (ULONG) sizeof(ffb),
-                    (PULONG) & ulFindCnt, FIL_QUERYEASIZE)) {
+  if (!xDosFindFirst(searchPath, &findHandle, (MUST_HAVE_DIRECTORY |
+                     FILE_ARCHIVED | FILE_SYSTEM | FILE_HIDDEN | FILE_READONLY),
+                     &ffb, (ULONG) sizeof(ffb),
+                     (PULONG) & ulFindCnt, FIL_QUERYEASIZE)) {
 
     // get rid of mask portion, save end-of-directory
@@ -440 +440 @@
       }
       ulFindCnt = 1;
-    } while (!DosFindNext(findHandle,
-                          &ffb,
-                          sizeof(ffb), (PULONG) & ulFindCnt));
+    } while (!xDosFindNext(findHandle,
+                           &ffb,
+                           sizeof(ffb), (PULONG) & ulFindCnt));
     DosFindClose(findHandle);
     priority_normal();
@@ -487 +487 @@
   DosError(FERR_DISABLEHARDERR);
   ulFindCnt = FilesToGet;
-  rc = DosFindFirst(szFindPath,
-                    &findHandle,
-                    FILE_NORMAL | grep->attrFile | grep->antiattr,
-                    pffbArray,
-                    ulBufBytes,
-                    &ulFindCnt,
-                    FIL_QUERYEASIZE);
+  rc = xDosFindFirst(szFindPath,
+                     &findHandle,
+                     FILE_NORMAL | grep->attrFile | grep->antiattr,
+                     pffbArray,
+                     ulBufBytes,
+                     &ulFindCnt,
+                     FIL_QUERYEASIZE);
   if (!rc) {
     do {
@@ -503 +503 @@
           break;
         if (*pffbFile->achName != '.' ||
-            (pffbFile->achName[1] && pffbFile->achName[1] != '.')) {
-          strcpy(p, pffbFile->achName); // build filename
+            (pffbFile->achName[1] && pffbFile->achName[1] != '.')) {
+          strcpy(p, pffbFile->achName); // build filename
+          if (strlen(szFindPath) > 256){   //21 Sep GKY check for pathnames that exceed maxpath
+            DosFindClose(findHandle);
+            free(pffbArray);
+            return 1;
+          }
           if (!grep->anyexcludes || !IsExcluded(szFindPath, fle, numfls)) {
             if (!grep->finddupes)
@@ -523 +528 @@
       DosSleep(0); //26 Aug 07 GKY 1
       ulFindCnt = FilesToGet;
-      rc = DosFindNext(findHandle, pffbArray, ulBufBytes, &ulFindCnt);
+      rc = xDosFindNext(findHandle, pffbArray, ulBufBytes, &ulFindCnt);
     } while (!rc);