Initial devel branch import from bash-3.0-alpha

examples/scripts.noah/number.bash

@@ -108,7 +108,7 @@ function number ()
            ;;
          0 ) : ;;
          * )
-            if test ".${val2}" != '.' -a ".${d1}" != '.0' ; then
+            if test ".${val2}" != '.' && test ".${d1}" != '.0' ; then
                val2="${val2}-"
             fi
             case "${d1}" in

examples/scripts.noah/string.bash

@@ -95,11 +95,11 @@ function strcmp ()
 ###;;;autoload
 function strncmp ()
 {
-    if [ -z "${3}" -o "${3}" -le "0" ]; then
+    if [ -z "${3}" ] || [ "${3}" -le "0" ]; then
        return 0
     fi
    
-    if [ ${3} -ge ${#1} -a ${3} -ge ${#2} ]; then
+    if [ ${3} -ge ${#1} ] && [ ${3} -ge ${#2} ]; then
        strcmp "$1" "$2"
        return $?
     else