emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vi: code shrink

Browse Source 
function                                             old     new   delta
vi_main                                              250     242      -8
colon                                               2980    2970     -10
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 0/2 up/down: 0/-18)             Total: -18 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2010-04-16 22:13:55 -07:00
parent 2bb651ae10
commit 04cecd5e61
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
editors/vi.c
View File

@ -458,12 +458,10 @@ int vi_main(int argc, char **argv)
save_argc = argc; save_argc = argc;
//----- This is the main file handling loop -------------- //----- This is the main file handling loop --------------
if (optind >= argc) { while (1) {
edit_file(0); edit_file(argv[optind]); /* param might be NULL */
} else { if (++optind >= argc)
for (; optind < argc; optind++) { break;
edit_file(argv[optind]);
}
} }
//----------------------------------------------------------- //-----------------------------------------------------------
@ -955,6 +953,7 @@ static void colon(char *buf)
} else if (strncmp(cmd, "quit", i) == 0 // Quit } else if (strncmp(cmd, "quit", i) == 0 // Quit
|| strncmp(cmd, "next", i) == 0 // edit next file || strncmp(cmd, "next", i) == 0 // edit next file
) { ) {
int n;
if (useforce) { if (useforce) {
// force end of argv list // force end of argv list
if (*cmd == 'q') { if (*cmd == 'q') {
@ -970,11 +969,12 @@ static void colon(char *buf)
goto vc1; goto vc1;
} }
// are there other file to edit // are there other file to edit
if (*cmd == 'q' && optind < save_argc - 1) { n = save_argc - optind - 1;
status_line_bold("%d more file to edit", (save_argc - optind - 1)); if (*cmd == 'q' && n > 0) {
status_line_bold("%d more file(s) to edit", n);
goto vc1; goto vc1;
} }
if (*cmd == 'n' && optind >= save_argc - 1) { if (*cmd == 'n' && n <= 0) {
status_line_bold("No more files to edit"); status_line_bold("No more files to edit");
goto vc1; goto vc1;
} }