Impl Default for lxc_attach_option_t

Author: sanpii

Cargo.toml

@@ -25,8 +25,8 @@ v1_0 = []
 v1_1 = ["v1_0"]
 v2_0 = ["v1_1"]
 v2_1 = ["v2_0"]
-v3_0 = ["v2_1"]
+v3_0 = ["v2_1", "lxc-sys/v3_0"]
 v3_1 = ["v3_0"]
 v3_2 = ["v3_1"]
-v4_0 = ["v3_2"]
+v4_0 = ["v3_2", "lxc-sys/v4_0"]
 v4_0_5 = ["v4_0"]

examples/run_command.rs

@@ -1,7 +1,3 @@
-extern crate lxc;
-
-use std::os::unix::io::AsRawFd;
-
 fn main() -> std::io::Result<()> {
     let c =
         lxc::Container::new("apicontainer", None).expect("Failed to setup lxc_container struct");
@@ -21,25 +17,9 @@ fn main() -> std::io::Result<()> {
 
     c.start(false, &[]).expect("Failed to start the container");
 
-    let mut options = lxc::attach::Options {
-        attach_flags: 0,
-        env_policy: 0,
-        extra_env_vars: std::ptr::null_mut(),
-        gid: 0,
-        uid: 0,
-        extra_keep_env: std::ptr::null_mut(),
-        initial_cwd: std::ptr::null_mut(),
-        #[cfg(feature = "v3_0")]
-        log_fd: std::io::stdout().as_raw_fd(),
-        stdout_fd: std::io::stdout().as_raw_fd(),
-        stderr_fd: std::io::stderr().as_raw_fd(),
-        stdin_fd: std::io::stdin().as_raw_fd(),
-        namespaces: -1,
-        personality: -1,
-    };
     let prog = "/bin/ps";
     let args = [prog, "auxw"];
-    let r = c.attach_run_wait(&mut options, prog, &args);
+    let r = c.attach_run_wait(&mut lxc::attach::Options::default(), prog, &args);
     match r {
         Err(e) => println!("Error: {}", e),
         Ok(s) => println!("Ok, waitpid() status={}", s),

lxc-sys/Cargo.toml

@@ -16,3 +16,7 @@ libc="0.2"
 
 [build-dependencies]
 bindgen = "0.59"
+
+[features]
+v3_0 = []
+v4_0 = []

lxc-sys/src/lib.rs

@@ -6,3 +6,31 @@
 #![allow(clippy::unreadable_literal)]
 
 include!(concat!(env!("OUT_DIR"), "/bindings.rs"));
+
+impl Default for lxc_attach_options_t {
+    fn default() -> Self {
+        Self {
+            attach_flags: LXC_ATTACH_DEFAULT as i32,
+            namespaces: -1,
+            personality: LXC_ATTACH_DETECT_PERSONALITY as i64,
+            initial_cwd: std::ptr::null_mut(),
+            gid: u32::MAX,
+            uid: u32::MAX,
+            env_policy: lxc_attach_env_policy_t_LXC_ATTACH_KEEP_ENV,
+            extra_env_vars: std::ptr::null_mut(),
+            extra_keep_env: std::ptr::null_mut(),
+            stdout_fd: 0,
+            stdin_fd: 1,
+            stderr_fd: 2,
+            #[cfg(feature = "v3_0")]
+            log_fd: -libc::EBADF,
+            #[cfg(feature = "v4_0")]
+            lsm_label: std::ptr::null_mut(),
+            #[cfg(feature = "v4_0")]
+            groups: lxc_groups_t {
+                size: 0,
+                list: std::ptr::null_mut(),
+            },
+        }
+    }
+}