Changeset 1611 for trunk/dll/collect.c

Timestamp:

Aug 9, 2011, 12:08:03 AM (14 years ago)

Author:

Steven Levine

Message:

Allow SVN/CVS file ignore in Seek and scan

File:

• trunk/dll/collect.c (modified) (10 diffs)

trunk/dll/collect.c

@@ -74 +74 @@
                 including the option to use walk directories to select path
   28 May 11 GKY Fixed trap caused by passing a nonexistant pci to FillInRecordFromFFB in
-                UM_COLLECT because pci is limited to 65535 files. (nRecord is a USHORT)
+                UM_COLLECT because pci is limited to 65535 files. (nRecord is a USHORT)
   29 May 11 SHL Rework UM_COLLECT >65K records logic to not require double loop
   29 May 11 SHL Tweak UM_COLLECT to bypass FindCnrRecord when container initially empty
+  08 Aug 11 SHL Rework UM_COLLECT to avoid spurious container items free
 
 ***********************************************************************/
@@ -669 +670 @@
         PCNRITEM pci = NULL;
         PCNRITEM pciFirst = NULL;
-        PCNRITEM pciNext;
-        PCNRITEM pciPrev = NULL;
+        PCNRITEM pciPrev;
         ULONG nm;
         ULONG ulRecsAtStart;
         ULONG ulRecsToInsert;
-        ULONG ulRecsAllocated = 0;
+        ULONG ulRecsInserted = 0;
         ULONGLONG ullTotalBytes;
+        BOOL checkToInsert = FALSE;
         CNRINFO cnri;
         RECORDINSERT ri;
