patch-2.0.5 linux/scripts/Menuconfig

Next file: linux/CREDITS
Previous file: linux/net/ipv4/ip_sockglue.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.0.4/linux/scripts/Menuconfig linux/scripts/Menuconfig
@@ -733,7 +733,7 @@
 # Create a menu item to load an alternate configuration file.
 #
 g_alt_config () {
-	echo -n "get_alt_config 'Load  an Alternate Configuration File' "\
+	echo -n "get_alt_config 'Load an Alternate Configuration File' "\
 		>>MCmenu
 }
 
@@ -742,6 +742,8 @@
 # configuration from it.
 #
 get_alt_config () {
+	set -f ## Switch file expansion OFF
+
 	while true
 	do
 		ALT_CONFIG="${ALT_CONFIG:-$DEFAULTS}"
@@ -759,9 +761,9 @@
 
 			[ "_" = "_$ALT_CONFIG" ] && break
 
-			if [ -r "$ALT_CONFIG" ]
+			if eval [ -r "$ALT_CONFIG" ]
 			then
-				load_config_file "$ALT_CONFIG"
+				eval load_config_file "$ALT_CONFIG"
 				break
 			else
 				echo -ne "\007"
@@ -789,6 +791,7 @@
 		fi
 	done
 
+	set +f ## Switch file expansion ON
 	rm -f help.out MCdialog.out
 }
 
@@ -796,7 +799,7 @@
 # Create a menu item to store an alternate config file.
 #
 s_alt_config () {
-	echo -n "save_alt_config 'Store an Alternate Configuration File' "\
+	echo -n "save_alt_config 'Save Configuration to an Alternate File' "\
 		 >>MCmenu
 }
 
@@ -805,6 +808,8 @@
 # configuration to it.
 #
 save_alt_config () {
+	set -f  ## Switch file expansion OFF
+			
 	while true
 	do
 		$DIALOG --backtitle "$backtitle" \
@@ -818,10 +823,10 @@
 			ALT_CONFIG=`cat MCdialog.out`
 
 			[ "_" = "_$ALT_CONFIG" ] && break
-			
-			if touch $ALT_CONFIG 2>/dev/null
+
+			if eval touch $ALT_CONFIG 2>/dev/null
 			then
-				save_configuration $ALT_CONFIG
+				eval save_configuration $ALT_CONFIG
 				load_functions  ## RELOAD
 				break
 			else
@@ -844,11 +849,12 @@
 leave this blank.
 EOM
 			$DIALOG	--backtitle "$backtitle"\
-				--title "Store Alternate Configuration"\
+				--title "Save Alternate Configuration"\
 				--textbox help.out $ROWS $COLS
 		fi
 	done
 
+	set +f  ## Switch file expansion ON
 	rm -f help.out MCdialog.out
 }
 


FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov