2007-07-29 Corinna Vinschen <corinna@vinschen.de>
+ * fhandler_disk_file.cc (fhandler_disk_file::fchmod): Don't allow
+ FileAttributes set to 0 when calling NtSetInformationFile since it has
+ a special meaning.
+ (fhandler_disk_file::facl): Ditto.
+ (fhandler_disk_file::link): Only set attributes after copying files.
+ Use SetFileAttributesW.
+ * syscalls.cc (unlink_nt): Only care for actual FILE_ATTRIBUTE_READONLY.
+ Don't allow FileAttributes set to 0 when calling NtSetInformationFile.
+ After marking for deletion, restore R/O attribute on files to
+ accommodate hardlinks.
+
+2007-07-29 Corinna Vinschen <corinna@vinschen.de>
+
* fhandler_disk_file.cc (fhandler_disk_file::link): Use FILE_ANY_ACCESS.
(fhandler_base::utimes_fs): Fix white space.
(fhandler_disk_file::lock): Remove 9x blurb from comment.
FILE_BASIC_INFORMATION fbi;
fbi.CreationTime.QuadPart = fbi.LastAccessTime.QuadPart
= fbi.LastWriteTime.QuadPart = fbi.ChangeTime.QuadPart = 0LL;
- fbi.FileAttributes = pc.file_attributes ();
+ fbi.FileAttributes = pc.file_attributes () ?: FILE_ATTRIBUTE_NORMAL;
NTSTATUS status = NtSetInformationFile (get_handle (), &io, &fbi, sizeof fbi,
FileBasicInformation);
if (!NT_SUCCESS (status))
= fbi.LastAccessTime.QuadPart
= fbi.LastWriteTime.QuadPart
= fbi.ChangeTime.QuadPart = 0LL;
- fbi.FileAttributes = pc.file_attributes ()
- & ~FILE_ATTRIBUTE_READONLY;
+ fbi.FileAttributes = (pc.file_attributes ()
+ & ~FILE_ATTRIBUTE_READONLY)
+ ?: FILE_ATTRIBUTE_NORMAL;
NtSetInformationFile (get_handle (), &io, &fbi, sizeof fbi,
FileBasicInformation);
}
__seterrno ();
return -1;
}
+ if (!allow_winsymlinks && pc.is_lnk_special ())
+ SetFileAttributesW (newpcw, pc.file_attributes ()
+ | FILE_ATTRIBUTE_SYSTEM
+ | FILE_ATTRIBUTE_READONLY);
}
else
{
return -1;
}
}
- if (!allow_winsymlinks && pc.is_lnk_special ())
- SetFileAttributes (newpc, (DWORD) pc
- | FILE_ATTRIBUTE_SYSTEM
- | FILE_ATTRIBUTE_READONLY);
return 0;
}
FILE_BASIC_INFORMATION fbi;
ACCESS_MASK access = DELETE;
- /* If one of the R/O attributes is set, we have to open the file with
- FILE_WRITE_ATTRIBUTES to be able to remove these flags before trying
+ /* If the R/O attribute is set, we have to open the file with
+ FILE_WRITE_ATTRIBUTES to be able to remove this flags before trying
to delete it. */
- if (pc.file_attributes () & (FILE_ATTRIBUTE_READONLY
- | FILE_ATTRIBUTE_SYSTEM
- | FILE_ATTRIBUTE_HIDDEN))
+ if (pc.file_attributes () & FILE_ATTRIBUTE_READONLY)
access |= FILE_WRITE_ATTRIBUTES;
ULONG flags = FILE_OPEN_FOR_BACKUP_INTENT;
if (move_to_bin && !pc.isremote ())
try_to_bin (pc, fh);
- /* Get rid of read-only attributes. */
+ /* Get rid of read-only attribute. */
if (access & FILE_WRITE_ATTRIBUTES)
{
FILE_BASIC_INFORMATION fbi;
fbi.CreationTime.QuadPart = fbi.LastAccessTime.QuadPart =
fbi.LastWriteTime.QuadPart = fbi.ChangeTime.QuadPart = 0LL;
- fbi.FileAttributes = pc.file_attributes ()
- & ~(FILE_ATTRIBUTE_READONLY
- | FILE_ATTRIBUTE_SYSTEM
- | FILE_ATTRIBUTE_HIDDEN);
+ fbi.FileAttributes = (pc.file_attributes () & ~FILE_ATTRIBUTE_READONLY)
+ ?: FILE_ATTRIBUTE_NORMAL;
NtSetInformationFile (fh, &io, &fbi, sizeof fbi, FileBasicInformation);
}
if (!NT_SUCCESS (status))
{
syscall_printf ("Setting delete disposition failed, status = %p", status);
- /* Restore R/O attributes. */
if (access & FILE_WRITE_ATTRIBUTES)
- {
+ {
+ /* Restore R/O attributes. */
fbi.FileAttributes = pc.file_attributes ();
NtSetInformationFile (fh, &io, &fbi, sizeof fbi,
FileBasicInformation);
}
}
+ else if ((access & FILE_WRITE_ATTRIBUTES) && !pc.isdir ())
+ {
+ /* Restore R/O attribute to accommodate hardlinks. Don't try this
+ with directories! For some reason the below NtSetInformationFile
+ changes the disposition for delete back to FALSE, at least on XP. */
+ fbi.FileAttributes = pc.file_attributes ();
+ NtSetInformationFile (fh, &io, &fbi, sizeof fbi,
+ FileBasicInformation);
+ }
NtClose (fh);
return status;