initial import of changes from 9front bikeshedding; bundle rc-httpd

bin/cgilib.rc

@@ -2,7 +2,7 @@
 
 fn dprint { echo $* >[1=2] }
 fn dprintv { { for(v in $*) { echo -n $v^'#'^$#$v^'=' $$v '; '  }; echo } >[1=2] }
-
+fn echo {if(! ~ $1 -n || ! ~ $2 '') /bin/echo $*}
 fn escape_html { sed 's/&/\&amp;/g; s/</\&lt;/g; s/>/\&gt;/g' $* }
 
 fn http_redirect {
@@ -12,7 +12,7 @@ fn http_redirect {
         t=$"base_url^$1
     if not
         t=$"base_url^$"req_path^$1
-    echo 'Status: '^$2^'
+    exec /bin/echo 'Status: '^$2^'
 Location: '^$t^'
 
 '
@@ -29,7 +29,7 @@ fn load_post_args {
         ifs='&
 '       for(pair in `{cat}) {
             ifs='=' { pair=`{echo -n $pair} }
-            n='post_arg_'^`{echo $pair(1)|tr -cd 'a-zA-Z0-9_'}
+            n='post_arg_'^`{echo $pair(1)|urldecode|tr -cd 'a-zA-Z0-9_'}
             post_args=( $post_args $n )
             ifs=() { $n=`{echo -n $pair(2)|urldecode|tr -d '
'} }
         }
@@ -64,89 +64,52 @@ fn awk_buffer {
     END { printf "%s", buf }'
 }
 
-fn urldecode {
-awk '
-BEGIN {
-    hextab ["0"] = 0; hextab ["8"] = 8;
-    hextab ["1"] = 1; hextab ["9"] = 9;
-    hextab ["2"] = 2; hextab ["A"] = hextab ["a"] = 10
-    hextab ["3"] = 3; hextab ["B"] = hextab ["b"] = 11;
-    hextab ["4"] = 4; hextab ["C"] = hextab ["c"] = 12;
-    hextab ["5"] = 5; hextab ["D"] = hextab ["d"] = 13;
-    hextab ["6"] = 6; hextab ["E"] = hextab ["e"] = 14;
-    hextab ["7"] = 7; hextab ["F"] = hextab ["f"] = 15;
-}
-{
-    decoded = ""
-    i = 1
-    len = length ($0)
-    while ( i <= len ) {
-        c = substr ($0, i, 1)
-        if ( c == "%" ) {
-            if ( i+2 <= len ) {
-                c1 = substr ($0, i+1, 1)
-                c2 = substr ($0, i+2, 1)
-                if ( hextab [c1] == "" || hextab [c2] == "" ) {
-                    print "WARNING: invalid hex encoding: %" c1 c2 | "cat >&2"
-                } else {
-                    code = 0 + hextab [c1] * 16 + hextab [c2] + 0
-                    c = sprintf ("%c", code)
-                    i = i + 2
-                }
-            } else {
-                print "WARNING: invalid % encoding: " substr ($0, i, len - i)
-            }
-        } else if ( c == "+" ) {
-            c = " "
-        }
-        decoded = decoded c
-        ++i
-    }
-    printf "%s", decoded
-}
-'
-}
+fn urldecode { /bin/urlencode -d }
 
-fn url_encode {
-    awk '
-    BEGIN {
-    # We assume an awk implementation that is just plain dumb.
-    # We will convert an character to its ASCII value with the
-    # table ord[], and produce two-digit hexadecimal output
-    # without the printf("%02X") feature.
+#fn urldecode {
+#awk '
+#BEGIN {
+#    hextab ["0"] = 0; hextab ["8"] = 8;
+#    hextab ["1"] = 1; hextab ["9"] = 9;
+#    hextab ["2"] = 2; hextab ["A"] = hextab ["a"] = 10
+#    hextab ["3"] = 3; hextab ["B"] = hextab ["b"] = 11;
+#    hextab ["4"] = 4; hextab ["C"] = hextab ["c"] = 12;
+#    hextab ["5"] = 5; hextab ["D"] = hextab ["d"] = 13;
+#    hextab ["6"] = 6; hextab ["E"] = hextab ["e"] = 14;
+#    hextab ["7"] = 7; hextab ["F"] = hextab ["f"] = 15;
+#}
+#{
+#    decoded = ""
+#    i = 1
+#    len = length ($0)
+#    while ( i <= len ) {
+#        c = substr ($0, i, 1)
+#        if ( c == "%" ) {
+#            if ( i+2 <= len ) {
+#                c1 = substr ($0, i+1, 1)
+#                c2 = substr ($0, i+2, 1)
+#                if ( hextab [c1] == "" || hextab [c2] == "" ) {
+#                    print "WARNING: invalid hex encoding: %" c1 c2 | "cat >&2"
+#                } else {
+#                    code = 0 + hextab [c1] * 16 + hextab [c2] + 0
+#                    c = sprintf ("%c", code)
+#                    i = i + 2
+#                }
+#            } else {
+#                print "WARNING: invalid % encoding: " substr ($0, i, len - i)
+#            }
+#        } else if ( c == "+" ) {
+#            c = " "
+#        }
+#        decoded = decoded c
+#        ++i
+#    }
+#    printf "%s", decoded
+#}
+#'
+#}
 
-    EOL = "%0A"     # "end of line" string (encoded)
-    split ("1 2 3 4 5 6 7 8 9 A B C D E F", hextab, " ")
-    hextab [0] = 0
-    for ( i=1; i<=255; ++i ) ord [ sprintf ("%c", i) "" ] = i + 0
-    if ("'^$"EncodeEOL^'" == "yes") EncodeEOL = 1; else EncodeEOL = 0
-    }
-    {
-    encoded = ""
-    for ( i=1; i<=length ($0); ++i ) {
-        c = substr ($0, i, 1)
-        if ( c ~ /[a-zA-Z0-9.-]/ ) {
-        encoded = encoded c     # safe character
-        } else if ( c == " " ) {
-        encoded = encoded "+"   # special handling
-        } else {
-        # unsafe character, encode it as a two-digit hex-number
-        lo = ord [c] % 16
-        hi = int (ord [c] / 16);
-        encoded = encoded "%" hextab [hi] hextab [lo]
-        }
-    }
-    if ( EncodeEOL ) {
-        printf ("%s", encoded EOL)
-    } else {
-        print encoded
-    }
-    }
-    END {
-        #if ( EncodeEOL ) print ""
-    }
-' $* 
-}
+fn url_encode { /bin/urlencode $* }
 
 # Cookies
 fn set_cookie {
@@ -165,10 +128,10 @@ fn get_cookie {
 
 
 fn static_file {
-    echo 'Content-Type: '`{select_mime $1}
+    echo -n 'Content-Type: '
+    select_mime $1
     echo
-    cat $1
-    exit
+    exec cat $1
 }
 
 fn select_mime {