Merge pull request #93 from K900/revert-default-path

Partially revert "remvoe dead code"

Author: Mic92

src/args.rs

@@ -194,6 +194,28 @@ impl Args {
         explode("The handoff function returned");
     }
 
+    /// Creates a new environment variable.
+    pub fn add_env<F>(&mut self, name: &str, value_len: usize, f: F) -> Result<*const u8, ()>
+    where
+        F: FnOnce(&mut [u8]),
+    {
+        if self.extra_env.is_some() {
+            return Err(());
+        }
+
+        let name_len = name.len();
+        let whole_len = name_len + 1 + value_len;
+        let new_buf = new_slice_leak(whole_len + 1).unwrap();
+        new_buf[..name_len].copy_from_slice(name.as_bytes());
+        new_buf[name_len] = b'=';
+        new_buf[whole_len] = 0;
+
+        f(&mut new_buf[name_len + 1..whole_len]);
+
+        self.extra_env = Some(new_buf.as_ptr());
+        Ok(new_buf.as_ptr())
+    }
+
     pub fn iter_env(&mut self) -> Option<EnvIter> {
         if self.env_iterated {
             return None;

src/main.rs

@@ -152,6 +152,16 @@ extern "C" fn real_main() -> ! {
     } else {
         log::info!("Neither LD_LIBRARY_PATH or NIX_LD_LIBRARY_PATH exist - Setting default");
 
+        args
+            .add_env(
+                "LD_LIBRARY_PATH",
+                DEFAULT_NIX_LD_LIBRARY_PATH.len(),
+                |buf| {
+                    buf.copy_from_slice(DEFAULT_NIX_LD_LIBRARY_PATH);
+                },
+            )
+            .unwrap();
+
         // If the entry trampoline is available on the platform, LD_LIBRARY_PATH
         // will be replaced with an empty LD_LIBRARY_PATH when ld.so launches
         // the actual program.