sed: trivial code shrink
authorDenys Vlasenko <vda.linux@googlemail.com>
Sat, 19 Jun 2010 15:47:46 +0000 (17:47 +0200)
committerDenys Vlasenko <vda.linux@googlemail.com>
Sat, 19 Jun 2010 15:47:46 +0000 (17:47 +0200)
function                                             old     new   delta
sed_main                                             685     667     -18

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
editors/sed.c

index 28f0c7318ce9fc8d9b784b16e6c7e601b459530b..7af8f867a54dc68808e16a564304bb8549b9832a 100644 (file)
@@ -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;
 }