@@ -697 +698 @@
 
         for (x = 0; li->list[x]; x++) {
-          // Allocate container items if needed
+
+          // Allocate more container items if needed
           if (!pci) {
-            ulRecsToInsert = ulMaxFiles - ulRecsAllocated;
+            ulRecsToInsert = ulMaxFiles - ulRecsInserted;       // Left to do
             if (ulRecsToInsert > USHRT_MAX)
-              ulRecsToInsert = USHRT_MAX;
-            pciPrev = NULL;
+              ulRecsToInsert = USHRT_MAX;               // Avoid USHORT overflows
             pci = WinSendMsg(dcd->hwndCnr, CM_ALLOCRECORD,
                              MPFROMLONG(EXTRA_RECORD_BYTES),
                              MPFROMLONG(ulRecsToInsert));
+            pciFirst = pci;
+            pciPrev = NULL;
             if (!pci) {
               Runtime_Error(pszSrcFile, __LINE__, PCSZ_CM_ALLOCRECORD);
               break;
             }
-            pciFirst = pci;
           } // if need allocate
+
           nm = 1;
           hdir = HDIR_CREATE;
@@ -722 +725 @@
                             FALSE,
                             FALSE,
-                            TRUE)) {
-            pciNext = (PCNRITEM)pci->rc.preccNextRecord;
-            pci = UpdateCnrRecord(dcd->hwndCnr, li->list[x], FALSE, dcd);
-            if (!pci) {
+                            TRUE))
+          {
+            // Updating existing record
+            PCNRITEM pciUpd = UpdateCnrRecord(dcd->hwndCnr, li->list[x], FALSE, dcd);
+            if (!pciUpd) {
+              // file has disappeared
               Runtime_Error(pszSrcFile, __LINE__, "pci NULL for list[%u]", x);
-              pci = pciNext;            // Try to recover
             }
             else {
-              if (Filter((PMINIRECORDCORE) pci, (PVOID) & dcd->mask)) {
-                pci->rc.flRecordAttr &= ~CRA_FILTERED;  // Ensure visible
+              // Update OK
+              if (Filter((PMINIRECORDCORE) pciUpd, (PVOID) & dcd->mask)) {
+                pciUpd->rc.flRecordAttr &= ~CRA_FILTERED;       // Ensure visible
                 // 2011-05-29 SHL fixme to check fail
                 WinSendMsg(dcd->hwndCnr, CM_INVALIDATERECORD, MPVOID,
                            MPFROM2SHORT(0, CMA_REPOSITION | CMA_ERASE));
               }
-              // Remove extra record from chain and free
-              if (pciPrev)
-                pciPrev->rc.preccNextRecord = (PMINIRECORDCORE)pciNext;
-              else
-                pciFirst = pciNext;
-              if (pci)
-                FreeCnrItem(dcd->hwndCnr, pci);
-              pci = pciNext;
-              ulRecsToInsert--;         // Remember gone
-              ulMaxFiles--;             // Remember gone
-            }
-          }
-          // Add new entry
+            }
+            ulMaxFiles--;               // No insert needed
+            checkToInsert = TRUE;
+          }
+          // Add new entry maybe
           else if (*li->list[x] &&
               !DosQueryPathInfo(li->list[x], FIL_QUERYFULLNAME,
@@ -758 +755 @@
                              FILE_ARCHIVED | FILE_SYSTEM |
                              FILE_HIDDEN | FILE_READONLY,
-                             &fb4, sizeof(fb4), &nm, FIL_QUERYEASIZEL)) {
+                             &fb4, sizeof(fb4), &nm, FIL_QUERYEASIZEL))
+          {
+            // OK to add
             DosFindClose(hdir);
             priority_normal();
@@ -772 +771 @@
             // DosQueryPathInfo etc. failed - try to recover
             Runtime_Error(pszSrcFile, __LINE__, "DosQueryPathInfo failed for %s", fullname);
-            // Remove extra CNRITEM from chain
-            pciNext = (PCNRITEM)pci->rc.preccNextRecord;
-            if (pciPrev)
-              pciPrev->rc.preccNextRecord = (PMINIRECORDCORE)pciNext;
-            else
-              pciFirst = pciNext;
-            if (pci)
+            ulMaxFiles--;               // Nothing to insert
+            checkToInsert = TRUE;
+          }
+
+          if (checkToInsert) {
+            checkToInsert = FALSE;
+            // Remove extra records from chain
+            while (ulRecsInserted + ulRecsToInsert > ulMaxFiles) {
+              PCNRITEM pciNext = (PCNRITEM)pci->rc.preccNextRecord;
+              if (pciPrev)
+                pciPrev->rc.preccNextRecord = (PMINIRECORDCORE)pciNext;
+              else
+                pciFirst = pciNext;
+              pci->pszFileName = NullStr;       // Avoid spurious complaints
               FreeCnrItem(dcd->hwndCnr, pci);
-            pci = pciNext;
-            ulRecsToInsert--;           // Remember gone
-            ulMaxFiles--;               // Remember gone
-          }
+              pci = pciNext;
+              ulRecsToInsert--;         // Remember gone
+            }
+          }
+
           // Check if time to insert
           if (!pci) {
+            // All allocated CNRITEMs filled
             if (ulRecsToInsert) {
+              // Have CNRITEMs to insert
               memset(&ri, 0, sizeof(RECORDINSERT));
               ri.cb = sizeof(RECORDINSERT);
@@ -798 +807 @@
               // 2011-05-29 SHL fixme to complain on failure
               PostMsg(dcd->hwndCnr, UM_RESCAN, MPVOID, MPVOID);
-              ulRecsAllocated += ulRecsToInsert;
+              ulRecsInserted += ulRecsToInsert;
               pciFirst = NULL;
               ulRecsToInsert = 0;
@@ -807 +816 @@
 
         // Clean up in case stopped early by error
-        if (pci) {
+        if (pci)
           Runtime_Error(pszSrcFile, __LINE__, "pci not NULL");
-        }
+
         if (pciFirst) {
           Runtime_Error(pszSrcFile, __LINE__, "pciFirst not NULL");
@@ -1402 +1411 @@
               p = pci->pszFileName;
             else {
+              if (!pci->pszFileName)
+                Runtime_Error(pszSrcFile, __LINE__, "pci->pszFileName NULL for %p", pci);
               p = strrchr(pci->pszFileName, '\\');
               if (p) {
@@ -2753 +2764 @@
                   li->type = (li->type == DO_MOVE) ? IDM_MOVE : IDM_COPY;
                 break;
-              }
-            }
+              } // switch
+            } // if !collect
             if (!li->list || !li->list[0])
               FreeListInfo(li);