Changeset 1710

Timestamp:

Feb 9, 2014, 9:07:48 PM (11 years ago)

Author:

Gregg Young

Message:

Actually commit the fix for suppressing the readonly warning on temp archive files. Ticket 497

Location:

trunk/dll

Files:

• copyf.c (modified) (5 diffs)
• copyf.h (modified) (1 diff)
• fm3res.rc (modified) (1 diff)
• init.c (modified) (3 diffs)
• seeall.c (modified) (1 diff)
• worker.c (modified) (1 diff)

trunk/dll/copyf.c ¶

@@ -529 +529 @@
         if (!IsFile(dir)) {
           if (!strchr(dir, '?') && !strchr(dir, '*'))
-            wipeallf("%s\\*", dir);
+            wipeallf(FALSE, "%s\\*", dir);
           DosError(FERR_DISABLEHARDERR);
           if (DosDeleteDir(dir)) {
@@ -616 +616 @@
           else {
             // remove directory
-            wipeallf("%s\\*", oldname);
+            wipeallf(FALSE, "%s\\*", oldname);
             DosError(FERR_DISABLEHARDERR);
             if (DosDeleteDir(oldname)) {
@@ -735 +735 @@
  */
 
-INT wipeallf(CHAR *string, ...)
+INT wipeallf(BOOL ignorereadonly, CHAR *string, ...)
 {
   FILEFINDBUF3 *f;
@@ -744 +744 @@
   va_list ap;
   INT rc;
-  static BOOL ignorereadonly = FALSE;
 
   va_start(ap, string);
@@ -819 +818 @@
       if (f->attrFile & FILE_DIRECTORY) {
         if (strcmp(f->achName, ".") && strcmp(f->achName, "..")) {
-          wipeallf("%s/%s", ss, mask);  // recurse to wipe files
+          wipeallf(FALSE, "%s/%s", ss, mask);   // recurse to wipe files
           DosError(FERR_DISABLEHARDERR);
           // remove directory

trunk/dll/copyf.h ¶

@@ -29 +29 @@
 INT make_deleteable(CHAR * filename, INT error, BOOL Dontcheckreadonly);
 INT unlinkf(CHAR * string);
-INT wipeallf(CHAR * string, ...);
+INT wipeallf(BOOL ignorereadonly, CHAR * string, ...);
 
 #endif  // COPYF_H

trunk/dll/fm3res.rc ¶

@@ -3378 +3378 @@
     IDS_LOCKEDFILEWARNING                 "The file %s is locked! Do you wish to unlock it and complete the requested operation"
     IDS_LOCKEDFILEWARNINGTITLE            "Locked file!"
-    IDS_READONLYFILEWARNING               "The file %s is Read Only! Do you wish continue the requested operation"
+    IDS_READONLYFILEWARNING               "The file %s is Read Only! Do you wish continue the requested operation?"
     IDS_READONLYFILEWARNINGTITLE          "Read Only file!"
     IDS_NOTARGETSET                       "A target directory has not been set"

trunk/dll/init.c ¶

@@ -588 +588 @@
         strcpy(enddir, ffb.achName);
         if (ffb.attrFile & FILE_DIRECTORY) {
-          wipeallf("%s\\*", s);
+          wipeallf(FALSE, "%s\\*", s);
           DosDeleteDir(s);
         }
@@ -628 +628 @@
   DosForceDelete(szTempFile);
   if (pTmpDir) {
-    wipeallf("%s\\*", pTmpDir);
+    wipeallf(FALSE, "%s\\*", pTmpDir);
     DosDeleteDir(pTmpDir);
   }
@@ -789 +789 @@
             if (!strstr(temp, "FM/2") &&
                 !strstr(temp, "AV/2")) {
-              wipeallf("%s\\*", szTempName);
+              wipeallf(TRUE, "%s\\*", szTempName);
               DosDeleteDir(szTempName);
             }

trunk/dll/seeall.c ¶

@@ -1074 +1074 @@
               WinSetWindowText(WinWindowFromID(hwndFrame, SEEALL_STATUS),
                                prompt);
-              error = (APIRET) wipeallf("%s%s*",
+              error = (APIRET) wipeallf(FALSE, "%s%s*",
                                         list[x],
                                         (*list[x] &&

trunk/dll/worker.c ¶

@@ -1695 +1695 @@
                                  &fsa, (ULONG) sizeof(FILESTATUS3));
                 if (fsa.attrFile & FILE_DIRECTORY) {
-                  error = (APIRET) wipeallf("%s%s*",
+                  error = (APIRET) wipeallf(FALSE, "%s%s*",
                                             wk->li->list[x],
                                             (*wk->li->list[x] &&