[git commit master 1/1] sed: trivial code shrink

Denys Vlasenko vda.linux at googlemail.com
Sat Jun 19 15:51:06 UTC 2010


commit: http://git.busybox.net/busybox/commit/?id=c2c7aa4b0d16049322ca2ebc69ca1093f6944e3a
branch: http://git.busybox.net/busybox/commit/?id=refs/heads/master

function                                             old     new   delta
sed_main                                             685     667     -18

Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
 editors/sed.c |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/editors/sed.c b/editors/sed.c
index 28f0c73..7af8f86 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;
 }
-- 
1.7.1



More information about the busybox-cvs mailing list