many bugfix, fixed getopt split

profile.d/fun.sh

@@ -97,11 +97,8 @@ _fun_stop_on_key()
         kill "$pid" 2>/dev/null
     }
     wait "$pid" 2>/dev/null
-    if [[ -n "$old_int" ]]; then
-        eval "$old_int"
-    else
-        trap - INT
-    fi
+    trap - INT
+    _trap_restore "$old_int"
     return 0
 }
 export -f _fun_stop_on_key
@@ -129,7 +126,9 @@ busy()
         return 1
     fi
     # Restore the getopt-normalised (shell-quoted) argument list
-    eval set -- "$PARSED"
+    local -a _pargs=()
+    _getopt_split _pargs "$PARSED"
+    set -- "${_pargs[@]}"
 
     while true; do
         case "$1" in
@@ -219,7 +218,9 @@ fake_compile()
         return 1
     fi
     # Restore the getopt-normalised (shell-quoted) argument list
-    eval set -- "$PARSED"
+    local -a _pargs=()
+    _getopt_split _pargs "$PARSED"
+    set -- "${_pargs[@]}"
 
     while true; do
         case "$1" in
@@ -421,7 +422,9 @@ hack()
         return 1
     fi
     # Restore the getopt-normalised (shell-quoted) argument list
-    eval set -- "$PARSED"
+    local -a _pargs=()
+    _getopt_split _pargs "$PARSED"
+    set -- "${_pargs[@]}"
 
     while true; do
         case "$1" in