Changeset 3504 in kBuild

Timestamp:

Dec 15, 2021 10:50:14 PM (3 years ago)

Author:

bird

Message:

ntunlink.c: Fixed deleteing read-only files. Respect the fReadOnlyToo parameter.

File:

• trunk/src/lib/nt/ntunlink.c (modified) (4 diffs)

trunk/src/lib/nt/ntunlink.c

@@ -64 +64 @@
         rcNt = g_pfnNtQueryInformationFile(hFile, &Ios, &BasicInfo, sizeof(BasicInfo), MyFileBasicInformation);
 
-        if (MY_NT_SUCCESS(rcNt) && MY_NT_SUCCESS(Ios.u.Status) /*&& BasicInfo.FileAttributes != FILE_ATTRIBUTE_READONLY*/)
+        if (MY_NT_SUCCESS(rcNt) && MY_NT_SUCCESS(Ios.u.Status) && BasicInfo.FileAttributes != FILE_ATTRIBUTE_READONLY)
             dwAttr = BasicInfo.FileAttributes & ~FILE_ATTRIBUTE_READONLY;
         else
@@ -114 +114 @@
 
             /* In case some file system does things differently than NTFS. */
-            if (rcNt == STATUS_CANNOT_DELETE)
+            if (rcNt == STATUS_CANNOT_DELETE && fReadOnlyToo)
             {
                 birdMakeWritable(hRoot, &NtPath);
@@ -124 +124 @@
             /* Use the set information stuff. Probably more reliable. */
             HANDLE hFile;
-            int    fMayTryAgain = 1;
             for (;;)
             {
@@ -150 +149 @@
                     birdCloseFile(hFile);
                 }
-                if (rcNt != STATUS_CANNOT_DELETE || !fMayTryAgain)
+                if (rcNt != STATUS_CANNOT_DELETE || !fReadOnlyToo)
                     break;
 
-                fMayTryAgain = 0;
+                fReadOnlyToo = 0;
                 birdMakeWritable(hRoot, &NtPath);
             }