Changeset 955 for trunk/dll

Timestamp:

Feb 16, 2008, 11:32:45 PM (18 years ago)

Author:

Gregg Young

Message:

Prevent trap on scan of drive containing files that exceed maxpath (ticket 215)

File:

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

trunk/dll/seeall.c

@@ -33 +33 @@
   30 Dec 07 GKY Use CommaFmtULL
   30 Dec 07 GKY Use TestFDates for comparing by date
+  15 Feb 08 GKY Prevent trap on scan of drive containing files that exceed maxpath
 
 ***********************************************************************/
@@ -1893 +1894 @@
   ULONG x;
   APIRET rc;
-
-  filename = xmalloc(CCHMAXPATH, pszSrcFile, __LINE__);
+  static BOOL fDone;
+
+  filename = xmalloc(CCHMAXPATH + 100, pszSrcFile, __LINE__);
   if (!filename)
     return;
@@ -1941 +1943 @@
         else {
           *enddir = 0;
-          strcpy(enddir, pffbFile->achName);
+          strcpy(enddir, pffbFile->achName);
+          if (strlen(filename) > CCHMAXPATH) {
+            // Complain if pathnames exceeds max
+            DosFindClose(hdir);
+            free(pffbArray);
+            free(filename);
+            if (!fDone) {
+              fDone = TRUE;
+              saymsg(MB_OK | MB_ICONASTERISK,
+                     HWND_DESKTOP,
+                     GetPString(IDS_WARNINGTEXT),
+                     "One or more of your files has a full path name that exceeds the OS/2 maximum");
+            }
+            return;
+          }
           if (!ad->afalloc || ad->afheadcnt > ad->afalloc - 1) {