1 files changed, 5 insertions, 1 deletions
diff --git a/ejabberdctl.template b/ejabberdctl.template
index d585d66f7..0d1a64292 100755
--- a/ejabberdctl.template
+++ b/ejabberdctl.template
@@ -163,7 +163,11 @@ shell_escape()
 {
     local RES=()
     for i in "$@"; do
-        printf '%q ' "$i"
+        if test -z "$i"; then
+            printf '"" '
+        else
+            printf '"%q" ' "$i" | sed 's/\\\\n/\n/g;s/\\\\t/\t/g;s/\\\\r/\r/g'
+        fi
     done
 }