huge longrun improvements

profile.d/debug.sh

@@ -36,27 +36,22 @@
 
 # ------------------------------------------------------------------------------
 # Display a backtrace
-# ------------------------------------------------------------------------------
+# Usage: backtrace
 function backtrace()
 {
-    echo "========= Call stack ========="
-    typeset -i i=0
-
-    local func=
-    for func in "${FUNCNAME[@]}"; do
-        if [[ $i -ne 0 ]]; then
-            printf '%15s() %s:%d\n' \
-                "$func" "${BASH_SOURCE[$i]}" "${BASH_LINENO[(($i - 1))]}"
-        fi
-        let i++ || true
+    printf "========= Call stack =========\n"
+    local i=1 # We begin at 1 to ignore backtrace itself
+    while [[ $i -lt ${#FUNCNAME[@]} ]]; do
+        printf '%15s() %s:%d\n' \
+            "${FUNCNAME[$i]}" "${BASH_SOURCE[$i]}" "${BASH_LINENO[$(( i-1 ))]}"
+        ((i++))
     done
     unset func i
-    echo "=============================="
+    printf "==============================\n"
 }
 
 # ------------------------------------------------------------------------------
 # Function to be trapped for errors investigation
-# ------------------------------------------------------------------------------
 function error()
 {
     local errcode=$?
@@ -66,45 +61,63 @@ function error()
 
 # ------------------------------------------------------------------------------
 # Activate or deactivate error trapping to display backtrace
-# ------------------------------------------------------------------------------
+# Usage: settrace <--on|--off|--status>
 settrace()
 {
     local status="off"
     [[ $(trap -p ERR) ]] && status="on"
     #trap -p ERR
-    for opt in $@; do
-        case $opt in
-        "-h" | "--help")
-            echo "Try to activate backtrace display for script debugging."
-            echo
-            echo "Options:"
-            echo "	--on	Activate backtrace generation"
-            echo "	--off	Deactivate backtrace generation"
-            echo
-            echo "That function active a trap event on error. If the script you want to"
-            echo "debug overload the ERR bash trap, it will not work."
-            echo
+
+    local PARSED
+    PARSED=$(getopt -oh --long help,on,off,status -- "$@")
+    if [[ $? -ne 0 ]]; then
+        disp E "Invalid options, use \"settrace --help\" to display usage."
+        return 1
+    fi
+    eval set -- "$PARSED"
+    while true; do
+        case $1 in
+        -h|--help)
+            printf "Try to activate backtrace display for script debugging.\n\n"
+            printf "Options:\n"
+            printf "\t--on\t\tActivate backtrace generation\n"
+            printf "\t--off\t\tDeactivate backtrace generation\n\n"
+            printf "That function active a trap event on error. If the script you want to\n"
+            printf "debug overload the ERR bash trap, it will not work.\n"
+            return 0
             ;;
-        "--on")
-            if [[ $status == "on" ]]; then
+        --on)
+            if [[ ${status} == "on" ]]; then
                 disp W "ERR signal trap is already set, replacing previous trap!"
             fi
             trap "error" ERR
+            shift
             ;;
-        "--off")
-            if [[ $status != "on" ]]; then
+        --off)
+            if [[ ${status} != "on" ]]; then
                 disp W "ERR signal trap is already unset!"
             fi
             trap - ERR
+            shift
             ;;
-        "--status")
+        --status)
             disp "ERR trap signal is ${status}."
+            shift
             ;;
+        --)
+            shift
+            break
+            ;;
+        *)
+            disp E "Invalid options, use \"settrace --help\" to display usage."
+            return 1
+            ;; 
         esac
     done
     unset status
 }
 export -f settrace
-
 # ------------------------------------------------------------------------------
+
+
 # EOF