Merge branch 'master' of git.plutz.net:cgilite

[cgilite] / cgilite.sh

diff --git a/cgilite.sh b/cgilite.sh
index e0d4b9392cda8709e80509b176961957ce0008ca..a84de140c97867d1a1fc074ac252e390dbf22c7c 100755 (executable)
--- a/cgilite.sh
+++ b/cgilite.sh
@@ -49,7 +49,7 @@ HEX_DECODE='
 '
 
 HEX_DECODE(){
-  printf "$(printf %s "$1" |sed -r "$HEX_DECODE")"
+  printf -- "$(printf %s "$1" |sed -r "$HEX_DECODE")"
 }
 
 if [ -z "$REQUEST_METHOD" ]; then
@@ -92,7 +92,7 @@ if [ -z "$REQUEST_METHOD" ]; then
              "$cgilite_response" "${cgilite_cl}"
            cat
            [ "${cgilite_cl#Connection}" = "${cgilite_cl}" ]; exit;;
-      *) cgilite_response="$cgilite_response${BR}$l";;
+      *) cgilite_response="${cgilite_response:+${cgilite_response}${BR}}${l}";;
     esac; done || exit 0;
     (sleep $cgilite_timeout && kill $$) & cgilite_watchdog=$!
   done
@@ -116,7 +116,7 @@ cgilite_value(){
     str=${str#*&${name}=}
     cnt=$((cnt - 1))
   done
-  printf "$(printf %s "${str%%&*}" |sed -r 's;\+; ;g;'"$HEX_DECODE")"
+  printf -- "$(printf %s "${str%%&*}" |sed -r 's;\+; ;g;'"$HEX_DECODE")"
 }
 
 GET(){ cgilite_value "${QUERY_STRING}" $@; }