improved debugging output

[shcgi] / cgi.sh

diff --git a/cgi.sh b/cgi.sh
index 3ad0e8b3a9f7c5301122f577bf9e0fc413b55074..439773015f82e103c2459e32b5059faa8e401205 100755 (executable)
--- a/cgi.sh
+++ b/cgi.sh
@@ -40,14 +40,13 @@ cgi_post() {  # parse HTTP POST string
     key="$(printf %s "$query" |sed -r 's:^([a-zA-Z0-9_-]+)=(.*)$:\1:')"
     val="$(printf %s "$query" |sed -r 's:^([a-zA-Z0-9_-]+)=(.*)$:\2:')"
     value="$(printf "$(printf %s "$val" |sed 's:+: :g;s:\\:\\\\:g;s:%:\\x:g;')")"
-    if [ -n "${_POST[$key]}" ]; then
+    n=''
+    if [ -n "${_POST[$key$n]}" ]; then
       n=0
       while [ -n "${_POST[$key$n]}" ]; do n=$(($n + 1)); done
-      _POST[$key$n]="$value"
-    else
-      _POST[$key]="$value"
     fi
-    debug "_POST[$key] => $value"
+    _POST[$key$n]="$value"
+    debug "_POST[$key$n] => $value"
   done
 }
 
@@ -73,10 +72,10 @@ cgi_cookie() { # Parse GET data from referer
 
 urlsave(){
   printf %s "$*" \
-  | sed 's; ;%20;g;
+  | sed 's;%;%25;g;
+         s; ;%20;g;
          s;!;%21;g;
          s;";%22;g;
-         s;%;%25;g;
          s;&;%26;g;
          s;(;%28;g;
          s;);%29;g;
@@ -86,3 +85,22 @@ urlsave(){
          s;'\'';%27;g;
          s;\?;%3f;g;'
 }
+
+redirect(){
+  printf '%s\n\n' "Location: $*"
+  exit 0
+}
+
+set_cookie(){
+  case "$1" in
+    session|0) expire='';;
+    ''|default)        expire="$(LANG=C date -d "+ 1 week" +'%a, %d %b %Y %T %Z')";;
+    *)         expire="$(LANG=C date -d "$1" +'%a, %d %b %Y %T %Z' 2>&-)";;
+  esac
+  cookie="$2"
+  
+  printf 'Set-Cookie: %s' "$cookie"
+  [ -n "$expire" ] && printf '; Expires=%s' "$expire" 
+  [ $# -ge 3 ] && shift 2 && printf '; %s' "$@"
+  printf '\n'
+}