Implement unset

Author: ryuichiueda

src/core/builtins/unset.rs

@@ -3,15 +3,34 @@
 
 use crate::ShellCore;
 
-fn unset_var(core: &mut ShellCore, name: &str) -> i32 {
+fn unset_all(core: &mut ShellCore, name: &str) -> i32 {
     core.data.unset(name);
     0
 }
 
+fn unset_var(core: &mut ShellCore, name: &str) -> i32 {
+    core.data.unset_var(name);
+    0
+}
+
+fn unset_function(core: &mut ShellCore, name: &str) -> i32 {
+    core.data.unset_function(name);
+    0
+}
+
 pub fn unset(core: &mut ShellCore, args: &mut Vec<String>) -> i32 {
     match args[1].as_ref() {
-        "-f" => 0,
-        "-v" => 0,
-        name => unset_var(core, name),
+        "-f" => {
+            if args.len() > 2 {
+                return unset_function(core, &args[2]);
+            }
+        },
+        "-v" => {
+            if args.len() > 2 {
+                return unset_var(core, &args[2]);
+            }
+        },
+        name => return unset_all(core, name),
     }
+    0
 }

src/core/data.rs

@@ -157,12 +157,6 @@ impl Data {
         self.set_layer_param(key, val, 0);
     }
 
-    pub fn unset(&mut self, key: &str) {
-        for layer in &mut self.parameters {
-            layer.remove(key);
-        }
-    }
-
     pub fn set_local_param(&mut self, key: &str, val: &str) {
         let layer = self.parameters.len();
         self.set_layer_param(key, val, layer-1);
@@ -241,4 +235,19 @@ impl Data {
             prev_head = head;
         }
     }
+
+    pub fn unset_var(&mut self, key: &str) {
+        for layer in &mut self.parameters {
+            layer.remove(key);
+        }
+    }
+
+    pub fn unset_function(&mut self, key: &str) {
+        self.functions.remove(key);
+    }
+
+    pub fn unset(&mut self, key: &str) {
+        self.unset_var(key);
+        self.unset_function(key);
+    }
 }

src/elements/command/simple.rs

@@ -91,19 +91,19 @@ impl SimpleCommand {
 
         match unistd::execvp(&cargs[0], &cargs) {
             Err(Errno::E2BIG) => {
-                println!("sush: {}: Arg list too long", &self.args[0]);
+                eprintln!("sush: {}: Arg list too long", &self.args[0]);
                 process::exit(126)
             },
             Err(Errno::EACCES) => {
-                println!("sush: {}: Permission denied", &self.args[0]);
+                eprintln!("sush: {}: Permission denied", &self.args[0]);
                 process::exit(126)
             },
             Err(Errno::ENOENT) => {
-                println!("{}: command not found", &self.args[0]);
+                eprintln!("{}: command not found", &self.args[0]);
                 process::exit(127)
             },
             Err(err) => {
-                println!("Failed to execute. {:?}", err);
+                eprintln!("Failed to execute. {:?}", err);
                 process::exit(127)
             }
             _ => panic!("SUSH INTERNAL ERROR (never come here)")

test/test.bash

@@ -90,6 +90,21 @@ res=$($com <<< 'eval "(" echo abc ")" "|" rev')
 res=$($com <<< 'A=aaa ; unset A ; echo $A')
 [ "$res" = "" ] || err $LINENO
 
+res=$($com <<< 'A=aaa ; unset -f A ; echo $A')
+[ "$res" = "aaa" ] || err $LINENO
+
+res=$($com <<< 'A=aaa ; unset -v A ; echo $A')
+[ "$res" = "" ] || err $LINENO
+
+res=$($com <<< 'A () { echo aaa ; } ; unset -v A ; A')
+[ "$res" = "aaa" ] || err $LINENO
+
+res=$($com <<< 'A () { echo aaa ; } ; unset -f A ; A')
+[ "$res" = "" ] || err $LINENO
+
+res=$($com <<< 'A () { echo aaa ; } ; unset A ; A')
+[ "$res" = "" ] || err $LINENO
+
 ### COMPOUND COMMAND TEST ###
 
 res=$($com <<< '(echo hoge; echo fuge)')