Changeset 1312 for trunk/dll

Timestamp:

Dec 3, 2008, 1:47:37 AM (17 years ago)

Author:

Gregg Young

Message:

Fix for traps caused by race condition on directory deletes. This disables immediate updates for deleted directory and set a semaphore to allow the delete to complete before update. It also quotes the * on the extract command line which appears to allow tar 1.15 and higher to work. (Ticket 304)

Location:

trunk/dll

Files:

• init.c (modified) (2 diffs)
• init.h (modified) (1 diff)
• worker.c (modified) (4 diffs)

trunk/dll/init.c

@@ -158 +158 @@
 
 #pragma data_seg(GLOBAL1)
+HMTX hmtxDeleteDir;
 HMTX hmtxFM2Globals;
 ULONG OS2ver[2];
@@ -1181 +1182 @@
                    sizeof(PVOID));
 
-  DosCreateMutexSem("\\SEM\\GLOBAL1", &hmtxFM2Globals, 0L, FALSE);
-
+  if (DosCreateMutexSem("\\SEM\\GLOBAL1", &hmtxFM2Globals, 0L, FALSE))
+    Dos_Error(MB_CANCEL, rc, HWND_DESKTOP, pszSrcFile, __LINE__,
+              "DosCreateMutexSem");
+  if (DosCreateMutexSem("\\SEM\\DELETDIR", &hmtxDeleteDir, 0L, FALSE))
+    Dos_Error(MB_CANCEL, rc, HWND_DESKTOP, pszSrcFile, __LINE__,
+              "DosCreateMutexSem");
   /*
    * set some defaults (note: everything else automatically initialized

trunk/dll/init.h

@@ -92 +92 @@
 extern ULONGLONG ullTmpSpaceNeeded;
 extern HMTX hmtxFM2Globals;
+extern HMTX hmtxDeleteDir;
 
 #endif // INIT_H

trunk/dll/worker.c

@@ -481 +481 @@
                                ex.arcname,
                                maskspaces ? "\"" : NullStr,
-                               *ex.masks ? ex.masks : "*",
+                               *ex.masks ? ex.masks : "\"*\"",
                                maskspaces ? "\"" : NullStr) &&
                       !stricmp(ex.extractdir, wk->directory)) {
@@ -1604 +1604 @@
                                  FIL_STANDARD,
                                  &fsa, (ULONG) sizeof(FILESTATUS3));
-                if (fsa.attrFile & FILE_DIRECTORY) {
+                if (fsa.attrFile & FILE_DIRECTORY) {
+                  //priority_bumped();
+                  DosRequestMutexSem(hmtxDeleteDir, SEM_INDEFINITE_WAIT);
                   sprintf(prompt,
                           GetPString(IDS_DELETINGTEXT), wk->li->list[x]);
@@ -1619 +1621 @@
                     error = DosDeleteDir(wk->li->list[x]);
                   else
-                    DosDeleteDir(wk->li->list[x]);
+                    DosDeleteDir(wk->li->list[x]);
+                  DosReleaseMutexSem(hmtxDeleteDir);
+                  //priority_normal();
                 }
                 else {
@@ -1695 +1699 @@
                   AddNote(prompt);
                 }
-                if (fSyncUpdates ||
+                if ((fSyncUpdates  && !(fsa.attrFile & FILE_DIRECTORY)) ||
                     AddToList(wk->li->list[x], &files, &numfiles, &numalloc))
                   Broadcast(hab2,