Skip to content
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

Use tempfile #1980

Merged
merged 1 commit into from
Aug 15, 2024
Merged

Use tempfile #1980

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
102 changes: 34 additions & 68 deletions userspace/ksud/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

32 changes: 16 additions & 16 deletions userspace/ksud/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,15 @@
name = "ksud"
version = "0.1.0"
edition = "2021"
rust-version = "1.77.2"

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
anyhow = "1"
clap = { version = "4", features = ["derive"] }
anyhow = "1.0"
clap = { version = "4.5", features = ["derive"] }
const_format = "0.2"
zip = { version = "2.1.6", default-features = false }
zip-extensions = { version = "0.8.1", features = [
zip = { version = "2.1", default-features = false }
zip-extensions = { version = "0.8", features = [
"deflate",
"deflate64",
"time",
Expand All @@ -21,29 +20,29 @@ zip-extensions = { version = "0.8.1", features = [
java-properties = { git = "https://github.com/Kernel-SU/java-properties.git", branch = "master", default-features = false }
log = "0.4"
env_logger = { version = "0.11", default-features = false }
serde = { version = "1" }
serde_json = "1"
serde = { version = "1.0" }
serde_json = "1.0"
encoding_rs = "0.8"
retry = "2"
humansize = "2"
retry = "2.0"
humansize = "2.1"
libc = "0.2"
extattr = "1"
extattr = "1.0"
jwalk = "0.8"
is_executable = "1"
nom = "7"
is_executable = "1.0"
nom = "7.1"
derive-new = "0.6"
rust-embed = { version = "8", features = [
rust-embed = { version = "8.5", features = [
"debug-embed",
"compression", # must clean build after updating binaries
] }
which = "6"
which = "6.0"
getopts = "0.2"
sha256 = "1"
sha1 = "0.10"
tempdir = "0.3"
tempfile = "3.12"
chrono = "0.4"
hole-punch = { git = "https://github.com/tiann/hole-punch" }
regex-lite = "0.1.6"
regex-lite = "0.1"

[target.'cfg(any(target_os = "android", target_os = "linux"))'.dependencies]
rustix = { git = "https://github.com/Kernel-SU/rustix.git", branch = "main", features = [
Expand All @@ -61,3 +60,4 @@ android_logger = { version = "0.14", default-features = false }
strip = true
opt-level = "z"
lto = true
codegen-units = 1
10 changes: 8 additions & 2 deletions userspace/ksud/src/boot_patch.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,10 @@ pub fn restore(
magiskboot_path: Option<PathBuf>,
flash: bool,
) -> Result<()> {
let tmpdir = tempdir::TempDir::new("KernelSU").context("create temp dir failed")?;
let tmpdir = tempfile::Builder::new()
.prefix("KernelSU")
.tempdir()
.context("create temp dir failed")?;
let workdir = tmpdir.path();
let magiskboot = find_magiskboot(magiskboot_path, workdir)?;

Expand Down Expand Up @@ -366,7 +369,10 @@ fn do_patch(
);
}

let tmpdir = tempdir::TempDir::new("KernelSU").context("create temp dir failed")?;
let tmpdir = tempfile::Builder::new()
.prefix("KernelSU")
.tempdir()
.context("create temp dir failed")?;
let workdir = tmpdir.path();

// extract magiskboot
Expand Down
2 changes: 1 addition & 1 deletion userspace/ksud/src/utils.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ fn find_temp_path() -> String {
}

// Try to create a random directory in /dev/
let r = tempdir::TempDir::new_in("/dev/", "");
let r = tempfile::tempdir_in("/dev/");
match r {
Ok(tmp_dir) => {
if let Some(path) = tmp_dir.into_path().to_str() {
Expand Down