X-Git-Url: http://git.plutz.net/?p=cgilite;a=blobdiff_plain;f=cgilite.sh;h=e145f2eebe173be82475cde1ec60fb200a14ed63;hp=b7067a70ae2fd95bb84e70cc89d43f2441d56173;hb=147c7222675fd027873faa7e921e2679d99e71cc;hpb=4a73c7164a28728de0b717e869704c803ef9ca65

diff --git a/cgilite.sh b/cgilite.sh
index b7067a7..e145f2e 100755
--- a/cgilite.sh
+++ b/cgilite.sh
@@ -27,6 +27,8 @@ BR='
 '
 cgilite_timeout=2
 
+debug(){ [ $# -gt 0 ] && printf '%s\n' "$@" >&2 || tee -a /dev/stderr; }
+
 PATH(){ 
   local str seg out
   [ $# -eq 0 ] && str="$(cat)" || str="$*"
@@ -187,6 +189,8 @@ COOKIE(){
 }
 
 HTML(){
+  # Escape HTML cahracters
+  # Also escape [, ], and \n for use in html-sh
   local str out
   [ $# -eq 0 ] && str="$(cat)" || str="$*"
   while [ "$str" ]; do
@@ -196,6 +200,10 @@ HTML(){
       \>*) out="${out}>";;
       \"*) out="${out}"";;
       \'*) out="${out}'";;
+      \[*) out="${out}[";;
+      \]*) out="${out}]";;
+      "${CR}"*) out="${out}
";;
+      "${BR}"*) out="${out}
";;
       *) out="${out}${str%"${str#?}"}";;
     esac
     str="${str#?}"
@@ -204,6 +212,7 @@ HTML(){
 }
 
 URL(){
+  # Escape pathes, so they can be used in link tags and HTTP Headers
   local str out
   [ $# -eq 0 ] && str="$(cat)" || str="$*"
   while [ "$str" ]; do
@@ -213,6 +222,12 @@ URL(){
       \'*) out="${out}%27";;
       \?*) out="${out}%3F";;
       \#*) out="${out}%23";;
+      \[*) out="${out}%5B";;
+      \]*) out="${out}%5D";;
+      \ *) out="${out}%20";;
+      "	"*) out="${out}%09";;
+      "${CR}"*) out="${out}%0D";;
+      "${BR}"*) out="${out}%0A";;
       %*) out="${out}%25";;
       *) out="${out}${str%"${str#?}"}";;
     esac