RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-28 11:37:44 +00:00
Code Issues Activity

Merge pull request #4488 from miles170/fix-shred-clippy

Browse source 
shred: fix `permissions_set_readonly_false` clippy error
This commit is contained in:
Sylvestre Ledru 2023-03-12 11:00:32 +01:00 • committed by GitHub
commit a406b70e57
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/uu/shred/src/shred.rs
View file

@ -16,9 +16,13 @@ use std::fs;
use std::fs::{File, OpenOptions}; use std::fs::{File, OpenOptions};
use std::io; use std::io;
use std::io::prelude::*; use std::io::prelude::*;
#[cfg(unix)]
use std::os::unix::fs::PermissionsExt;
use std::path::{Path, PathBuf}; use std::path::{Path, PathBuf};
use uucore::display::Quotable; use uucore::display::Quotable;
use uucore::error::{FromIo, UResult, USimpleError, UUsageError}; use uucore::error::{FromIo, UResult, USimpleError, UUsageError};
#[cfg(unix)]
use uucore::libc::S_IWUSR;
use uucore::{format_usage, show, show_if_err, util_name}; use uucore::{format_usage, show, show_if_err, util_name};
const BLOCK_SIZE: usize = 512; const BLOCK_SIZE: usize = 512;
@ -462,6 +466,18 @@ fn wipe_file(
if force { if force {
let metadata = fs::metadata(path).map_err_context(String::new)?; let metadata = fs::metadata(path).map_err_context(String::new)?;
let mut perms = metadata.permissions(); let mut perms = metadata.permissions();
#[cfg(unix)]
#[allow(clippy::useless_conversion)]
{
// NOTE: set_readonly(false) makes the file world-writable on Unix.
// NOTE: S_IWUSR type is u16 on macOS.
if (perms.mode() & u32::from(S_IWUSR)) == 0 {
perms.set_mode(u32::from(S_IWUSR));
}
}
#[cfg(not(unix))]
// TODO: Remove the following once https://github.com/rust-lang/rust-clippy/issues/10477 is resolved.
#[allow(clippy::permissions_set_readonly_false)]
perms.set_readonly(false); perms.set_readonly(false);
fs::set_permissions(path, perms).map_err_context(String::new)?; fs::set_permissions(path, perms).map_err_context(String::new)?;
} }