quicker (and simpler) validation functions

svn path=/trunk/; revision=50

diff --git a/misc.sh b/misc.sh
index 43edfcf70fc88dfc96dfece9036e52ef6851d69b..96393099598a53b5cc3350a9d04234f2d2ec4598 100755 (executable)
--- a/misc.sh
+++ b/misc.sh
@@ -1,6 +1,6 @@
 #!/bin/zsh
 
-# Copyright 2014, 2015 Paul Hänsch
+# Copyright 2014 - 2017 Paul Hänsch
 #
 # This file is part of shcgi.
 # 
@@ -33,25 +33,19 @@ data_dirs(){
 validate(){
   # print value if value matches regex; otherwise print default
   value="$1"
-  regex="$(printf %s\\n "$2" | sed -r ':X;s;(^|[^\\])((\\\\)*)/;\1\2\\/;g;tX')"
-                             # ^^ escape only unescaped slash characters for later insertion
+  regex="$2"
   default="$3"
 
-  printf %s\\n "${value}" \
-  | sed -rn "2q; /^(${regex})\$/{p;q}; a${default}
-            "
+  printf %s "${value%%${BR}*}" |grep -xE "$regex" || printf %s "$default"
 }
 
 invalidate(){
   # print default if value matches regex; otherwise print value
   value="$1"
-  regex="$(printf %s\\n "$2" | sed -r ':X;s;(^|[^\\])((\\\\)*)/;\1\2\\/;g;tX')"
-                             # ^^ escape only unescaped slash characters for later insertion
+  regex="$2"
   default="$3"
-
-  printf %s\\n "${value}" \
-  | sed -rn "2q; /^(${regex})\$/{bX}; p;q; :X;a${default}
-            "
+  
+  printf %s "${value%%${BR}*}" |grep -qxE "$regex" && printf %s "$default" || printf %s "${value%%${BR}*}"
 }
 
 declare -A item_name