mirror of
https://github.com/RGBCube/uutils-coreutils
synced 2025-08-05 15:37:47 +00:00
Fixed merge conflict
This commit is contained in:
parent
00af775cd9
commit
5968f53ef4
1 changed files with 1 additions and 1 deletions
|
@ -550,7 +550,7 @@ fn handle_writable_directory(path: &Path, options: &Options, metadata: &Metadata
|
||||||
#[cfg(windows)]
|
#[cfg(windows)]
|
||||||
fn handle_writable_directory(path: &Path, options: &Options, metadata: &Metadata) -> bool {
|
fn handle_writable_directory(path: &Path, options: &Options, metadata: &Metadata) -> bool {
|
||||||
use std::os::windows::prelude::MetadataExt;
|
use std::os::windows::prelude::MetadataExt;
|
||||||
use winapi::um::winnt::FILE_ATTRIBUTE_READONLY;
|
use windows_sys::Win32::Storage::FileSystem::FILE_ATTRIBUTE_READONLY;
|
||||||
let not_user_writable = (metadata.file_attributes() & FILE_ATTRIBUTE_READONLY) != 0;
|
let not_user_writable = (metadata.file_attributes() & FILE_ATTRIBUTE_READONLY) != 0;
|
||||||
if not_user_writable {
|
if not_user_writable {
|
||||||
prompt(&(format!("remove write-protected directory {}? ", path.quote())))
|
prompt(&(format!("remove write-protected directory {}? ", path.quote())))
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue