patch-2.1.29 linux/scripts/Menuconfig

• Lines: 39
• Date: Mon Mar 10 12:38:56 1997
• Orig file: v2.1.28/linux/scripts/Menuconfig
• Orig date: Fri Feb 7 05:54:55 1997

diff -u --recursive --new-file v2.1.28/linux/scripts/Menuconfig linux/scripts/Menuconfig
@@ -400,7 +400,9 @@
 			answer="`cat MCdialog.out`"
 			answer="${answer:-$3}"
 
-			if expr $answer : '0$\|-\?[1-9][0-9]*$' >/dev/null
+			# Semantics of + and ? in GNU expr changed, so
+			# we avoid them:
+			if expr "$answer" : '0$\|\(-[1-9]\|[1-9]\)[0-9]*$' >/dev/null
 			then
 				eval $2="$answer"
 			else
@@ -433,7 +435,7 @@
 			answer="${answer:-$3}"
 			answer="${answer##*[x,X]}"
 
-			if expr $answer : '[0-9a-fA-F]\+$' >/dev/null
+			if expr "$answer" : '[0-9a-fA-F][0-9a-fA-F]*$' >/dev/null
 			then
 				eval $2="$answer"
 			else
@@ -452,7 +454,7 @@
 }
 
 #
-# Handle a on-of-many choice list.
+# Handle a one-of-many choice list.
 #
 function l_choice () {
 	#
@@ -493,7 +495,7 @@
 	done
 
 	#
-	# Now set the boolean value of each option base on
+	# Now set the boolean value of each option based on
 	# the selection made from the radiolist.
 	#
 	set -- $choices