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

vi: revert change in how "end of file list" is deteced - fixes 'q' in bare "vi"

Browse Source 
function                                             old     new   delta
vi_main                                              273     272      -1
colon                                               2853    2852      -1
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 0/2 up/down: 0/-2)               Total: -2 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2019-04-03 16:35:23 +02:00
parent e1a1b64f43
commit a3ce161363
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
editors/vi.c
View File

@ -2625,7 +2625,7 @@ static void colon(char *buf)
if (useforce) { if (useforce) {
if (*cmd == 'q') { if (*cmd == 'q') {
// force end of argv list // force end of argv list
optind = cmdline_filecnt - 1; optind = cmdline_filecnt;
} }
editing = 0; editing = 0;
goto ret; goto ret;
@ -4384,7 +4384,7 @@ int vi_main(int argc, char **argv)
edit_file(argv[optind]); // might be NULL on 1st iteration edit_file(argv[optind]); // might be NULL on 1st iteration
// NB: optind can be changed by ":next" and ":rewind" commands // NB: optind can be changed by ":next" and ":rewind" commands
optind++; optind++;
if (!argv[optind]) if (optind >= cmdline_filecnt)
break; break;
} }
// "Use normal screen buffer, restore cursor" // "Use normal screen buffer, restore cursor"