Changeset 1611 for trunk/dll/update.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/update.c (modified) (12 diffs)

trunk/dll/update.c

@@ -72 +72 @@
                 return pci->rc.hptrIcon;
 }
-PCNRITEM UpdateCnrRecord(HWND hwndCnr, CHAR * filename, BOOL partial,
-                         DIRCNRDATA * dcd)
+
+/* Update/add CNRITEM record for filename
+ * Deletes existing CNRITEM if file has disappeared
+ * @returns pci pointer to CNRITEM record or NULL if not found or if stale CNRITEM deleted
+ */
+
+PCNRITEM UpdateCnrRecord(HWND hwndCnr, CHAR *filename, BOOL partial,
+                         DIRCNRDATA *dcd)
 {
   PCNRITEM pci;
@@ -129 +135 @@
                         filename, (PCNRITEM) NULL, partial, FALSE, TRUE);
   Update:
-    if (pci) {                          /* update record? */
+    if (pci) {
+      // Check if record needs to be updated
       if ((!fForceUpper && !fForceLower && strcmp(pci->pszFileName, filename)) ||
           pci->cbFile != ffb.cbFile || pci->attrFile != ffb.attrFile ||
@@ -140 +147 @@
           pci->ladate.year != ffb.fdateLastAccess.year + 1980 || pci->latime.seconds !=
           ffb.ftimeLastAccess.twosecs * 2 || pci->latime.minutes !=
-          ffb.ftimeLastAccess.minutes || pci->latime.hours != ffb.ftimeLastAccess.hours) {      /* changed; update */
-        *ffb.achName = 0;
+          ffb.ftimeLastAccess.minutes || pci->latime.hours != ffb.ftimeLastAccess.hours)
+      {
+        // Something changed - update
+        *ffb.achName = 0;       // Tell FillInRecordFromFFB that filename contains full pathname
         ffb.cchName = 0;
         FillInRecordFromFFB(hwndCnr, pci, filename, &ffb, partial, dcd);
         if (strlen(pci->pszFileName) < 4)
-        SelectDriveIcon(pci);
+          SelectDriveIcon(pci);
         oldemphasis = pci->rc.flRecordAttr & (CRA_SELECTED | CRA_CURSORED);
         if (oldemphasis)
@@ -152 +161 @@
                      MPFROMP(pci), MPFROM2SHORT(FALSE, oldemphasis));
         WinSendMsg(hwndCnr,
-                   CM_INVALIDATERECORD, MPFROMP(&pci), MPFROM2SHORT(1,
-                                                                    /* CMA_ERASE | */
-                                                                    CMA_TEXTCHANGED));
+                   CM_INVALIDATERECORD, MPFROMP(&pci), MPFROM2SHORT(1, CMA_TEXTCHANGED));
         if (oldemphasis)
           WinSendMsg(hwndCnr,
@@ -163 +170 @@
         return pci;
     }
-    else {                              /* add record */
+    else {
+      // Add record
       if (dcd->type == DIR_FRAME) {
 
@@ -191 +199 @@
             dcd->ullTotalBytes += ullTotalBytes;
             PostMsg(hwndCnr, UM_RESCAN, MPVOID, MPVOID);
-            if (pci->attrFile & FILE_DIRECTORY) {
-              Stubby(hwndCnr, pci);
-            }
+            if (pci->attrFile & FILE_DIRECTORY) {
+              Stubby(hwndCnr, pci);
+            }
           }
         }
@@ -285 +293 @@
             if (dcd->type == DIR_FRAME) {
               dcd->ullTotalBytes += ullTotalBytes;
-            }
-            Stubby(hwndCnr, pci);
+            }
+            Stubby(hwndCnr, pci);
           }
         }
@@ -299 +307 @@
                                 TRUE)) !=
            NULL && (INT) pci != -1 && strlen(pci->pszFileName) > 3) {
-    /* file doesn't exist; delete record */
+    // File has disappeared and found stale CNRITEM record delete it
     if (!dcd)
       dcd = INSTDATA(hwndCnr);
@@ -438 +446 @@
                                                   &ffb, partial, dcd);
               if (strlen(pci->pszFileName) < 4)
-                SelectDriveIcon(pci);
+                SelectDriveIcon(pci);
               memset(&ri, 0, sizeof(RECORDINSERT));
               ri.cb = sizeof(RECORDINSERT);
@@ -453 +461 @@
                 }
                 repos = TRUE;
-                if (pci->attrFile & FILE_DIRECTORY) {
-                  Stubby(hwndCnr, pci);
-                }
+                if (pci->attrFile & FILE_DIRECTORY) {
+                  Stubby(hwndCnr, pci);
+                }
               }
               else
@@ -552 +560 @@
                       dcd->ullTotalBytes += ullTotalBytes;
                   }
-                  repos = TRUE;
-                  Stubby(hwndCnr, pci);
+                  repos = TRUE;
+                  Stubby(hwndCnr, pci);
                 }
                 else
@@ -579 +587 @@
         if (RemoveCnrItems(hwndCnr, pci, 1,
                            CMA_FREE |
-                           numremain == 1 ? CMA_INVALIDATE : 0) != -1) {
-          pci = NULL;
+                           numremain == 1 ? CMA_INVALIDATE : 0) != -1) {
+          pci = NULL;
           numremain--;
           repos = TRUE;