Changeset 924 for trunk/dll/filldir.c

Timestamp:

Jan 17, 2008, 1:40:52 AM (18 years ago)

Author:

Steven Levine

Message:

Avoid error reports for R/O FAT directories (ticket #116)
Change Config->Edit and Config->Palette menus to have no default
Move SpecialSelect to comp.c

File:

• trunk/dll/filldir.c (modified) (12 diffs)

trunk/dll/filldir.c

@@ -747 +747 @@
       ulFindMax = FilesToGet;           // full-out
   }
-  else {
+  else
     ulFindMax = FilesToGet;
-  }
+
   if (OS2ver[0] == 20 && OS2ver[1] < 30)
     ulFindMax = min(ulFindMax, (65535 / sizeof(FILEFINDBUF4L)));
@@ -780 +780 @@
                        FIL_QUERYEASIZEL);
     priority_normal();
-    *pchEndPath = 0;
+    *pchEndPath = 0;                    // Chop off wildcard
     if (!rc) {
       do {
@@ -971 +971 @@
     }
 
+    /**
+     * DosFind for subdirectories of a read-only directory on a FAT volume
+     * returns path not found if there are no subdirectories
+     * FAT FS seems to ignore . and .. in this case
+     * Map to no more files
+     * We could verify that directory is marked read-only, it's probably not
+     * worth the extra code since we do verify 2 out of 3 prerequisites
+     * 15 Jan 08 SHL
+     */
+    if (rc == ERROR_PATH_NOT_FOUND && !filestoo) {
+      ULONG ulDriveType = 0;
+      CHAR szFSType[CCHMAXPATH];
+      INT removable = CheckDrive(*pszFileSpec, szFSType, &ulDriveType);
+      if (removable != -1 && strcmp(szFSType, "FAT") == 0)
+        rc = ERROR_NO_MORE_FILES;
+    }
+
     if (rc && rc != ERROR_NO_MORE_FILES) {
       Dos_Error(MB_ENTER, rc, HWND_DESKTOP, pszSrcFile, __LINE__,
@@ -1011 +1028 @@
 VOID FillDirCnr(HWND hwndCnr,
                 CHAR * pszDirectory,
-                DIRCNRDATA * dcd, PULONGLONG pullTotalBytes)
+                DIRCNRDATA * dcd,
+                PULONGLONG pullTotalBytes)
 {
   ProcessDirectory(hwndCnr,
-                   (PCNRITEM) NULL,
+                   (PCNRITEM)NULL,
                    pszDirectory,
                    TRUE,                // filestoo
@@ -1021 +1039 @@
                    dcd ? &dcd->stopflag : NULL,
                    dcd,
-                   NULL,
+                   NULL,                // total files
                    pullTotalBytes);
   DosPostEventSem(CompactSem);
@@ -1039 +1057 @@
 VOID FillTreeCnr(HWND hwndCnr, HWND hwndParent)
 {
-  ULONG ulCurDriveNum, ulDriveMap, numtoinsert = 0, drvtype;
+  ULONG ulCurDriveNum, ulDriveMap, numtoinsert = 0;
+  ULONG ulDriveType;
   PCNRITEM pci, pciFirst = NULL, pciNext, pciParent = NULL;
   INT x, removable;
   CHAR suggest[32];
   CHAR szDrive[] = " :\\";
-  CHAR szFileSystem[CCHMAXPATH];
+  CHAR szFSType[CCHMAXPATH];
   FILESTATUS4L fsa4;
   APIRET rc;
@@ -1120 +1139 @@
         // Hard drive (2..N)
         if (!(driveflags[x] & DRIVE_NOPRESCAN)) {
-          *szFileSystem = 0;
-          drvtype = 0;
-          removable = CheckDrive(*szDrive, szFileSystem, &drvtype);
+          *szFSType = 0;
+          ulDriveType = 0;
+          removable = CheckDrive(*szDrive, szFSType, &ulDriveType);
           driveserial[x] = -1;
           if (removable != -1) {
@@ -1143 +1162 @@
           driveflags[x] |= removable == -1 || removable == 1 ?
                             DRIVE_REMOVABLE : 0;
-          if (drvtype & DRIVE_REMOTE)
+          if (ulDriveType & DRIVE_REMOTE)
             driveflags[x] |= DRIVE_REMOTE;
-          if (!stricmp(szFileSystem,RAMFS)) {
+          if (!stricmp(szFSType,RAMFS)) {
             driveflags[x] |= DRIVE_RAMDISK;
             driveflags[x] &= ~DRIVE_REMOTE;
           }
-          if (!stricmp(szFileSystem,NDFS32)) {
+          if (!stricmp(szFSType,NDFS32)) {
             driveflags[x] |= DRIVE_VIRTUAL;
             driveflags[x] &= ~DRIVE_REMOTE;
           }
-          if (!stricmp(szFileSystem,NTFS))
+          if (!stricmp(szFSType,NTFS))
             driveflags[x] |= DRIVE_NOTWRITEABLE;
-          if (strcmp(szFileSystem, HPFS) &&
-              strcmp(szFileSystem, JFS) &&
-              strcmp(szFileSystem, ISOFS) &&
-              strcmp(szFileSystem, CDFS) &&
-              strcmp(szFileSystem, FAT32) &&
-              strcmp(szFileSystem, NDFS32) &&
-              strcmp(szFileSystem, RAMFS) &&
-              strcmp(szFileSystem, NTFS) &&
-              strcmp(szFileSystem, HPFS386)) {
+          if (strcmp(szFSType, HPFS) &&
+              strcmp(szFSType, JFS) &&
+              strcmp(szFSType, ISOFS) &&
+              strcmp(szFSType, CDFS) &&
+              strcmp(szFSType, FAT32) &&
+              strcmp(szFSType, NDFS32) &&
+              strcmp(szFSType, RAMFS) &&
+              strcmp(szFSType, NTFS) &&
+              strcmp(szFSType, HPFS386)) {
             driveflags[x] |= DRIVE_NOLONGNAMES;
           }
 
-          if (!strcmp(szFileSystem, CDFS) || !strcmp(szFileSystem,ISOFS)) {
+          if (!strcmp(szFSType, CDFS) || !strcmp(szFSType,ISOFS)) {
             removable = 1;
             driveflags[x] |= DRIVE_REMOVABLE | DRIVE_NOTWRITEABLE |
                              DRIVE_CDROM;
           }
-          else if (!stricmp(szFileSystem, CBSIFS)) {
+          else if (!stricmp(szFSType, CBSIFS)) {
             driveflags[x] |= DRIVE_ZIPSTREAM;
             driveflags[x] &= ~DRIVE_REMOTE;
-            if (drvtype & DRIVE_REMOVABLE)
+            if (ulDriveType & DRIVE_REMOVABLE)
               driveflags[x] |= DRIVE_REMOVABLE;
-            if (!(drvtype & DRIVE_NOLONGNAMES))
+            if (!(ulDriveType & DRIVE_NOLONGNAMES))
               driveflags[x] &= ~DRIVE_NOLONGNAMES;
           }
@@ -1338 +1357 @@
           p++;
         while (*p) {
-          *szFileSystem = 0;
-          pp = szFileSystem;
+          *szFSType = 0;
+          pp = szFSType;
           while (*p && *p != ' ')
             *pp++ = *p++;
@@ -1345 +1364 @@
           while (*p == ' ')
             p++;
-          if (*szFileSystem &&
-              (!stricmp(szFileSystem, "LIBPATH") || getenv(szFileSystem))) {
+          if (*szFSType &&
+              (!stricmp(szFSType, "LIBPATH") || getenv(szFSType))) {
             pci = WinSendMsg(hwndCnr,
                              CM_ALLOCRECORD,
@@ -1354 +1373 @@
               CHAR fname[CCHMAXPATH];
               pci->flags |= RECFLAGS_ENV;
-              sprintf(fname, "%%%s%%", szFileSystem);
+              sprintf(fname, "%%%s%%", szFSType);
               pci->pszFileName = xstrdup(fname, pszSrcFile, __LINE__);
               pci->rc.hptrIcon = hptrEnv;
@@ -1430 +1449 @@
     x++;
     pci = pciNext;
-  }
+  } // while
   if (hwndParent)
     WinSendMsg(WinWindowFromID(WinQueryWindow(hwndParent, QW_PARENT),