Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-29 06:13:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

cleanup: fds::open_dir - remove mode argument

Browse source 
[w]open_dir does not pass O_CREAT, so the mode argument to open is never used.
also, O_CREAT | O_DIRECTORY could not be used (portably) to create a directory.
(on POSIX does not specify what should happen, on Linux it is EINVAL.)
This commit is contained in:
Jonathan Krebs 2024-04-15 11:32:23 +02:00 committed by ridiculousfish
parent e32efc0581
commit 2ecbdb9ae7
3 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/builtins/cd.rs
View file

@ -9,7 +9,6 @@ use crate::{
}; };
use errno::Errno; use errno::Errno;
use libc::{fchdir, EACCES, ELOOP, ENOENT, ENOTDIR, EPERM}; use libc::{fchdir, EACCES, ELOOP, ENOENT, ENOTDIR, EPERM};
use nix::sys::stat::Mode;
use std::{os::fd::AsRawFd, sync::Arc}; use std::{os::fd::AsRawFd, sync::Arc};
// The cd builtin. Changes the current directory to the one specified or to $HOME if none is // The cd builtin. Changes the current directory to the one specified or to $HOME if none is
@ -87,7 +86,7 @@ pub fn cd(parser: &Parser, streams: &mut IoStreams, args: &mut [&wstr]) -> Optio
errno::set_errno(Errno(0)); errno::set_errno(Errno(0));
let res = wopen_dir(&norm_dir, Mode::empty()).map_err(|err| err as i32); let res = wopen_dir(&norm_dir).map_err(|err| err as i32);
let res = res.and_then(|fd| { let res = res.and_then(|fd| {
if unsafe { fchdir(fd.as_raw_fd()) } == 0 { if unsafe { fchdir(fd.as_raw_fd()) } == 0 {

8
src/fds.rs
View file

@ -261,13 +261,13 @@ pub fn open_cloexec(path: &CStr, flags: OFlag, mode: nix::sys::stat::Mode) -> ni
/// Wide character version of open_dir() that also sets the close-on-exec flag (atomically when /// Wide character version of open_dir() that also sets the close-on-exec flag (atomically when
/// possible). /// possible).
pub fn wopen_dir(pathname: &wstr, mode: nix::sys::stat::Mode) -> nix::Result<OwnedFd> { pub fn wopen_dir(pathname: &wstr) -> nix::Result<OwnedFd> {
open_dir(wcs2zstring(pathname).as_c_str(), mode) open_dir(wcs2zstring(pathname).as_c_str())
} }
/// Narrow version of wopen_dir(). /// Narrow version of wopen_dir().
pub fn open_dir(path: &CStr, mode: nix::sys::stat::Mode) -> nix::Result<OwnedFd> { pub fn open_dir(path: &CStr) -> nix::Result<OwnedFd> {
open_cloexec(path, OFlag::O_RDONLY | OFlag::O_DIRECTORY, mode).map(OwnedFd::from) open_cloexec(path, OFlag::O_RDONLY | OFlag::O_DIRECTORY, nix::sys::stat::Mode::empty()).map(OwnedFd::from)
} }
/// Close a file descriptor `fd`, retrying on EINTR. /// Close a file descriptor `fd`, retrying on EINTR.

2
src/parser.rs
View file

@ -352,7 +352,7 @@ impl Parser {
global_event_blocks: AtomicU64::new(0), global_event_blocks: AtomicU64::new(0),
}); });
match open_dir(CStr::from_bytes_with_nul(b".\0").unwrap(), Mode::empty()) { match open_dir(CStr::from_bytes_with_nul(b".\0").unwrap()) {
Ok(fd) => { Ok(fd) => {
result.libdata_mut().cwd_fd = Some(Arc::new(fd)); result.libdata_mut().cwd_fd = Some(Arc::new(fd));
} }