From: Denys Vlasenko <vda.linux@googlemail.com>
Date: Sat, 19 Jun 2010 15:47:46 +0000 (+0200)
Subject: sed: trivial code shrink
X-Git-Tag: 1_17_0~67
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=c2c7aa4b0d16049322ca2ebc69ca1093f6944e3a;p=oweals%2Fbusybox.git

sed: trivial code shrink

function                                             old     new   delta
sed_main                                             685     667     -18

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
---

diff --git a/editors/sed.c b/editors/sed.c
index 28f0c7318..7af8f867a 100644
--- a/editors/sed.c
+++ b/editors/sed.c
@@ -1333,7 +1333,6 @@ int sed_main(int argc UNUSED_PARAM, char **argv)
 		if (opt & OPT_in_place)
 			bb_error_msg_and_die(bb_msg_requires_arg, "-i");
 		add_input_file(stdin);
-		process_files();
 	} else {
 		int i;
 		FILE *file;
@@ -1379,9 +1378,13 @@ int sed_main(int argc UNUSED_PARAM, char **argv)
 			free(G.outname);
 			G.outname = NULL;
 		}
-		if (G.input_file_count > G.current_input_file)
-			process_files();
+		/* Here, to handle "sed 'cmds' nonexistent_file" case we did:
+		 * if (G.current_input_file >= G.input_file_count)
+		 *	return status;
+		 * but it's not needed since process_files() works correctly
+		 * in this case too. */
 	}
+	process_files();
 
 	return status;
 }