diff options
| author | Robert Griebl | 2002-07-31 21:22:21 +0000 |
|---|---|---|
| committer | Robert Griebl | 2002-07-31 21:22:21 +0000 |
| commit | a71389bfe8b7a047ef6da555f274d124318977c9 (patch) | |
| tree | ae85713d0c3bbdeebbd4e1c7cbb0c6e335db35c2 /editors | |
| parent | 7373e485d3314e8a7085c4d1d9cea9f270445c45 (diff) | |
| download | busybox-a71389bfe8b7a047ef6da555f274d124318977c9.zip busybox-a71389bfe8b7a047ef6da555f274d124318977c9.tar.gz | |
Applied a patch from Philip Blundell <pb@nexus.co.uk>:
Added support for ":x" as an alias for ":wq" to vi
Diffstat (limited to 'editors')
| -rw-r--r-- | editors/vi.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/editors/vi.c b/editors/vi.c index a8f5203..ad6dd5c 100644 --- a/editors/vi.c +++ b/editors/vi.c @@ -19,7 +19,7 @@ */ static const char vi_Version[] = - "$Id: vi.c,v 1.21 2002/04/26 07:41:22 timr Exp $"; + "$Id: vi.c,v 1.22 2002/07/31 21:22:21 sandman Exp $"; /* * To compile for standalone use: @@ -1225,11 +1225,12 @@ key_cmd_mode: editing = 0; } } else if (strncasecmp((char *) p, "write", cnt) == 0 || - strncasecmp((char *) p, "wq", cnt) == 0) { + strncasecmp((char *) p, "wq", cnt) == 0 || + strncasecmp((char *) p, "x", cnt) == 0) { cnt = file_write(cfn, text, end - 1); file_modified = FALSE; psb("\"%s\" %dL, %dC", cfn, count_lines(text, end - 1), cnt); - if (p[1] == 'q') { + if (p[0] == 'x' || p[1] == 'q') { editing = 0; } } else if (strncasecmp((char *) p, "file", cnt) == 0 ) { @@ -2134,7 +2135,8 @@ static void colon(Byte * buf) } else if (strncasecmp((char *) cmd, "version", i) == 0) { // show software version psb("%s", vi_Version); } else if ((strncasecmp((char *) cmd, "write", i) == 0) || // write text to file - (strncasecmp((char *) cmd, "wq", i) == 0)) { // write text to file + (strncasecmp((char *) cmd, "wq", i) == 0) || + (strncasecmp((char *) cmd, "x", i) == 0)) { // is there a file name to write to? if (strlen((char *) args) > 0) { fn = args; @@ -2165,7 +2167,7 @@ static void colon(Byte * buf) psb("\"%s\" %dL, %dC", fn, li, l); if (q == text && r == end - 1 && l == ch) file_modified = FALSE; - if (cmd[1] == 'q' && l == ch) { + if ((cmd[0] == 'x' || cmd[1] == 'q') && l == ch) { editing = 0; } #ifdef CONFIG_FEATURE_VI_READONLY |