dual use string functions (argument and pipe), make scripts of sed based functions...

[cgilite] / cgilite.sh

diff --git a/cgilite.sh b/cgilite.sh
index 13cdb3cdc347f35ffd507a2d4fcd9c1dc6f5a2e0..e1b34802577a64c762d6f76828d8d992f90413cc 100755 (executable)
--- a/cgilite.sh
+++ b/cgilite.sh
@@ -145,7 +145,7 @@ HTML(){
   # HTML Entity Coding
   # Prints UTF-8 string as decimal Unicode Code Points
   # Useful for escaping user input for use in HTML text and attributes
-  printf %s "$*" \
+  { [ $# -eq 0 ] && cat || printf %s "$*"; } \
   | hexdump -ve '/1 "%03o\n"' \
   | while read n; do
     case $n in
@@ -168,24 +168,25 @@ URL(){
   # Code every character in URL escape hex format
   # except alphanumeric ascii
 
-  printf %s "$*" \
+  { [ $# -eq 0 ] && cat || printf %s "$*"; } \
   | hexdump -v -e '/1 ",%02X"' \
-  | tr , %
+  | sed 's;,;%;g; s;%2F;/;g;'
 }
 
 PATH(){
-  printf %s "$1" \
+  { [ $# -eq 0 ] && cat || printf %s "$*"; } \
   | sed -r 's;^.*$;/&/;; s;/+;/;g;
             :X;
-            s;^/../;/;; s;/./;/;g;
+            s;^/\.\./;/;; s;/\./;/;g;
             tX;
-            s;/[^/]+/../;/;;
+            s;/[^/]+/\.\./;/;;
             tX;
             s;^(/.*)/$;\1;'
 }
 
 
 SET_COOKIE(){
+  local expire cookie
   case "$1" in
     ''|0|session) expire='';;
     [+-][0-9]*)   expire="$(date -R -d @$(($(date +%s) + $1)))";;
@@ -200,7 +201,7 @@ SET_COOKIE(){
 }
 
 REDIRECT(){
-  printf '%s: %s\r\n'
+  printf '%s: %s\r\n' \
     Status "303 See Other" \
     Content-Length 0 \
     Location "$*"