Changeset 1739

Timestamp:

Feb 22, 2014, 10:06:09 PM (12 years ago)

Author:

Gregg Young

Message:

Cleanup of readonly check code suppress spurious error on blocked directory delete and eliminated the check on additional temp file deletes

Location:

trunk/dll

Files:

• init.c (modified) (3 diffs)
• worker.c (modified) (2 diffs)

trunk/dll/init.c

@@ -120 +120 @@
                 started from fm2 after fm2 has been started with stdout and stderr
                 redirected to a file.
+  22 Feb 14 GKY Cleanup of readonly check code suppress spurious error on blocked directory
+                delete and eliminated the check on additional temp file deletes
 
 ***********************************************************************/
@@ -596 +598 @@
         strcpy(enddir, ffb.achName);
         if (ffb.attrFile & FILE_DIRECTORY) {
-          wipeallf(FALSE, "%s\\*", s);
+          wipeallf(TRUE, "%s\\*", s);
           DosDeleteDir(s);
         }
@@ -636 +638 @@
   DosForceDelete(szTempFile);
   if (pTmpDir) {
-    wipeallf(FALSE, "%s\\*", pTmpDir);
+    wipeallf(TRUE, "%s\\*", pTmpDir);
     DosDeleteDir(pTmpDir);
   }

trunk/dll/worker.c

@@ -61 +61 @@
   16 Feb 14 GKY Rework readonly check on delete code so it actually works in a logical way
                 and so it works with move to trashcan inabled.
+  22 Feb 14 GKY Cleanup of readonly check code suppress spurious error on blocked directory
+                delete and eliminated the check on additional temp file deletes
 
 ***********************************************************************/
@@ -1789 +1791 @@
                   }
                   DosReleaseMutexSem(hmtxFM2Delete);
-                }
-                if (error && (error != 5 ||
-                              (error == 5 &&
+                }
+                //DbgMsg(pszSrcFile, __LINE__, "error %i retrn %i", error, retrn);
+                if (fWarnReadOnly && error ==  ERROR_FILE_EXISTS) {
+                  error = ERROR_ACCESS_DENIED;
+                  retrn = SM2_NO;
+                }
+                if (error && (error != ERROR_ACCESS_DENIED ||
+                              (error == ERROR_ACCESS_DENIED &&
                                (retrn == SM2_YES || retrn == SM2_DONTASK || retrn == 0)))) {
                   if (LogFileHandle)