Skip to content

NetBSD support #84

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Byron merged 4 commits into from
Oct 8, 2023
Merged

NetBSD support #84

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
aee3dce
one step closer
0323pin Sep 17, 2023
7d1e2bb
Update dependencies
0323pin Oct 7, 2023
75cc270
Bump version
0323pin Oct 8, 2023
b77bd6d
Test edition bump
0323pin Oct 8, 2023
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
24 changes: 12 additions & 12 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@

[package]
name = "trash"
version = "3.0.6"
version = "3.0.7"
authors = ["Artur Kovacs <kovacs.artur.barnabas@gmail.com>"]
license = "MIT"
readme = "README.md"
description = "A library for moving files and folders to the Recycle Bin"
keywords = ["remove", "trash", "rubbish", "recycle", "bin"]
repository = "https://github.com/ArturKovacs/trash"
edition = "2018"
edition = "2021"
include = ["src/**/*", "LICENSE.txt", "README.md", "CHANGELOG.md", "build.rs"]

[features]
Expand All @@ -24,22 +24,22 @@ log = "0.4"

[dev-dependencies]
serial_test = { version = "2.0.0", default-features = false }
chrono = { version = "0.4.9", default-features = false, features = ["clock"] }
rand = "0.8.3"
once_cell = "1.7.2"
chrono = { version = "0.4.31", default-features = false, features = ["clock"] }
rand = "0.8.5"
once_cell = "1.18.0"
env_logger = "0.10.0"
tempfile = "3.6.0"
tempfile = "3.8.0"


[target.'cfg(target_os = "macos")'.dependencies]
objc = "0.2.7"

[target.'cfg(all(unix, not(target_os = "macos"), not(target_os = "ios"), not(target_os = "android")))'.dependencies]
chrono = { version = "0.4.9", optional = true, default-features = false, features = ["clock"] }
libc = "0.2.65"
scopeguard = "1.0.0"
url = "2.1.0"
once_cell = "1.7.2"
chrono = { version = "0.4.31", optional = true, default-features = false, features = ["clock"] }
libc = "0.2.149"
scopeguard = "1.2.0"
url = "2.4.1"
once_cell = "1.18.0"

[target.'cfg(any(target_os = "freebsd", target_os = "openbsd", target_os = "netbsd"))'.dependencies]
once_cell = "1.7.2"
Expand All @@ -50,4 +50,4 @@ windows = { version = "0.44.0", features = [
"Win32_System_Com_StructuredStorage",
"Win32_UI_Shell_PropertiesSystem",
] }
scopeguard = "1.0.0"
scopeguard = "1.2.0"
4 changes: 2 additions & 2 deletions src/freedesktop.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -702,12 +702,12 @@ fn get_mount_points() -> Result<Vec<MountPoint>, Error> {
std::str::from_utf8(buf).ok()
}
}
let mut fs_infos: *mut libc::statfs = std::ptr::null_mut();
let mut fs_infos: *mut libc::statvfs = std::ptr::null_mut();
let count = unsafe { libc::getmntinfo(&mut fs_infos, libc::MNT_WAIT) };
if count < 1 {
return Ok(Vec::new());
}
let fs_infos: &[libc::statfs] = unsafe { std::slice::from_raw_parts(fs_infos as _, count as _) };
let fs_infos: &[libc::statvfs] = unsafe { std::slice::from_raw_parts(fs_infos as _, count as _) };

let mut result = Vec::new();
for fs_info in fs_infos {
Expand Down