Chomp arguments, as well.

1 files changed, 13 insertions, 12 deletions

diff --git a/minimunin b/minimunin
index 72e155d..f7f6d0b 100755
--- a/minimunin
+++ b/minimunin
@@ -18,7 +18,8 @@ main() {
     while read command arg; do
 
         # chomp
-        command=`printf ${command} | /usr/bin/tr -d '\r'`
+        command=`printf %s "${command}" | /usr/bin/tr -d '\r'`
+        arg=`printf %s "${arg}" | /usr/bin/tr -d '\r'`
 
         # printf "%s %s\n" "$command" "$arg" >> /var/log/minimunin.log
         # dispatch commands
@@ -27,16 +28,16 @@ main() {
                 printf "%s\n" "${BUILTIN} ${PLUGINS}"
                 ;;
             fetch)
-                print_fetch $arg; printf ".\n"
+                print_fetch ${arg}; printf ".\n"
                 ;;
             config)
-                print_config $arg; printf ".\n"
+                print_config ${arg}; printf ".\n"
                 ;;
             quit)
                 exit 0
                 ;;
             *)
-                 printf "# Unknown command.\n"
+                 printf "# Unknown command ${command}.\n"
                  # printf %s ${command} | hexdump -C >> /var/log/minimunin.log
                  ;;
         esac
@@ -44,12 +45,12 @@ main() {
 }
 
 print_fetch() {
-
 # see if we're serving a plugin
-call_plugin $1 fetch && return 0
+_plugin=$1
+call_plugin ${_plugin} fetch && return 0
 
 # if not, let our builtins answer
-case $1 in
+case ${_plugin} in
 open_files)
     printf "max.value %d\n"      `get_sys kern.maxfiles`
     printf "used.value %d\n"     `get_sys kern.openfiles`
@@ -90,18 +91,18 @@ systat)
     printf "softint.value %d\nhardint.value %d\nsyscall.value %d\ncs.value %d\nforks.value %d\n" "$1" "$2" "$3" "$4" $(( ${5}+${6}+${7} ))
     ;;
 *)
-    printf "# Unknown command.\n"
+    printf "# Unknown plugin ${_plugin}.\n"
     ;;
 esac
 }
 
 print_config() {
-
+_plugin=$1
 # see if we're configuring a plugin
-call_plugin $1 config && return 0
+call_plugin ${_plugin} config && return 0
 
 # if not, execute built in commands
-case $1 in
+case ${_plugin} in
 load)
 cat <<-EOF
         graph_title Load average
@@ -292,7 +293,7 @@ cat <<-EOF
 EOF
 ;;
 *)
-    printf "# Unknown command.\n"
+    printf "# Unknown plugin ${_plugin}.\n"
     ;;
 esac
 }