Remove exit and also properly close open files

2 files changed, 8 insertions, 5 deletions

diff --git a/etc/rc.initial.store_config_to_removable_device b/etc/rc.initial.store_config_to_removable_device
index 19fa70e..e7d3bdd 100755
--- a/etc/rc.initial.store_config_to_removable_device
+++ b/etc/rc.initial.store_config_to_removable_device
@@ -42,7 +42,8 @@
 		$dirs = return_dir_as_array("/var/db/pfi/");
 		if(!is_array($dirs)) {
 			echo "\nNo capable storage devices detected.\n";
-			exit;
+			fclose($fp);
+			return;
 		}
 		echo "\nDevices capable of config.xml storage:\n";
 		foreach($dirs as $dir) {
@@ -55,7 +56,8 @@
 		echo "{$g['product_name']} configuration file to reside on: ";
 		$move_config_to_device = chop(fgets($fp));
 		if ($move_config_to_device == "") {
-			exit(0);
+			fclose($fp);
+			return 0;
 		}		
 	} while (!$move_config_to_device);
 	
@@ -64,7 +66,8 @@
 	$status = mwexec("/sbin/mount -w -t msdosfs /dev/{$move_config_to_device} /tmp/mnt/cf");
 	if(!$status) {
 		echo "Error while mounting {$move_config_to_device}.\n";
-		exit;
+		fclose($fp);
+		return;
 	}
 
 	echo "\n\nProcessing: ";
diff --git a/etc/rc.kill_states b/etc/rc.kill_states
index 69646d9..a20753a 100755
--- a/etc/rc.kill_states
+++ b/etc/rc.kill_states
@@ -45,7 +45,7 @@ $local_ip = str_replace("\n", "", $argv[2]);
 
 if (empty($interface) || !does_interface_exist($interface)) {
 	log_error("rc.kill_states: Invalid interface '{$interface}'");
-	exit;
+	return;
 }
 
 if (!empty($local_ip)) {
@@ -56,7 +56,7 @@ if (!empty($local_ip)) {
 
 	if (!is_ipaddr($local_ip)) {
 		log_error("rc.kill_states: Invalid IP address '{$local_ip}'");
-		exit;
+		return;
 	}
 }