Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ This project adheres to [Semantic Versioning](http://semver.org/).
- Added `mkfifoat`
([#1133](https://github.com/nix-rust/nix/pull/1133))

- Added `mknodat`
([#1131](https://github.com/nix-rust/nix/pull/1131))

### Changed
- `Signal::from_c_int` has been replaced by `Signal::try_from`
([#1113](https://github.com/nix-rust/nix/pull/1113))
Expand Down
21 changes: 21 additions & 0 deletions src/sys/stat.rs
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,27 @@ pub fn mknod<P: ?Sized + NixPath>(path: &P, kind: SFlag, perm: Mode, dev: dev_t)
Errno::result(res).map(drop)
}

// mknodat not implemented in OSX
#[cfg(not(any(target_os = "ios", target_os = "macos")))]
pub fn mknodat<P: ?Sized + NixPath>(
dirfd: Option<RawFd>,
path: &P,
kind: SFlag,
perm: Mode,
dev: dev_t,
) -> Result<()> {
let res = path.with_nix_path(|cstr| unsafe {
libc::mknodat(
at_rawfd(dirfd),
cstr.as_ptr(),
kind.bits | perm.bits() as mode_t,
dev,
)
})?;

Errno::result(res).map(drop)
}

#[cfg(target_os = "linux")]
pub fn major(dev: dev_t) -> u64 {
((dev >> 32) & 0xffff_f000) |
Expand Down
151 changes: 149 additions & 2 deletions test/test_stat.rs
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
use std::fs::{self, File};
use std::os::unix::fs::{symlink, PermissionsExt};
use std::os::unix::fs::{symlink, PermissionsExt, MetadataExt, FileTypeExt};
use std::os::unix::prelude::AsRawFd;
use std::time::{Duration, UNIX_EPOCH};
use std::path::Path;

#[cfg(not(any(target_os = "netbsd")))]
use libc::{S_IFMT, S_IFLNK, mode_t};

use libc::dev_t;

use nix::{fcntl, Error};
use nix::errno::{Errno};
use nix::sys::stat::{self, fchmod, fchmodat, futimens, stat, utimes, utimensat, mkdirat};
use nix::sys::stat::{self, fchmod, fchmodat, futimens, stat, utimes, utimensat, mkdirat, mknod, mknodat};
#[cfg(any(target_os = "linux",
target_os = "haiku",
target_os = "ios",
Expand Down Expand Up @@ -294,3 +296,148 @@ fn test_mkdirat_fail() {
let result = mkdirat(dirfd, filename, Mode::S_IRWXU).unwrap_err();
assert_eq!(result, Error::Sys(Errno::ENOTDIR));
}

#[test]
fn test_mknod_success_path() {
let tempdir = tempfile::tempdir().unwrap();
let path = &tempdir.path().join("test_node_name");
assert!(mknod(path, stat::SFlag::S_IFBLK, stat::Mode::empty(), 0).is_ok());
assert!(Path::exists(path));
}

#[test]
fn test_mknod_success_sflag() {
let tempdir = tempfile::tempdir().unwrap();
let path = &tempdir.path().join("test_node_name");
assert!(mknod(path, stat::SFlag::S_IFIFO, stat::Mode::empty(), 0).is_ok());
let result = fs::metadata(path).unwrap().file_type();
assert!(result.is_fifo());
}

#[test]
fn test_mknod_success_mode() {
let expected_bits = stat::SFlag::S_IFCHR.bits() | stat::Mode::S_IRWXU.bits();
let tempdir = tempfile::tempdir().unwrap();
let path = &tempdir.path().join("test_node_name");
assert!(mknod(path, stat::SFlag::S_IFCHR, stat::Mode::S_IRWXU, 0).is_ok());
let permissions = fs::metadata(path).unwrap().permissions();
let mode = permissions.mode();
assert_eq!(mode as mode_t, expected_bits)
}

#[test]
fn test_mknod_success_dev() {
let expected_dev_t: dev_t = 28138;
let tempdir = tempfile::tempdir().unwrap();
let path = &tempdir.path().join("test_node_name");
assert!(mknod(
path,
stat::SFlag::S_IFBLK,
stat::Mode::empty(),
expected_dev_t
)
.is_ok());
let result = fs::metadata(path).unwrap().rdev();
assert_eq!(result as dev_t, expected_dev_t);
}

#[test]
fn test_mknod_fail() {
let tempdir = tempfile::tempdir().unwrap();
let path = &tempdir.path().join("not_existing").join("test_node_name");
assert!(mknod(path, stat::SFlag::empty(), stat::Mode::empty(), 0).is_err());
}

#[test]
#[cfg(not(any(target_os = "ios", target_os = "macos")))]
fn test_mknodat_success_path() {
let tempdir = tempfile::tempdir().unwrap();
let dirfd = fcntl::open(tempdir.path(), fcntl::OFlag::empty(), stat::Mode::empty()).unwrap();
let path = "test_node_name";
assert!(mknodat(
Some(dirfd),
path,
stat::SFlag::S_IFBLK,
stat::Mode::empty(),
0
)
.is_ok());
assert!(Path::exists(&tempdir.path().join(path)));
}

#[test]
#[cfg(not(any(target_os = "ios", target_os = "macos")))]
fn test_mknodat_success_sflag() {
let tempdir = tempfile::tempdir().unwrap();
let dirfd = fcntl::open(tempdir.path(), fcntl::OFlag::empty(), stat::Mode::empty()).unwrap();
let path = "test_node_name";
assert!(mknodat(
Some(dirfd),
path,
stat::SFlag::S_IFIFO,
stat::Mode::empty(),
0
)
.is_ok());
let result = fs::metadata(&tempdir.path().join(path))
.unwrap()
.file_type();
assert!(result.is_fifo());
}

#[test]
#[cfg(not(any(target_os = "ios", target_os = "macos")))]
fn test_mknodat_success_mode() {
let expected_bits = stat::SFlag::S_IFCHR.bits() | stat::Mode::S_IRWXU.bits();
let tempdir = tempfile::tempdir().unwrap();
let dirfd = fcntl::open(tempdir.path(), fcntl::OFlag::empty(), stat::Mode::empty()).unwrap();
let path = "test_node_name";
assert!(mknodat(
Some(dirfd),
path,
stat::SFlag::S_IFCHR,
stat::Mode::S_IRWXU,
0
)
.is_ok());
let permissions = fs::metadata(&tempdir.path().join(path))
.unwrap()
.permissions();
let mode = permissions.mode();
assert_eq!(mode as mode_t, expected_bits)
}

#[test]
#[cfg(not(any(target_os = "ios", target_os = "macos")))]
fn test_mknodat_success_dev() {
let expected_dev_t: dev_t = 52933;
let tempdir = tempfile::tempdir().unwrap();
let dirfd = fcntl::open(tempdir.path(), fcntl::OFlag::empty(), stat::Mode::empty()).unwrap();
let path = "test_node_name";
assert!(mknodat(
Some(dirfd),
path,
stat::SFlag::S_IFBLK,
stat::Mode::empty(),
expected_dev_t
)
.is_ok());
let result = fs::metadata(&tempdir.path().join(path)).unwrap().rdev();
assert_eq!(result as dev_t, expected_dev_t);
}

#[test]
#[cfg(not(any(target_os = "ios", target_os = "macos")))]
fn test_mknodat_fail() {
let tempdir = tempfile::tempdir().unwrap();
let dirfd = fcntl::open(tempdir.path(), fcntl::OFlag::empty(), stat::Mode::empty()).unwrap();
let path = Path::new("not_existing").join("test_node_name");
assert!(mknodat(
Some(dirfd),
&path,
stat::SFlag::empty(),
stat::Mode::empty(),
0,
)
.is_err());
}