From 6d9f584de3430aa65f9a3e8a5907d0bb4bcd637a Mon Sep 17 00:00:00 2001 From: Manos Pitsidianakis Date: Tue, 21 Jan 2020 02:40:28 +0200 Subject: [PATCH] Update nix to 0.16.1 --- Cargo.lock | 9 +++++---- Cargo.toml | 2 +- melib/Cargo.toml | 1 + ui/Cargo.toml | 2 +- ui/src/terminal/embed.rs | 11 ++++++++--- 5 files changed, 16 insertions(+), 9 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1f4843e1c..b7b1714e8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -745,7 +745,7 @@ version = "0.4.1" dependencies = [ "crossbeam 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", "melib 0.4.1", - "nix 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", + "nix 0.16.1 (registry+https://github.com/rust-lang/crates.io-index)", "signal-hook 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", "signal-hook-registry 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "ui 0.4.1", @@ -765,6 +765,7 @@ dependencies = [ "libc 0.2.64 (registry+https://github.com/rust-lang/crates.io-index)", "memmap 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", "native-tls 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", + "nix 0.16.1 (registry+https://github.com/rust-lang/crates.io-index)", "nom 3.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "notify 4.0.12 (registry+https://github.com/rust-lang/crates.io-index)", "notify-rust 3.6.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -908,7 +909,7 @@ dependencies = [ [[package]] name = "nix" -version = "0.15.0" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1854,7 +1855,7 @@ dependencies = [ "linkify 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "melib 0.4.1", "mime_apps 0.2.0 (git+https://git.meli.delivery/meli/mime_apps)", - "nix 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", + "nix 0.16.1 (registry+https://github.com/rust-lang/crates.io-index)", "nom 3.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "notify 4.0.12 (registry+https://github.com/rust-lang/crates.io-index)", "notify-rust 3.6.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2232,7 +2233,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919" "checksum native-tls 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4b2df1a4c22fd44a62147fd8f13dd0f95c9d8ca7b2610299b2a2f9cf8964274e" "checksum net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "42550d9fb7b6684a6d404d9fa7250c2eb2646df731d1c06afc06dcee9e1bcf88" -"checksum nix 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3b2e0b4f3320ed72aaedb9a5ac838690a8047c7b275da22711fddff4f8a14229" +"checksum nix 0.16.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dd0eaf8df8bab402257e0a5c17a254e4cc1f72a93588a1ddfb5d356c801aa7cb" "checksum nodrop 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "2f9667ddcc6cc8a43afc9b7917599d7216aa09c463919ea32c59ed6cac8bc945" "checksum nom 3.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "05aec50c70fd288702bcd93284a8444607f3292dbdf2a30de5ea5dcdbe72287b" "checksum nom 4.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2ad2a91a8e869eeb30b9cb3119ae87773a8f4ae617f41b1eb9c154b2905f7bd6" diff --git a/Cargo.toml b/Cargo.toml index 291089712..8247ec91f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,7 +13,7 @@ xdg = "2.1.0" crossbeam = "0.7.2" signal-hook = "0.1.12" signal-hook-registry = "1.2.0" -nix = "*" +nix = "0.16.1" melib = { path = "melib", version = "*" } ui = { path = "ui", version = "*" } diff --git a/melib/Cargo.toml b/melib/Cargo.toml index 881e932cd..b2e0aefdc 100644 --- a/melib/Cargo.toml +++ b/melib/Cargo.toml @@ -28,6 +28,7 @@ libc = {version = "0.2.59", features = ["extra_traits",]} reqwest = { version ="0.10.0-alpha.2", optional=true, features = ["json", "blocking" ]} serde_json = { version = "1.0", optional = true, features = ["raw_value",] } smallvec = { version = "1.1.0", features = ["serde", ] } +nix = "0.16.1" [features] default = ["unicode_algorithms", "imap_backend", "maildir_backend", "mbox_backend", "vcard"] diff --git a/ui/Cargo.toml b/ui/Cargo.toml index 41de817ad..0a8bcddb6 100644 --- a/ui/Cargo.toml +++ b/ui/Cargo.toml @@ -25,7 +25,7 @@ uuid = { version = "0.7.4", features = ["serde", "v4"] } unicode-segmentation = "1.2.1" # >:c text_processing = { path = "../text_processing", version = "*" } libc = {version = "0.2.59", features = ["extra_traits",]} -nix = "0.15.0" +nix = "0.16.1" rusqlite = {version = "0.20.0", optional =true } rmp = "^0.8" rmpv = { version = "^0.4.2", features=["with-serde",] } diff --git a/ui/src/terminal/embed.rs b/ui/src/terminal/embed.rs index 6389b32d7..c1092ce62 100644 --- a/ui/src/terminal/embed.rs +++ b/ui/src/terminal/embed.rs @@ -97,12 +97,17 @@ pub fn create_pty( } let parts = split_command!(command); let (cmd, _) = (parts[0], &parts[1..]); + let _parts = parts + .iter() + .map(|&a| CString::new(a).unwrap()) + .collect::>(); if let Err(e) = nix::unistd::execv( &CString::new(cmd).unwrap(), - &parts + _parts .iter() - .map(|&a| CString::new(a).unwrap()) - .collect::>(), + .map(|a| a.as_c_str()) + .collect::>() + .as_slice(), ) { log(format!("Could not execute `{}`: {}", command, e,), ERROR); std::process::exit(-1);