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

diff --git a/cgilite.sh b/cgilite.sh
index 9420b46c18ce96672ac10a9281ac9bd6806e9151..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
   # 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
   | hexdump -ve '/1 "%03o\n"' \
   | while read n; do
     case $n in


@@ -168,13 +168,13 @@ URL(){
   # Code every character in URL escape hex format
   # except alphanumeric ascii
 
   # Code every character in URL escape hex format
   # except alphanumeric ascii
 

-  printf %s "$*" \
+  { [ $# -eq 0 ] && cat || printf %s "$*"; } \

   | hexdump -v -e '/1 ",%02X"' \
   | sed 's;,;%;g; s;%2F;/;g;'
 }
 
 PATH(){
   | hexdump -v -e '/1 ",%02X"' \
   | sed 's;,;%;g; s;%2F;/;g;'
 }
 
 PATH(){

-  printf %s "$1" \
+  { [ $# -eq 0 ] && cat || printf %s "$*"; } \

   | sed -r 's;^.*$;/&/;; s;/+;/;g;
             :X;
             s;^/\.\./;/;; s;/\./;/;g;
   | sed -r 's;^.*$;/&/;; s;/+;/;g;
             :X;
             s;^/\.\./;/;; s;/\./;/;g;

diff --git a/storage.sh b/storage.sh
index a6b6b436a947cea57b3bf684df5e8c67caa9cb66..fd7582057e112f2ec582e6ede8d7dd1995ce2a66 100755 (executable)
--- a/storage.sh
+++ b/storage.sh
@@ -63,27 +63,31 @@ RELEASE(){
   fi
 }
 
   fi
 }
 

+STRING='
+  s;\\;\\\\;g;
+  s;\n;\\n;g;
+  s;\t;\\t;g;
+  s;\r;\\r;g;
+  s;\+;\\+;g;
+  s; ;+;g;
+'
+

 STRING(){
 STRING(){

-  printf %s "$*" |sed -r '
-    :X; $!{N;bX;}
-    s;\\;\\\\;g;
-    s;\n;\\n;g;
-    s;\t;\\t;g;
-    s;\r;\\r;g;
-    s;\+;\\+;g;
-    s; ;+;g;
-  '
+  { [ $# -eq 0 ] && cat || printf %s "$*"; } \
+  | printf %s "$*" |sed -r ':X; $!{N;bX;}'"$STRING"

 }
 
 }
 

+UNSTRING='
+  :UNSTRING_X
+  s;((^|[^\\])(\\\\)*)\\n;\1\n;g;
+  s;((^|[^\\])(\\\\)*)\\t;\1\t;g;
+  s;((^|[^\\])(\\\\)*)\\r;\1\r;g;
+  s;((^|[^\\])(\\\\)*)\+;\1 ;g;
+  tUNSTRING_X;
+  s;((^|[^\\])(\\\\)*)\\\+;\1+;g;
+  s;\\\\;\\;g;
+'

 UNSTRING(){
 UNSTRING(){

-  printf %s "$*" |sed -r '
-    :X
-    s;((^|[^\\])(\\\\)*)\\n;\1\n;g;
-    s;((^|[^\\])(\\\\)*)\\t;\1\t;g;
-    s;((^|[^\\])(\\\\)*)\\r;\1\r;g;
-    s;((^|[^\\])(\\\\)*)\+;\1 ;g;
-    tX;
-    s;((^|[^\\])(\\\\)*)\\\+;\1+;g;
-    s;\\\\;\\;g;
-  '
+  { [ $# -eq 0 ] && cat || printf %s "$*"; } \
+  | sed -r "$UNSTRING"

 }
 }