From 6ed94aa9b25fc1824de2e74eebf8b75aefe99b75 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Mon, 1 Apr 2019 11:58:11 +0200 Subject: vi: install SIGINT handler _after_ restart setjmp is initialized While at it, sanitized comment style, deleted wrong ones, renamed signal handlers to _handler(), slightly optimized "cursor home+clear screen". function old new delta cont_handler - 66 +66 tstp_handler - 64 +64 winch_handler - 60 +60 int_handler - 32 +32 edit_file 648 651 +3 redraw 52 43 -9 catch_sig 32 - -32 winch_sig 60 - -60 suspend_sig 64 - -64 cont_sig 66 - -66 ------------------------------------------------------------------------------ (add/remove: 4/4 grow/shrink: 1/1 up/down: 225/-231) Total: -6 bytes Signed-off-by: Denys Vlasenko --- editors/vi.c | 115 +++++++++++++++++++++++++++-------------------------------- 1 file changed, 52 insertions(+), 63 deletions(-) (limited to 'editors/vi.c') diff --git a/editors/vi.c b/editors/vi.c index 425d14c9c..a11e06040 100644 --- a/editors/vi.c +++ b/editors/vi.c @@ -235,9 +235,10 @@ enum { * Full sequence is "ESC [ J", * is 0/1/2 = "erase below/above/all".) */ -#define ESC_CLEAR2EOS ESC"[J" +#define ESC_CLEAR2EOS ESC"[J" /* Cursor to given coordinate (1,1: top left) */ -#define ESC_SET_CURSOR_POS ESC"[%u;%uH" +#define ESC_SET_CURSOR_POS ESC"[%u;%uH" +#define ESC_SET_CURSOR_TOPLEFT ESC"[H" //UNUSED ///* Cursor up and down */ //#define ESC_CURSOR_UP ESC"[A" @@ -352,7 +353,7 @@ struct globals { char *context_start, *context_end; #endif #if ENABLE_FEATURE_VI_USE_SIGNALS - sigjmp_buf restart; // catch_sig() + sigjmp_buf restart; // int_handler() jumps to location remembered here #endif struct termios term_orig; // remember what the cooked mode was #if ENABLE_FEATURE_VI_COLON @@ -535,15 +536,11 @@ static void rawmode(void); // set "raw" mode on tty static void cookmode(void); // return to "cooked" mode on tty // sleep for 'h' 1/100 seconds, return 1/0 if stdin is (ready for read)/(not ready) static int mysleep(int); -static int readit(void); // read (maybe cursor) key from stdin static int get_one_char(void); // read 1 char from stdin // file_insert might reallocate text[]! static int file_insert(const char *, char *, int); static int file_write(char *, char *, char *); -static void place_cursor(int, int); static void screen_erase(void); -static void clear_to_eol(void); -static void clear_to_eos(void); static void go_bottom_and_clear_to_eol(void); static void standout_start(void); // send "start reverse video" sequence static void standout_end(void); // send "end reverse video" sequence @@ -570,9 +567,9 @@ static char *get_address(char *, int *, int *); // get two colon addrs, if prese #endif static void colon(char *); // execute the "colon" mode cmds #if ENABLE_FEATURE_VI_USE_SIGNALS -static void winch_sig(int); // catch window size changes -static void suspend_sig(int); // catch ctrl-Z -static void catch_sig(int); // catch ctrl-C and alarm time-outs +static void winch_handler(int); // catch window size changes +static void tstp_handler(int); // catch ctrl-Z +static void int_handler(int); // catch ctrl-C #endif #if ENABLE_FEATURE_VI_DOT_CMD static void start_new_cmd_q(char); // new queue for command @@ -598,11 +595,11 @@ static void check_context(char); // remember context for '' command #endif #if ENABLE_FEATURE_VI_UNDO static void flush_undo_data(void); -static void undo_push(char *, unsigned int, unsigned char); // Push an operation on the undo stack +static void undo_push(char *, unsigned, unsigned char); // push an operation on the undo stack static void undo_push_insert(char *, int, int); // convenience function -static void undo_pop(void); // Undo the last operation +static void undo_pop(void); // undo the last operation # if ENABLE_FEATURE_VI_UNDO_QUEUE -static void undo_queue_commit(void); // Flush any queued objects to the undo stack +static void undo_queue_commit(void); // flush any queued objects to the undo stack # else # define undo_queue_commit() ((void)0) # endif @@ -644,7 +641,7 @@ int vi_main(int argc, char **argv) srand((long) my_pid); #endif #ifdef NO_SUCH_APPLET_YET - /* If we aren't "vi", we are "view" */ + // if we aren't "vi", we are "view" if (ENABLE_FEATURE_VI_READONLY && applet_name[2]) { SET_READONLY_MODE(readonly_mode); } @@ -682,7 +679,7 @@ int vi_main(int argc, char **argv) #endif case 'H': show_help(); - /* fall through */ + // fall through default: bb_show_usage(); return 1; @@ -699,7 +696,7 @@ int vi_main(int argc, char **argv) // "Save cursor, use alternate screen buffer, clear screen" write1(ESC"[?1049h"); while (1) { - edit_file(argv[optind]); /* param might be NULL */ + edit_file(argv[optind]); // param might be NULL if (++optind >= argc) break; } @@ -804,13 +801,15 @@ static void edit_file(char *fn) ccol = 0; #if ENABLE_FEATURE_VI_USE_SIGNALS - signal(SIGINT, catch_sig); - signal(SIGWINCH, winch_sig); - signal(SIGTSTP, suspend_sig); + signal(SIGWINCH, winch_handler); + signal(SIGTSTP, tstp_handler); sig = sigsetjmp(restart, 1); if (sig != 0) { screenbegin = dot = text; } + // int_handler() can jump to "restart", + // must install handler *after* initializing "restart" + signal(SIGINT, int_handler); #endif cmd_mode = 0; // 0=command 1=insert 2='R'eplace @@ -994,7 +993,7 @@ static void setops(const char *args, const char *opname, int flg_no, const char *short_opname, int opt) { const char *a = args + flg_no; - int l = strlen(opname) - 1; /* opname have + ' ' */ + int l = strlen(opname) - 1; // opname have + ' ' // maybe strncmp? we had tons of erroneous strncasecmp's... if (strncasecmp(a, opname, l) == 0 @@ -1014,7 +1013,7 @@ static void setops(const char *args, const char *opname, int flg_no, static void colon(char *buf) { #if !ENABLE_FEATURE_VI_COLON - /* Simple ":cmd" handler with minimal set of commands */ + // Simple ":cmd" handler with minimal set of commands char *p = buf; int cnt; @@ -1357,7 +1356,7 @@ static void colon(char *buf) status_line_bold("No write since last change (:%s! overrides)", cmd); } else { // reset the filenames to edit - optind = -1; /* start from 0th file */ + optind = -1; // start from 0th file editing = 0; } # if ENABLE_FEATURE_VI_SET @@ -2218,7 +2217,7 @@ static char *find_pair(char *p, const char c) dir = strchr(braces, c) - braces; dir ^= 1; match = braces[dir]; - dir = ((dir & 1) << 1) - 1; /* 1 for ([{, -1 for )\} */ + dir = ((dir & 1) << 1) - 1; // 1 for ([{, -1 for )\} // look for match, count levels of pairs (( )) level = 1; @@ -2271,7 +2270,8 @@ static void flush_undo_data(void) } // Undo functions and hooks added by Jody Bruchon (jody@jodybruchon.com) -static void undo_push(char *src, unsigned int length, uint8_t u_type) // Add to the undo stack +// Add to the undo stack +static void undo_push(char *src, unsigned length, uint8_t u_type) { struct undo_object *undo_entry; @@ -2389,7 +2389,8 @@ static void undo_push_insert(char *p, int len, int undo) } } -static void undo_pop(void) // Undo the last operation +// Undo the last operation +static void undo_pop(void) { int repeat; char *u_start, *u_end; @@ -2453,7 +2454,8 @@ static void undo_pop(void) // Undo the last operation } #if ENABLE_FEATURE_VI_UNDO_QUEUE -static void undo_queue_commit(void) // Flush any queued objects to the undo stack +// Flush any queued objects to the undo stack +static void undo_queue_commit(void) { // Pushes the queue object onto the undo stack if (undo_q > 0) { @@ -2758,49 +2760,44 @@ static void cookmode(void) } #if ENABLE_FEATURE_VI_USE_SIGNALS -//----- Come here when we get a window resize signal --------- -static void winch_sig(int sig UNUSED_PARAM) +static void winch_handler(int sig UNUSED_PARAM) { int save_errno = errno; // FIXME: do it in main loop!!! - signal(SIGWINCH, winch_sig); + signal(SIGWINCH, winch_handler); query_screen_dimensions(); new_screen(rows, columns); // get memory for virtual screen redraw(TRUE); // re-draw the screen errno = save_errno; } - -//----- Come here when we get a continue signal ------------------- -static void cont_sig(int sig UNUSED_PARAM) +static void cont_handler(int sig UNUSED_PARAM) { int save_errno = errno; rawmode(); // terminal to "raw" last_status_cksum = 0; // force status update redraw(TRUE); // re-draw the screen - signal(SIGTSTP, suspend_sig); + signal(SIGTSTP, tstp_handler); signal(SIGCONT, SIG_DFL); //kill(my_pid, SIGCONT); // huh? why? we are already "continued"... errno = save_errno; } - -//----- Come here when we get a Suspend signal ------------------- -static void suspend_sig(int sig UNUSED_PARAM) +static void tstp_handler(int sig UNUSED_PARAM) { int save_errno = errno; go_bottom_and_clear_to_eol(); cookmode(); // terminal to "cooked" - signal(SIGCONT, cont_sig); + signal(SIGCONT, cont_handler); signal(SIGTSTP, SIG_DFL); kill(my_pid, SIGTSTP); errno = save_errno; } //----- Come here when we get a signal --------------------------- -static void catch_sig(int sig) +static void int_handler(int sig) { - signal(SIGINT, catch_sig); + signal(SIGINT, int_handler); siglongjmp(restart, sig); } #endif /* FEATURE_VI_USE_SIGNALS */ @@ -2934,7 +2931,7 @@ static int file_insert(const char *fn, char *p, int initial) return cnt; } - /* Validate file */ + // Validate file if (fstat(fd, &statbuf) < 0) { status_line_bold_errno(fn); goto fi; @@ -2960,8 +2957,8 @@ static int file_insert(const char *fn, char *p, int initial) #if ENABLE_FEATURE_VI_READONLY if (initial && ((access(fn, W_OK) < 0) || - /* root will always have access() - * so we check fileperms too */ + // root will always have access() + // so we check fileperms too !(statbuf.st_mode & (S_IWUSR | S_IWGRP | S_IWOTH)) ) ) { @@ -2979,10 +2976,9 @@ static int file_write(char *fn, char *first, char *last) status_line_bold("No current filename"); return -2; } - /* By popular request we do not open file with O_TRUNC, - * but instead ftruncate() it _after_ successful write. - * Might reduce amount of data lost on power fail etc. - */ + // By popular request we do not open file with O_TRUNC, + // but instead ftruncate() it _after_ successful write. + // Might reduce amount of data lost on power fail etc. fd = open(fn, (O_WRONLY | O_CREAT), 0666); if (fd < 0) return -1; @@ -3036,12 +3032,6 @@ static void go_bottom_and_clear_to_eol(void) clear_to_eol(); } -//----- Erase from cursor to end of screen ----------------------- -static void clear_to_eos(void) -{ - write1(ESC_CLEAR2EOS); -} - //----- Start standout mode ------------------------------------ static void standout_start(void) { @@ -3068,7 +3058,7 @@ static void indicate_error(void) { #if ENABLE_FEATURE_VI_CRASHME if (crashme > 0) - return; // generate a random command + return; #endif if (!err_method) { write1(ESC_BELL); @@ -3177,7 +3167,7 @@ static void print_literal(char *buf, const char *s) } if (c < ' ' || c == 0x7f) { *d++ = '^'; - c |= '@'; /* 0x40 */ + c |= '@'; // 0x40 if (c == 0x7f) c = '?'; } @@ -3259,17 +3249,17 @@ static int format_edit_status(void) cur, tot, percent); if (ret >= 0 && ret < trunc_at) - return ret; /* it all fit */ + return ret; // it all fit - return trunc_at; /* had to truncate */ + return trunc_at; // had to truncate #undef tot } //----- Force refresh of all Lines ----------------------------- static void redraw(int full_screen) { - place_cursor(0, 0); - clear_to_eos(); + // cursor to top,left; clear to the end of screen + write1(ESC_SET_CURSOR_TOPLEFT ESC_CLEAR2EOS); screen_erase(); // erase the internal screen buffer last_status_cksum = 0; // force status update refresh(full_screen); // this will redraw the entire display @@ -3354,7 +3344,7 @@ static void refresh(int full_screen) #else if (c != columns || r != rows) { full_screen = TRUE; - /* update screen memory since SIGWINCH won't have done it */ + // update screen memory since SIGWINCH won't have done it new_screen(rows, columns); } #endif @@ -3431,7 +3421,6 @@ static void refresh(int full_screen) //--------------------------------------------------------------------- //----- the Ascii Chart ----------------------------------------------- -// // 00 nul 01 soh 02 stx 03 etx 04 eot 05 enq 06 ack 07 bel // 08 bs 09 ht 0a nl 0b vt 0c np 0d cr 0e so 0f si // 10 dle 11 dc1 12 dc2 13 dc3 14 dc4 15 nak 16 syn 17 etb @@ -3466,7 +3455,7 @@ static void do_cmd(int c) show_status_line(); - /* if this is a cursor key, skip these checks */ + // if this is a cursor key, skip these checks switch (c) { case KEYCODE_UP: case KEYCODE_DOWN: @@ -3499,7 +3488,7 @@ static void do_cmd(int c) } } if (cmd_mode == 1) { - // hitting "Insert" twice means "R" replace mode + // hitting "Insert" twice means "R" replace mode if (c == KEYCODE_INSERT) goto dc5; // insert the char c at "dot" if (1 <= c || Isprint(c)) { @@ -3958,7 +3947,7 @@ static void do_cmd(int c) } if (cmdcnt == 0) cmdcnt = 1; - /* fall through */ + // fall through case 'G': // G- goto to a line number (default= E-O-F) dot = end - 1; // assume E-O-F if (cmdcnt > 0) { -- cgit v1.2.3-55-g6feb From c3193104049186bd28203801e8fd7d9d4ff2b547 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Mon, 1 Apr 2019 12:29:27 +0200 Subject: vi: fix ^Z not always working as intended function old new delta tstp_handler 64 71 +7 text_yank 54 56 +2 vi_main 280 272 -8 do_cmd 4705 4696 -9 colon 2861 2852 -9 cont_handler 66 - -66 ------------------------------------------------------------------------------ (add/remove: 0/1 grow/shrink: 2/3 up/down: 9/-92) Total: -83 bytes Signed-off-by: Denys Vlasenko --- editors/vi.c | 42 +++++++++++++++++------------------------- 1 file changed, 17 insertions(+), 25 deletions(-) (limited to 'editors/vi.c') diff --git a/editors/vi.c b/editors/vi.c index a11e06040..9bdee5928 100644 --- a/editors/vi.c +++ b/editors/vi.c @@ -330,9 +330,6 @@ struct globals { int lmc_len; // length of last_modifying_cmd char *ioq, *ioq_start; // pointer to string for get_one_char to "read" #endif -#if ENABLE_FEATURE_VI_USE_SIGNALS || ENABLE_FEATURE_VI_CRASHME - int my_pid; -#endif #if ENABLE_FEATURE_VI_SEARCH char *last_search_pattern; // last pattern from a '/' or '?' search #endif @@ -449,7 +446,6 @@ struct globals { #define lmc_len (G.lmc_len ) #define ioq (G.ioq ) #define ioq_start (G.ioq_start ) -#define my_pid (G.my_pid ) #define last_search_pattern (G.last_search_pattern) #define edit_file__cur_line (G.edit_file__cur_line) @@ -634,11 +630,8 @@ int vi_main(int argc, char **argv) #endif #endif -#if ENABLE_FEATURE_VI_USE_SIGNALS || ENABLE_FEATURE_VI_CRASHME - my_pid = getpid(); -#endif #if ENABLE_FEATURE_VI_CRASHME - srand((long) my_pid); + srand((long) getpid()); #endif #ifdef NO_SUCH_APPLET_YET // if we aren't "vi", we are "view" @@ -2770,31 +2763,30 @@ static void winch_handler(int sig UNUSED_PARAM) redraw(TRUE); // re-draw the screen errno = save_errno; } -static void cont_handler(int sig UNUSED_PARAM) -{ - int save_errno = errno; - rawmode(); // terminal to "raw" - last_status_cksum = 0; // force status update - redraw(TRUE); // re-draw the screen - - signal(SIGTSTP, tstp_handler); - signal(SIGCONT, SIG_DFL); - //kill(my_pid, SIGCONT); // huh? why? we are already "continued"... - errno = save_errno; -} static void tstp_handler(int sig UNUSED_PARAM) { int save_errno = errno; + + // ioctl inside cookmode() was seen to generate SIGTTOU, + // stopping us too early. Prevent that: + signal(SIGTTOU, SIG_IGN); + go_bottom_and_clear_to_eol(); cookmode(); // terminal to "cooked" - signal(SIGCONT, cont_handler); - signal(SIGTSTP, SIG_DFL); - kill(my_pid, SIGTSTP); + // stop now + //signal(SIGTSTP, SIG_DFL); + //raise(SIGTSTP); + raise(SIGSTOP); // avoid "dance" with TSTP handler - use SIGSTOP instead + //signal(SIGTSTP, tstp_handler); + + // we have been "continued" with SIGCONT, restore screen and termios + rawmode(); // terminal to "raw" + last_status_cksum = 0; // force status update + redraw(TRUE); // re-draw the screen + errno = save_errno; } - -//----- Come here when we get a signal --------------------------- static void int_handler(int sig) { signal(SIGINT, int_handler); -- cgit v1.2.3-55-g6feb From 24bd350aaa3cd593a9a8304042cea689d716aba2 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Mon, 1 Apr 2019 13:55:27 +0200 Subject: vi: rearrange functions, no logic changes Signed-off-by: Denys Vlasenko --- editors/vi.c | 564 +++++++++++++++++++++++++++++------------------------------ 1 file changed, 281 insertions(+), 283 deletions(-) (limited to 'editors/vi.c') diff --git a/editors/vi.c b/editors/vi.c index 9bdee5928..406119371 100644 --- a/editors/vi.c +++ b/editors/vi.c @@ -483,7 +483,6 @@ struct globals { } while (0) -static void edit_file(char *); // edit one file static void do_cmd(int); // execute a command static int next_tabstop(int); static void sync_cursor(char *, int *, int *); // synchronize the screen cursor to dot @@ -527,7 +526,6 @@ static uintptr_t text_hole_make(char *, int); // at "p", make a 'size' byte hole #define yank_delete(a,b,c,d,e) yank_delete(a,b,c,d) #endif static char *yank_delete(char *, char *, int, int, int); // yank text[] into register then delete -static void show_help(void); // display some help info static void rawmode(void); // set "raw" mode on tty static void cookmode(void); // return to "cooked" mode on tty // sleep for 'h' 1/100 seconds, return 1/0 if stdin is (ready for read)/(not ready) @@ -610,94 +608,42 @@ static void crash_test(); static int crashme = 0; #endif -static void write1(const char *out) -{ - fputs(out, stdout); -} - -int vi_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; -int vi_main(int argc, char **argv) +static void show_help(void) { - int c; - - INIT_G(); - -#if ENABLE_FEATURE_VI_UNDO - /* undo_stack_tail = NULL; - already is */ -#if ENABLE_FEATURE_VI_UNDO_QUEUE - undo_queue_state = UNDO_EMPTY; - /* undo_q = 0; - already is */ + puts("These features are available:" +#if ENABLE_FEATURE_VI_SEARCH + "\n\tPattern searches with / and ?" #endif +#if ENABLE_FEATURE_VI_DOT_CMD + "\n\tLast command repeat with ." #endif - -#if ENABLE_FEATURE_VI_CRASHME - srand((long) getpid()); +#if ENABLE_FEATURE_VI_YANKMARK + "\n\tLine marking with 'x" + "\n\tNamed buffers with \"x" #endif -#ifdef NO_SUCH_APPLET_YET - // if we aren't "vi", we are "view" - if (ENABLE_FEATURE_VI_READONLY && applet_name[2]) { - SET_READONLY_MODE(readonly_mode); - } +#if ENABLE_FEATURE_VI_READONLY + //not implemented: "\n\tReadonly if vi is called as \"view\"" + //redundant: usage text says this too: "\n\tReadonly with -R command line arg" #endif - - // autoindent is not default in vim 7.3 - vi_setops = /*VI_AUTOINDENT |*/ VI_SHOWMATCH | VI_IGNORECASE; - // 1- process $HOME/.exrc file (not inplemented yet) - // 2- process EXINIT variable from environment - // 3- process command line args -#if ENABLE_FEATURE_VI_COLON - { - char *p = getenv("EXINIT"); - if (p && *p) - initial_cmds[0] = xstrndup(p, MAX_INPUT_LEN); - } +#if ENABLE_FEATURE_VI_SET + "\n\tSome colon mode commands with :" #endif - while ((c = getopt(argc, argv, "hCRH" IF_FEATURE_VI_COLON("c:"))) != -1) { - switch (c) { -#if ENABLE_FEATURE_VI_CRASHME - case 'C': - crashme = 1; - break; +#if ENABLE_FEATURE_VI_SETOPTS + "\n\tSettable options with \":set\"" #endif -#if ENABLE_FEATURE_VI_READONLY - case 'R': // Read-only flag - SET_READONLY_MODE(readonly_mode); - break; +#if ENABLE_FEATURE_VI_USE_SIGNALS + "\n\tSignal catching- ^C" + "\n\tJob suspend and resume with ^Z" #endif -#if ENABLE_FEATURE_VI_COLON - case 'c': // cmd line vi command - if (*optarg) - initial_cmds[initial_cmds[0] != NULL] = xstrndup(optarg, MAX_INPUT_LEN); - break; +#if ENABLE_FEATURE_VI_WIN_RESIZE + "\n\tAdapt to window re-sizes" #endif - case 'H': - show_help(); - // fall through - default: - bb_show_usage(); - return 1; - } - } - - // The argv array can be used by the ":next" and ":rewind" commands - argv += optind; - argc -= optind; - - //----- This is the main file handling loop -------------- - save_argc = argc; - optind = 0; - // "Save cursor, use alternate screen buffer, clear screen" - write1(ESC"[?1049h"); - while (1) { - edit_file(argv[optind]); // param might be NULL - if (++optind >= argc) - break; - } - // "Use normal screen buffer, restore cursor" - write1(ESC"[?1049l"); - //----------------------------------------------------------- + ); +} - return 0; +static void write1(const char *out) +{ + fputs(out, stdout); } /* read text from file or create an empty buf */ @@ -748,153 +694,6 @@ static ALWAYS_INLINE int query_screen_dimensions(void) } #endif -static void edit_file(char *fn) -{ -#if ENABLE_FEATURE_VI_YANKMARK -#define cur_line edit_file__cur_line -#endif - int c; -#if ENABLE_FEATURE_VI_USE_SIGNALS - int sig; -#endif - - editing = 1; // 0 = exit, 1 = one file, 2 = multiple files - rawmode(); - rows = 24; - columns = 80; - IF_FEATURE_VI_ASK_TERMINAL(G.get_rowcol_error =) query_screen_dimensions(); -#if ENABLE_FEATURE_VI_ASK_TERMINAL - if (G.get_rowcol_error /* TODO? && no input on stdin */) { - uint64_t k; - write1(ESC"[999;999H" ESC"[6n"); - fflush_all(); - k = read_key(STDIN_FILENO, readbuffer, /*timeout_ms:*/ 100); - if ((int32_t)k == KEYCODE_CURSOR_POS) { - uint32_t rc = (k >> 32); - columns = (rc & 0x7fff); - if (columns > MAX_SCR_COLS) - columns = MAX_SCR_COLS; - rows = ((rc >> 16) & 0x7fff); - if (rows > MAX_SCR_ROWS) - rows = MAX_SCR_ROWS; - } - } -#endif - new_screen(rows, columns); // get memory for virtual screen - init_text_buffer(fn); - -#if ENABLE_FEATURE_VI_YANKMARK - YDreg = 26; // default Yank/Delete reg -// Ureg = 27; - const // hold orig line for "U" cmd - mark[26] = mark[27] = text; // init "previous context" -#endif - - last_forward_char = last_input_char = '\0'; - crow = 0; - ccol = 0; - -#if ENABLE_FEATURE_VI_USE_SIGNALS - signal(SIGWINCH, winch_handler); - signal(SIGTSTP, tstp_handler); - sig = sigsetjmp(restart, 1); - if (sig != 0) { - screenbegin = dot = text; - } - // int_handler() can jump to "restart", - // must install handler *after* initializing "restart" - signal(SIGINT, int_handler); -#endif - - cmd_mode = 0; // 0=command 1=insert 2='R'eplace - cmdcnt = 0; - tabstop = 8; - offset = 0; // no horizontal offset - c = '\0'; -#if ENABLE_FEATURE_VI_DOT_CMD - free(ioq_start); - ioq = ioq_start = NULL; - lmc_len = 0; - adding2q = 0; -#endif - -#if ENABLE_FEATURE_VI_COLON - { - char *p, *q; - int n = 0; - - while ((p = initial_cmds[n]) != NULL) { - do { - q = p; - p = strchr(q, '\n'); - if (p) - while (*p == '\n') - *p++ = '\0'; - if (*q) - colon(q); - } while (p); - free(initial_cmds[n]); - initial_cmds[n] = NULL; - n++; - } - } -#endif - redraw(FALSE); // dont force every col re-draw - //------This is the main Vi cmd handling loop ----------------------- - while (editing > 0) { -#if ENABLE_FEATURE_VI_CRASHME - if (crashme > 0) { - if ((end - text) > 1) { - crash_dummy(); // generate a random command - } else { - crashme = 0; - string_insert(text, "\n\n##### Ran out of text to work on. #####\n\n", NO_UNDO); // insert the string - dot = text; - refresh(FALSE); - } - } -#endif - last_input_char = c = get_one_char(); // get a cmd from user -#if ENABLE_FEATURE_VI_YANKMARK - // save a copy of the current line- for the 'U" command - if (begin_line(dot) != cur_line) { - cur_line = begin_line(dot); - text_yank(begin_line(dot), end_line(dot), Ureg); - } -#endif -#if ENABLE_FEATURE_VI_DOT_CMD - // These are commands that change text[]. - // Remember the input for the "." command - if (!adding2q && ioq_start == NULL - && cmd_mode == 0 // command mode - && c > '\0' // exclude NUL and non-ASCII chars - && c < 0x7f // (Unicode and such) - && strchr(modifying_cmds, c) - ) { - start_new_cmd_q(c); - } -#endif - do_cmd(c); // execute the user command - - // poll to see if there is input already waiting. if we are - // not able to display output fast enough to keep up, skip - // the display update until we catch up with input. - if (!readbuffer[0] && mysleep(0) == 0) { - // no input pending - so update output - refresh(FALSE); - show_status_line(); - } -#if ENABLE_FEATURE_VI_CRASHME - if (crashme > 0) - crash_test(); // test editor variables -#endif - } - //------------------------------------------------------------------- - - go_bottom_and_clear_to_eol(); - cookmode(); -#undef cur_line -} - //----- The Colon commands ------------------------------------- #if ENABLE_FEATURE_VI_COLON static char *get_one_address(char *p, int *addr) // get colon addr, if present @@ -2563,63 +2362,30 @@ static char *yank_delete(char *start, char *stop, int dist, int yf, int undo) if (start > stop) { // they are backwards, reverse them p = start; - start = stop; - stop = p; - } - if (dist <= 0) { - // we cannot cross NL boundaries - p = start; - if (*p == '\n') - return p; - // dont go past a NewLine - for (; p + 1 <= stop; p++) { - if (p[1] == '\n') { - stop = p; // "stop" just before NewLine - break; - } - } - } - p = start; -#if ENABLE_FEATURE_VI_YANKMARK - text_yank(start, stop, YDreg); -#endif - if (yf == YANKDEL) { - p = text_hole_delete(start, stop, undo); - } // delete lines - return p; -} - -static void show_help(void) -{ - puts("These features are available:" -#if ENABLE_FEATURE_VI_SEARCH - "\n\tPattern searches with / and ?" -#endif -#if ENABLE_FEATURE_VI_DOT_CMD - "\n\tLast command repeat with ." -#endif -#if ENABLE_FEATURE_VI_YANKMARK - "\n\tLine marking with 'x" - "\n\tNamed buffers with \"x" -#endif -#if ENABLE_FEATURE_VI_READONLY - //not implemented: "\n\tReadonly if vi is called as \"view\"" - //redundant: usage text says this too: "\n\tReadonly with -R command line arg" -#endif -#if ENABLE_FEATURE_VI_SET - "\n\tSome colon mode commands with :" -#endif -#if ENABLE_FEATURE_VI_SETOPTS - "\n\tSettable options with \":set\"" -#endif -#if ENABLE_FEATURE_VI_USE_SIGNALS - "\n\tSignal catching- ^C" - "\n\tJob suspend and resume with ^Z" -#endif -#if ENABLE_FEATURE_VI_WIN_RESIZE - "\n\tAdapt to window re-sizes" + start = stop; + stop = p; + } + if (dist <= 0) { + // we cannot cross NL boundaries + p = start; + if (*p == '\n') + return p; + // dont go past a NewLine + for (; p + 1 <= stop; p++) { + if (p[1] == '\n') { + stop = p; // "stop" just before NewLine + break; + } + } + } + p = start; +#if ENABLE_FEATURE_VI_YANKMARK + text_yank(start, stop, YDreg); #endif - ); + if (yf == YANKDEL) { + p = text_hole_delete(start, stop, undo); + } // delete lines + return p; } #if ENABLE_FEATURE_VI_DOT_CMD @@ -4495,3 +4261,235 @@ static void crash_test() } } #endif + +static void edit_file(char *fn) +{ +#if ENABLE_FEATURE_VI_YANKMARK +#define cur_line edit_file__cur_line +#endif + int c; +#if ENABLE_FEATURE_VI_USE_SIGNALS + int sig; +#endif + + editing = 1; // 0 = exit, 1 = one file, 2 = multiple files + rawmode(); + rows = 24; + columns = 80; + IF_FEATURE_VI_ASK_TERMINAL(G.get_rowcol_error =) query_screen_dimensions(); +#if ENABLE_FEATURE_VI_ASK_TERMINAL + if (G.get_rowcol_error /* TODO? && no input on stdin */) { + uint64_t k; + write1(ESC"[999;999H" ESC"[6n"); + fflush_all(); + k = read_key(STDIN_FILENO, readbuffer, /*timeout_ms:*/ 100); + if ((int32_t)k == KEYCODE_CURSOR_POS) { + uint32_t rc = (k >> 32); + columns = (rc & 0x7fff); + if (columns > MAX_SCR_COLS) + columns = MAX_SCR_COLS; + rows = ((rc >> 16) & 0x7fff); + if (rows > MAX_SCR_ROWS) + rows = MAX_SCR_ROWS; + } + } +#endif + new_screen(rows, columns); // get memory for virtual screen + init_text_buffer(fn); + +#if ENABLE_FEATURE_VI_YANKMARK + YDreg = 26; // default Yank/Delete reg +// Ureg = 27; - const // hold orig line for "U" cmd + mark[26] = mark[27] = text; // init "previous context" +#endif + + last_forward_char = last_input_char = '\0'; + crow = 0; + ccol = 0; + +#if ENABLE_FEATURE_VI_USE_SIGNALS + signal(SIGWINCH, winch_handler); + signal(SIGTSTP, tstp_handler); + sig = sigsetjmp(restart, 1); + if (sig != 0) { + screenbegin = dot = text; + } + // int_handler() can jump to "restart", + // must install handler *after* initializing "restart" + signal(SIGINT, int_handler); +#endif + + cmd_mode = 0; // 0=command 1=insert 2='R'eplace + cmdcnt = 0; + tabstop = 8; + offset = 0; // no horizontal offset + c = '\0'; +#if ENABLE_FEATURE_VI_DOT_CMD + free(ioq_start); + ioq = ioq_start = NULL; + lmc_len = 0; + adding2q = 0; +#endif + +#if ENABLE_FEATURE_VI_COLON + { + char *p, *q; + int n = 0; + + while ((p = initial_cmds[n]) != NULL) { + do { + q = p; + p = strchr(q, '\n'); + if (p) + while (*p == '\n') + *p++ = '\0'; + if (*q) + colon(q); + } while (p); + free(initial_cmds[n]); + initial_cmds[n] = NULL; + n++; + } + } +#endif + redraw(FALSE); // dont force every col re-draw + //------This is the main Vi cmd handling loop ----------------------- + while (editing > 0) { +#if ENABLE_FEATURE_VI_CRASHME + if (crashme > 0) { + if ((end - text) > 1) { + crash_dummy(); // generate a random command + } else { + crashme = 0; + string_insert(text, "\n\n##### Ran out of text to work on. #####\n\n", NO_UNDO); // insert the string + dot = text; + refresh(FALSE); + } + } +#endif + last_input_char = c = get_one_char(); // get a cmd from user +#if ENABLE_FEATURE_VI_YANKMARK + // save a copy of the current line- for the 'U" command + if (begin_line(dot) != cur_line) { + cur_line = begin_line(dot); + text_yank(begin_line(dot), end_line(dot), Ureg); + } +#endif +#if ENABLE_FEATURE_VI_DOT_CMD + // These are commands that change text[]. + // Remember the input for the "." command + if (!adding2q && ioq_start == NULL + && cmd_mode == 0 // command mode + && c > '\0' // exclude NUL and non-ASCII chars + && c < 0x7f // (Unicode and such) + && strchr(modifying_cmds, c) + ) { + start_new_cmd_q(c); + } +#endif + do_cmd(c); // execute the user command + + // poll to see if there is input already waiting. if we are + // not able to display output fast enough to keep up, skip + // the display update until we catch up with input. + if (!readbuffer[0] && mysleep(0) == 0) { + // no input pending - so update output + refresh(FALSE); + show_status_line(); + } +#if ENABLE_FEATURE_VI_CRASHME + if (crashme > 0) + crash_test(); // test editor variables +#endif + } + //------------------------------------------------------------------- + + go_bottom_and_clear_to_eol(); + cookmode(); +#undef cur_line +} + +int vi_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; +int vi_main(int argc, char **argv) +{ + int c; + + INIT_G(); + +#if ENABLE_FEATURE_VI_UNDO + /* undo_stack_tail = NULL; - already is */ +#if ENABLE_FEATURE_VI_UNDO_QUEUE + undo_queue_state = UNDO_EMPTY; + /* undo_q = 0; - already is */ +#endif +#endif + +#if ENABLE_FEATURE_VI_CRASHME + srand((long) getpid()); +#endif +#ifdef NO_SUCH_APPLET_YET + // if we aren't "vi", we are "view" + if (ENABLE_FEATURE_VI_READONLY && applet_name[2]) { + SET_READONLY_MODE(readonly_mode); + } +#endif + + // autoindent is not default in vim 7.3 + vi_setops = /*VI_AUTOINDENT |*/ VI_SHOWMATCH | VI_IGNORECASE; + // 1- process $HOME/.exrc file (not inplemented yet) + // 2- process EXINIT variable from environment + // 3- process command line args +#if ENABLE_FEATURE_VI_COLON + { + char *p = getenv("EXINIT"); + if (p && *p) + initial_cmds[0] = xstrndup(p, MAX_INPUT_LEN); + } +#endif + while ((c = getopt(argc, argv, "hCRH" IF_FEATURE_VI_COLON("c:"))) != -1) { + switch (c) { +#if ENABLE_FEATURE_VI_CRASHME + case 'C': + crashme = 1; + break; +#endif +#if ENABLE_FEATURE_VI_READONLY + case 'R': // Read-only flag + SET_READONLY_MODE(readonly_mode); + break; +#endif +#if ENABLE_FEATURE_VI_COLON + case 'c': // cmd line vi command + if (*optarg) + initial_cmds[initial_cmds[0] != NULL] = xstrndup(optarg, MAX_INPUT_LEN); + break; +#endif + case 'H': + show_help(); + // fall through + default: + bb_show_usage(); + return 1; + } + } + + // The argv array can be used by the ":next" and ":rewind" commands + argv += optind; + argc -= optind; + + //----- This is the main file handling loop -------------- + save_argc = argc; + optind = 0; + // "Save cursor, use alternate screen buffer, clear screen" + write1(ESC"[?1049h"); + while (1) { + edit_file(argv[optind]); // param might be NULL + if (++optind >= argc) + break; + } + // "Use normal screen buffer, restore cursor" + write1(ESC"[?1049l"); + //----------------------------------------------------------- + + return 0; +} -- cgit v1.2.3-55-g6feb From 363a2bc9b15fb0b6cf2d5840d6c7cdcfe9bd8074 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Mon, 1 Apr 2019 13:59:38 +0200 Subject: vi: rearrange functions, no logic changes Signed-off-by: Denys Vlasenko --- editors/vi.c | 149 ++++++++++++++++++++++++++++++----------------------------- 1 file changed, 75 insertions(+), 74 deletions(-) (limited to 'editors/vi.c') diff --git a/editors/vi.c b/editors/vi.c index 406119371..cfb1a71ea 100644 --- a/editors/vi.c +++ b/editors/vi.c @@ -511,7 +511,6 @@ static char *char_insert(char *, char, int); // insert the char c at 'p' // might reallocate text[]! use p += stupid_insert(p, ...), // and be careful to not use pointers into potentially freed text[]! static uintptr_t stupid_insert(char *, char); // stupidly insert the char c at 'p' -static int find_range(char **, char **, char); // return pointers for an object static int st_test(char *, int, int, char *); // helper for skip_thing() static char *skip_thing(char *, int, int, int); // skip some object static char *find_pair(char *, char); // find matching pair () [] {} @@ -1874,79 +1873,6 @@ static uintptr_t stupid_insert(char *p, char c) // stupidly insert the char c at return bias; } -static int find_range(char **start, char **stop, char c) -{ - char *save_dot, *p, *q, *t; - int cnt, multiline = 0; - - save_dot = dot; - p = q = dot; - - if (strchr("cdy><", c)) { - // these cmds operate on whole lines - p = q = begin_line(p); - for (cnt = 1; cnt < cmdcnt; cnt++) { - q = next_line(q); - } - q = end_line(q); - } else if (strchr("^%$0bBeEfth\b\177", c)) { - // These cmds operate on char positions - do_cmd(c); // execute movement cmd - q = dot; - } else if (strchr("wW", c)) { - do_cmd(c); // execute movement cmd - // if we are at the next word's first char - // step back one char - // but check the possibilities when it is true - if (dot > text && ((isspace(dot[-1]) && !isspace(dot[0])) - || (ispunct(dot[-1]) && !ispunct(dot[0])) - || (isalnum(dot[-1]) && !isalnum(dot[0])))) - dot--; // move back off of next word - if (dot > text && *dot == '\n') - dot--; // stay off NL - q = dot; - } else if (strchr("H-k{", c)) { - // these operate on multi-lines backwards - q = end_line(dot); // find NL - do_cmd(c); // execute movement cmd - dot_begin(); - p = dot; - } else if (strchr("L+j}\r\n", c)) { - // these operate on multi-lines forwards - p = begin_line(dot); - do_cmd(c); // execute movement cmd - dot_end(); // find NL - q = dot; - } else { - // nothing -- this causes any other values of c to - // represent the one-character range under the - // cursor. this is correct for ' ' and 'l', but - // perhaps no others. - // - } - if (q < p) { - t = q; - q = p; - p = t; - } - - // backward char movements don't include start position - if (q > p && strchr("^0bBh\b\177", c)) q--; - - multiline = 0; - for (t = p; t <= q; t++) { - if (*t == '\n') { - multiline = 1; - break; - } - } - - *start = p; - *stop = q; - dot = save_dot; - return multiline; -} - static int st_test(char *p, int type, int dir, char *tested) { char c, c0, ci; @@ -3177,6 +3103,81 @@ static void refresh(int full_screen) #undef old_offset } +static void do_cmd(int c); + +static int find_range(char **start, char **stop, char c) +{ + char *save_dot, *p, *q, *t; + int cnt, multiline = 0; + + save_dot = dot; + p = q = dot; + + if (strchr("cdy><", c)) { + // these cmds operate on whole lines + p = q = begin_line(p); + for (cnt = 1; cnt < cmdcnt; cnt++) { + q = next_line(q); + } + q = end_line(q); + } else if (strchr("^%$0bBeEfth\b\177", c)) { + // These cmds operate on char positions + do_cmd(c); // execute movement cmd + q = dot; + } else if (strchr("wW", c)) { + do_cmd(c); // execute movement cmd + // if we are at the next word's first char + // step back one char + // but check the possibilities when it is true + if (dot > text && ((isspace(dot[-1]) && !isspace(dot[0])) + || (ispunct(dot[-1]) && !ispunct(dot[0])) + || (isalnum(dot[-1]) && !isalnum(dot[0])))) + dot--; // move back off of next word + if (dot > text && *dot == '\n') + dot--; // stay off NL + q = dot; + } else if (strchr("H-k{", c)) { + // these operate on multi-lines backwards + q = end_line(dot); // find NL + do_cmd(c); // execute movement cmd + dot_begin(); + p = dot; + } else if (strchr("L+j}\r\n", c)) { + // these operate on multi-lines forwards + p = begin_line(dot); + do_cmd(c); // execute movement cmd + dot_end(); // find NL + q = dot; + } else { + // nothing -- this causes any other values of c to + // represent the one-character range under the + // cursor. this is correct for ' ' and 'l', but + // perhaps no others. + // + } + if (q < p) { + t = q; + q = p; + p = t; + } + + // backward char movements don't include start position + if (q > p && strchr("^0bBh\b\177", c)) q--; + + multiline = 0; + for (t = p; t <= q; t++) { + if (*t == '\n') { + multiline = 1; + break; + } + } + + *start = p; + *stop = q; + dot = save_dot; + return multiline; +} + //--------------------------------------------------------------------- //----- the Ascii Chart ----------------------------------------------- // 00 nul 01 soh 02 stx 03 etx 04 eot 05 enq 06 ack 07 bel -- cgit v1.2.3-55-g6feb From 616e4699d2d54518b6bdf5534a8b81bed9e63e77 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Mon, 1 Apr 2019 14:02:37 +0200 Subject: vi: rearrange functions, no logic changes Signed-off-by: Denys Vlasenko --- editors/vi.c | 84 ++++++++++++++++++++++++++++++------------------------------ 1 file changed, 42 insertions(+), 42 deletions(-) (limited to 'editors/vi.c') diff --git a/editors/vi.c b/editors/vi.c index cfb1a71ea..e960afc37 100644 --- a/editors/vi.c +++ b/editors/vi.c @@ -2444,48 +2444,6 @@ static void cookmode(void) tcsetattr_stdin_TCSANOW(&term_orig); } -#if ENABLE_FEATURE_VI_USE_SIGNALS -static void winch_handler(int sig UNUSED_PARAM) -{ - int save_errno = errno; - // FIXME: do it in main loop!!! - signal(SIGWINCH, winch_handler); - query_screen_dimensions(); - new_screen(rows, columns); // get memory for virtual screen - redraw(TRUE); // re-draw the screen - errno = save_errno; -} -static void tstp_handler(int sig UNUSED_PARAM) -{ - int save_errno = errno; - - // ioctl inside cookmode() was seen to generate SIGTTOU, - // stopping us too early. Prevent that: - signal(SIGTTOU, SIG_IGN); - - go_bottom_and_clear_to_eol(); - cookmode(); // terminal to "cooked" - - // stop now - //signal(SIGTSTP, SIG_DFL); - //raise(SIGTSTP); - raise(SIGSTOP); // avoid "dance" with TSTP handler - use SIGSTOP instead - //signal(SIGTSTP, tstp_handler); - - // we have been "continued" with SIGCONT, restore screen and termios - rawmode(); // terminal to "raw" - last_status_cksum = 0; // force status update - redraw(TRUE); // re-draw the screen - - errno = save_errno; -} -static void int_handler(int sig) -{ - signal(SIGINT, int_handler); - siglongjmp(restart, sig); -} -#endif /* FEATURE_VI_USE_SIGNALS */ - static int mysleep(int hund) // sleep for 'hund' 1/100 seconds or stdin ready { struct pollfd pfd[1]; @@ -3103,6 +3061,48 @@ static void refresh(int full_screen) #undef old_offset } +#if ENABLE_FEATURE_VI_USE_SIGNALS +static void winch_handler(int sig UNUSED_PARAM) +{ + int save_errno = errno; + // FIXME: do it in main loop!!! + signal(SIGWINCH, winch_handler); + query_screen_dimensions(); + new_screen(rows, columns); // get memory for virtual screen + redraw(TRUE); // re-draw the screen + errno = save_errno; +} +static void tstp_handler(int sig UNUSED_PARAM) +{ + int save_errno = errno; + + // ioctl inside cookmode() was seen to generate SIGTTOU, + // stopping us too early. Prevent that: + signal(SIGTTOU, SIG_IGN); + + go_bottom_and_clear_to_eol(); + cookmode(); // terminal to "cooked" + + // stop now + //signal(SIGTSTP, SIG_DFL); + //raise(SIGTSTP); + raise(SIGSTOP); // avoid "dance" with TSTP handler - use SIGSTOP instead + //signal(SIGTSTP, tstp_handler); + + // we have been "continued" with SIGCONT, restore screen and termios + rawmode(); // terminal to "raw" + last_status_cksum = 0; // force status update + redraw(TRUE); // re-draw the screen + + errno = save_errno; +} +static void int_handler(int sig) +{ + signal(SIGINT, int_handler); + siglongjmp(restart, sig); +} +#endif /* FEATURE_VI_USE_SIGNALS */ + static void do_cmd(int c); static int find_range(char **start, char **stop, char c) -- cgit v1.2.3-55-g6feb From de69775838eed0acd02f40de5e988d80611557ab Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Mon, 1 Apr 2019 14:08:00 +0200 Subject: vi: rearrange functions, no logic changes Signed-off-by: Denys Vlasenko --- editors/vi.c | 1574 +++++++++++++++++++++++++++++----------------------------- 1 file changed, 787 insertions(+), 787 deletions(-) (limited to 'editors/vi.c') diff --git a/editors/vi.c b/editors/vi.c index e960afc37..9db763ccd 100644 --- a/editors/vi.c +++ b/editors/vi.c @@ -693,424 +693,700 @@ static ALWAYS_INLINE int query_screen_dimensions(void) } #endif -//----- The Colon commands ------------------------------------- -#if ENABLE_FEATURE_VI_COLON -static char *get_one_address(char *p, int *addr) // get colon addr, if present +// sleep for 'h' 1/100 seconds, return 1/0 if stdin is (ready for read)/(not ready) +static int mysleep(int hund) { - int st; - char *q; - IF_FEATURE_VI_YANKMARK(char c;) - IF_FEATURE_VI_SEARCH(char *pat;) + struct pollfd pfd[1]; - *addr = -1; // assume no addr - if (*p == '.') { // the current line - p++; - q = begin_line(dot); - *addr = count_lines(text, q); - } -#if ENABLE_FEATURE_VI_YANKMARK - else if (*p == '\'') { // is this a mark addr - p++; - c = tolower(*p); - p++; - if (c >= 'a' && c <= 'z') { - // we have a mark - c = c - 'a'; - q = mark[(unsigned char) c]; - if (q != NULL) { // is mark valid - *addr = count_lines(text, q); - } - } - } -#endif -#if ENABLE_FEATURE_VI_SEARCH - else if (*p == '/') { // a search pattern - q = strchrnul(++p, '/'); - pat = xstrndup(p, q - p); // save copy of pattern - p = q; - if (*p == '/') - p++; - q = char_search(dot, pat, (FORWARD << 1) | FULL); - if (q != NULL) { - *addr = count_lines(text, q); - } - free(pat); - } -#endif - else if (*p == '$') { // the last line in file - p++; - q = begin_line(end - 1); - *addr = count_lines(text, q); - } else if (isdigit(*p)) { // specific line number - sscanf(p, "%d%n", addr, &st); - p += st; - } else { - // unrecognized address - assume -1 - *addr = -1; + if (hund != 0) + fflush_all(); + + pfd[0].fd = STDIN_FILENO; + pfd[0].events = POLLIN; + return safe_poll(pfd, 1, hund*10) > 0; +} + +//----- Set terminal attributes -------------------------------- +static void rawmode(void) +{ + // no TERMIOS_CLEAR_ISIG: leave ISIG on - allow signals + set_termios_to_raw(STDIN_FILENO, &term_orig, TERMIOS_RAW_CRNL); + erase_char = term_orig.c_cc[VERASE]; +} + +static void cookmode(void) +{ + fflush_all(); + tcsetattr_stdin_TCSANOW(&term_orig); +} + +//----- Terminal Drawing --------------------------------------- +// The terminal is made up of 'rows' line of 'columns' columns. +// classically this would be 24 x 80. +// screen coordinates +// 0,0 ... 0,79 +// 1,0 ... 1,79 +// . ... . +// . ... . +// 22,0 ... 22,79 +// 23,0 ... 23,79 <- status line + +//----- Move the cursor to row x col (count from 0, not 1) ------- +static void place_cursor(int row, int col) +{ + char cm1[sizeof(ESC_SET_CURSOR_POS) + sizeof(int)*3 * 2]; + + if (row < 0) row = 0; + if (row >= rows) row = rows - 1; + if (col < 0) col = 0; + if (col >= columns) col = columns - 1; + + sprintf(cm1, ESC_SET_CURSOR_POS, row + 1, col + 1); + write1(cm1); +} + +//----- Erase from cursor to end of line ----------------------- +static void clear_to_eol(void) +{ + write1(ESC_CLEAR2EOL); +} + +static void go_bottom_and_clear_to_eol(void) +{ + place_cursor(rows - 1, 0); + clear_to_eol(); +} + +//----- Start standout mode ------------------------------------ +static void standout_start(void) +{ + write1(ESC_BOLD_TEXT); +} + +//----- End standout mode -------------------------------------- +static void standout_end(void) +{ + write1(ESC_NORM_TEXT); +} + +//----- Text Movement Routines --------------------------------- +static char *begin_line(char *p) // return pointer to first char cur line +{ + if (p > text) { + p = memrchr(text, '\n', p - text); + if (!p) + return text; + return p + 1; } return p; } -static char *get_address(char *p, int *b, int *e) // get two colon addrs, if present +static char *end_line(char *p) // return pointer to NL of cur line { - //----- get the address' i.e., 1,3 'a,'b ----- - // get FIRST addr, if present - while (isblank(*p)) - p++; // skip over leading spaces - if (*p == '%') { // alias for 1,$ - p++; - *b = 1; - *e = count_lines(text, end-1); - goto ga0; - } - p = get_one_address(p, b); - while (isblank(*p)) - p++; - if (*p == ',') { // is there a address separator - p++; - while (isblank(*p)) - p++; - // get SECOND addr, if present - p = get_one_address(p, e); + if (p < end - 1) { + p = memchr(p, '\n', end - p - 1); + if (!p) + return end - 1; } - ga0: - while (isblank(*p)) - p++; // skip over trailing spaces return p; } -#if ENABLE_FEATURE_VI_SET && ENABLE_FEATURE_VI_SETOPTS -static void setops(const char *args, const char *opname, int flg_no, - const char *short_opname, int opt) +static char *dollar_line(char *p) // return pointer to just before NL line { - const char *a = args + flg_no; - int l = strlen(opname) - 1; // opname have + ' ' + p = end_line(p); + // Try to stay off of the Newline + if (*p == '\n' && (p - begin_line(p)) > 0) + p--; + return p; +} - // maybe strncmp? we had tons of erroneous strncasecmp's... - if (strncasecmp(a, opname, l) == 0 - || strncasecmp(a, short_opname, 2) == 0 - ) { - if (flg_no) - vi_setops &= ~opt; - else - vi_setops |= opt; - } +static char *prev_line(char *p) // return pointer first char prev line +{ + p = begin_line(p); // goto beginning of cur line + if (p > text && p[-1] == '\n') + p--; // step to prev line + p = begin_line(p); // goto beginning of prev line + return p; } -#endif -#endif /* FEATURE_VI_COLON */ +static char *next_line(char *p) // return pointer first char next line +{ + p = end_line(p); + if (p < end - 1 && *p == '\n') + p++; // step to next line + return p; +} -// buf must be no longer than MAX_INPUT_LEN! -static void colon(char *buf) +//----- Text Information Routines ------------------------------ +static char *end_screen(void) { -#if !ENABLE_FEATURE_VI_COLON - // Simple ":cmd" handler with minimal set of commands - char *p = buf; + char *q; int cnt; - if (*p == ':') - p++; - cnt = strlen(p); - if (cnt == 0) - return; - if (strncmp(p, "quit", cnt) == 0 - || strncmp(p, "q!", cnt) == 0 - ) { - if (modified_count && p[1] != '!') { - status_line_bold("No write since last change (:%s! overrides)", p); - } else { - editing = 0; - } - return; + // find new bottom line + q = screenbegin; + for (cnt = 0; cnt < rows - 2; cnt++) + q = next_line(q); + q = end_line(q); + return q; +} + +// count line from start to stop +static int count_lines(char *start, char *stop) +{ + char *q; + int cnt; + + if (stop < start) { // start and stop are backwards- reverse them + q = start; + start = stop; + stop = q; } - if (strncmp(p, "write", cnt) == 0 - || strncmp(p, "wq", cnt) == 0 - || strncmp(p, "wn", cnt) == 0 - || (p[0] == 'x' && !p[1]) - ) { - if (modified_count != 0 || p[0] != 'x') { - cnt = file_write(current_filename, text, end - 1); - } - if (cnt < 0) { - if (cnt == -1) - status_line_bold("Write error: "STRERROR_FMT STRERROR_ERRNO); - } else { - modified_count = 0; - last_modified_count = -1; - status_line("'%s' %dL, %dC", - current_filename, - count_lines(text, end - 1), cnt - ); - if (p[0] == 'x' - || p[1] == 'q' || p[1] == 'n' - || p[1] == 'Q' || p[1] == 'N' - ) { - editing = 0; - } - } - return; - } - if (strncmp(p, "file", cnt) == 0) { - last_status_cksum = 0; // force status update - return; - } - if (sscanf(p, "%d", &cnt) > 0) { - dot = find_line(cnt); - dot_skip_over_ws(); - return; + cnt = 0; + stop = end_line(stop); + while (start <= stop && start <= end - 1) { + start = end_line(start); + if (*start == '\n') + cnt++; + start++; } - not_implemented(p); -#else + return cnt; +} - char c, *buf1, *q, *r; - char *fn, cmd[MAX_INPUT_LEN], args[MAX_INPUT_LEN]; - int i, l, li, b, e; - int useforce; -# if ENABLE_FEATURE_VI_SEARCH || ENABLE_FEATURE_ALLOW_EXEC - char *orig_buf; -# endif +static char *find_line(int li) // find beginning of line #li +{ + char *q; - // :3154 // if (-e line 3154) goto it else stay put - // :4,33w! foo // write a portion of buffer to file "foo" - // :w // write all of buffer to current file - // :q // quit - // :q! // quit- dont care about modified file - // :'a,'z!sort -u // filter block through sort - // :'f // goto mark "f" - // :'fl // list literal the mark "f" line - // :.r bar // read file "bar" into buffer before dot - // :/123/,/abc/d // delete lines from "123" line to "abc" line - // :/xyz/ // goto the "xyz" line - // :s/find/replace/ // substitute pattern "find" with "replace" - // :! // run then return - // + for (q = text; li > 1; li--) { + q = next_line(q); + } + return q; +} - if (!buf[0]) - goto ret; - if (*buf == ':') - buf++; // move past the ':' +static int next_tabstop(int col) +{ + return col + ((tabstop - 1) - (col % tabstop)); +} - li = i = 0; - b = e = -1; - q = text; // assume 1,$ for the range - r = end - 1; - li = count_lines(text, end - 1); - fn = current_filename; +//----- Erase the Screen[] memory ------------------------------ +static void screen_erase(void) +{ + memset(screen, ' ', screensize); // clear new screen +} - // look for optional address(es) :. :1 :1,9 :'q,'a :% - buf = get_address(buf, &b, &e); +//----- Synchronize the cursor to Dot -------------------------- +static NOINLINE void sync_cursor(char *d, int *row, int *col) +{ + char *beg_cur; // begin and end of "d" line + char *tp; + int cnt, ro, co; -# if ENABLE_FEATURE_VI_SEARCH || ENABLE_FEATURE_ALLOW_EXEC - // remember orig command line - orig_buf = buf; -# endif + beg_cur = begin_line(d); // first char of cur line - // get the COMMAND into cmd[] - buf1 = cmd; - while (*buf != '\0') { - if (isspace(*buf)) - break; - *buf1++ = *buf++; + if (beg_cur < screenbegin) { + // "d" is before top line on screen + // how many lines do we have to move + cnt = count_lines(beg_cur, screenbegin); + sc1: + screenbegin = beg_cur; + if (cnt > (rows - 1) / 2) { + // we moved too many lines. put "dot" in middle of screen + for (cnt = 0; cnt < (rows - 1) / 2; cnt++) { + screenbegin = prev_line(screenbegin); + } + } + } else { + char *end_scr; // begin and end of screen + end_scr = end_screen(); // last char of screen + if (beg_cur > end_scr) { + // "d" is after bottom line on screen + // how many lines do we have to move + cnt = count_lines(end_scr, beg_cur); + if (cnt > (rows - 1) / 2) + goto sc1; // too many lines + for (ro = 0; ro < cnt - 1; ro++) { + // move screen begin the same amount + screenbegin = next_line(screenbegin); + // now, move the end of screen + end_scr = next_line(end_scr); + end_scr = end_line(end_scr); + } + } } - *buf1 = '\0'; - // get any ARGuments - while (isblank(*buf)) - buf++; - strcpy(args, buf); - useforce = FALSE; - buf1 = last_char_is(cmd, '!'); - if (buf1) { - useforce = TRUE; - *buf1 = '\0'; // get rid of ! + // "d" is on screen- find out which row + tp = screenbegin; + for (ro = 0; ro < rows - 1; ro++) { // drive "ro" to correct row + if (tp == beg_cur) + break; + tp = next_line(tp); } - if (b >= 0) { - // if there is only one addr, then the addr - // is the line number of the single line the - // user wants. So, reset the end - // pointer to point at end of the "b" line - q = find_line(b); // what line is #b - r = end_line(q); - li = 1; + + // find out what col "d" is on + co = 0; + while (tp < d) { // drive "co" to correct column + if (*tp == '\n') //vda || *tp == '\0') + break; + if (*tp == '\t') { + // handle tabs like real vi + if (d == tp && cmd_mode) { + break; + } + co = next_tabstop(co); + } else if ((unsigned char)*tp < ' ' || *tp == 0x7f) { + co++; // display as ^X, use 2 columns + } + co++; + tp++; } - if (e >= 0) { - // we were given two addrs. change the - // end pointer to the addr given by user. - r = find_line(e); // what line is #e - r = end_line(r); - li = e - b + 1; + + // "co" is the column where "dot" is. + // The screen has "columns" columns. + // The currently displayed columns are 0+offset -- columns+ofset + // |-------------------------------------------------------------| + // ^ ^ ^ + // offset | |------- columns ----------------| + // + // If "co" is already in this range then we do not have to adjust offset + // but, we do have to subtract the "offset" bias from "co". + // If "co" is outside this range then we have to change "offset". + // If the first char of a line is a tab the cursor will try to stay + // in column 7, but we have to set offset to 0. + + if (co < 0 + offset) { + offset = co; } - // ------------ now look for the command ------------ - i = strlen(cmd); - if (i == 0) { // :123CR goto line #123 - if (b >= 0) { - dot = find_line(b); // what line is #b - dot_skip_over_ws(); - } + if (co >= columns + offset) { + offset = co - columns + 1; } -# if ENABLE_FEATURE_ALLOW_EXEC - else if (cmd[0] == '!') { // run a cmd - int retcode; - // :!ls run the - go_bottom_and_clear_to_eol(); - cookmode(); - retcode = system(orig_buf + 1); // run the cmd - if (retcode) - printf("\nshell returned %i\n\n", retcode); - rawmode(); - Hit_Return(); // let user see results + // if the first char of the line is a tab, and "dot" is sitting on it + // force offset to 0. + if (d == beg_cur && *d == '\t') { + offset = 0; } -# endif - else if (cmd[0] == '=' && !cmd[1]) { // where is the address - if (b < 0) { // no addr given- use defaults - b = e = count_lines(text, dot); - } - status_line("%d", b); - } else if (strncmp(cmd, "delete", i) == 0) { // delete lines - if (b < 0) { // no addr given- use defaults - q = begin_line(dot); // assume .,. for the range - r = end_line(dot); - } - dot = yank_delete(q, r, 1, YANKDEL, ALLOW_UNDO); // save, then delete lines - dot_skip_over_ws(); - } else if (strncmp(cmd, "edit", i) == 0) { // Edit a file - int size; + co -= offset; - // don't edit, if the current file has been modified - if (modified_count && !useforce) { - status_line_bold("No write since last change (:%s! overrides)", cmd); - goto ret; - } - if (args[0]) { - // the user supplied a file name - fn = args; - } else if (current_filename && current_filename[0]) { - // no user supplied name- use the current filename - // fn = current_filename; was set by default - } else { - // no user file name, no current name- punt - status_line_bold("No current filename"); - goto ret; - } + *row = ro; + *col = co; +} - size = init_text_buffer(fn); +//----- The Colon commands ------------------------------------- +#if ENABLE_FEATURE_VI_COLON +static char *get_one_address(char *p, int *addr) // get colon addr, if present +{ + int st; + char *q; + IF_FEATURE_VI_YANKMARK(char c;) + IF_FEATURE_VI_SEARCH(char *pat;) -# if ENABLE_FEATURE_VI_YANKMARK - if (Ureg >= 0 && Ureg < 28) { - free(reg[Ureg]); // free orig line reg- for 'U' - reg[Ureg] = NULL; - } - if (YDreg >= 0 && YDreg < 28) { - free(reg[YDreg]); // free default yank/delete register - reg[YDreg] = NULL; - } -# endif - // how many lines in text[]? - li = count_lines(text, end - 1); - status_line("'%s'%s" - IF_FEATURE_VI_READONLY("%s") - " %dL, %dC", - current_filename, - (size < 0 ? " [New file]" : ""), - IF_FEATURE_VI_READONLY( - ((readonly_mode) ? " [Readonly]" : ""), - ) - li, (int)(end - text) - ); - } else if (strncmp(cmd, "file", i) == 0) { // what File is this - if (b != -1 || e != -1) { - status_line_bold("No address allowed on this command"); - goto ret; - } - if (args[0]) { - // user wants a new filename - free(current_filename); - current_filename = xstrdup(args); - } else { - // user wants file status info - last_status_cksum = 0; // force status update + *addr = -1; // assume no addr + if (*p == '.') { // the current line + p++; + q = begin_line(dot); + *addr = count_lines(text, q); + } +#if ENABLE_FEATURE_VI_YANKMARK + else if (*p == '\'') { // is this a mark addr + p++; + c = tolower(*p); + p++; + if (c >= 'a' && c <= 'z') { + // we have a mark + c = c - 'a'; + q = mark[(unsigned char) c]; + if (q != NULL) { // is mark valid + *addr = count_lines(text, q); + } } - } else if (strncmp(cmd, "features", i) == 0) { // what features are available - // print out values of all features - go_bottom_and_clear_to_eol(); - cookmode(); - show_help(); - rawmode(); - Hit_Return(); - } else if (strncmp(cmd, "list", i) == 0) { // literal print line - if (b < 0) { // no addr given- use defaults - q = begin_line(dot); // assume .,. for the range - r = end_line(dot); + } +#endif +#if ENABLE_FEATURE_VI_SEARCH + else if (*p == '/') { // a search pattern + q = strchrnul(++p, '/'); + pat = xstrndup(p, q - p); // save copy of pattern + p = q; + if (*p == '/') + p++; + q = char_search(dot, pat, (FORWARD << 1) | FULL); + if (q != NULL) { + *addr = count_lines(text, q); } - go_bottom_and_clear_to_eol(); - puts("\r"); - for (; q <= r; q++) { - int c_is_no_print; + free(pat); + } +#endif + else if (*p == '$') { // the last line in file + p++; + q = begin_line(end - 1); + *addr = count_lines(text, q); + } else if (isdigit(*p)) { // specific line number + sscanf(p, "%d%n", addr, &st); + p += st; + } else { + // unrecognized address - assume -1 + *addr = -1; + } + return p; +} - c = *q; - c_is_no_print = (c & 0x80) && !Isprint(c); - if (c_is_no_print) { - c = '.'; - standout_start(); - } - if (c == '\n') { - write1("$\r"); - } else if (c < ' ' || c == 127) { - bb_putchar('^'); - if (c == 127) - c = '?'; - else - c += '@'; - } - bb_putchar(c); - if (c_is_no_print) - standout_end(); - } - Hit_Return(); - } else if (strncmp(cmd, "quit", i) == 0 // quit - || strncmp(cmd, "next", i) == 0 // edit next file - || strncmp(cmd, "prev", i) == 0 // edit previous file +static char *get_address(char *p, int *b, int *e) // get two colon addrs, if present +{ + //----- get the address' i.e., 1,3 'a,'b ----- + // get FIRST addr, if present + while (isblank(*p)) + p++; // skip over leading spaces + if (*p == '%') { // alias for 1,$ + p++; + *b = 1; + *e = count_lines(text, end-1); + goto ga0; + } + p = get_one_address(p, b); + while (isblank(*p)) + p++; + if (*p == ',') { // is there a address separator + p++; + while (isblank(*p)) + p++; + // get SECOND addr, if present + p = get_one_address(p, e); + } + ga0: + while (isblank(*p)) + p++; // skip over trailing spaces + return p; +} + +#if ENABLE_FEATURE_VI_SET && ENABLE_FEATURE_VI_SETOPTS +static void setops(const char *args, const char *opname, int flg_no, + const char *short_opname, int opt) +{ + const char *a = args + flg_no; + int l = strlen(opname) - 1; // opname have + ' ' + + // maybe strncmp? we had tons of erroneous strncasecmp's... + if (strncasecmp(a, opname, l) == 0 + || strncasecmp(a, short_opname, 2) == 0 ) { - int n; - if (useforce) { - if (*cmd == 'q') { - // force end of argv list - optind = save_argc; - } + if (flg_no) + vi_setops &= ~opt; + else + vi_setops |= opt; + } +} +#endif + +#endif /* FEATURE_VI_COLON */ + +// buf must be no longer than MAX_INPUT_LEN! +static void colon(char *buf) +{ +#if !ENABLE_FEATURE_VI_COLON + // Simple ":cmd" handler with minimal set of commands + char *p = buf; + int cnt; + + if (*p == ':') + p++; + cnt = strlen(p); + if (cnt == 0) + return; + if (strncmp(p, "quit", cnt) == 0 + || strncmp(p, "q!", cnt) == 0 + ) { + if (modified_count && p[1] != '!') { + status_line_bold("No write since last change (:%s! overrides)", p); + } else { editing = 0; - goto ret; - } - // don't exit if the file been modified - if (modified_count) { - status_line_bold("No write since last change (:%s! overrides)", cmd); - goto ret; - } - // are there other file to edit - n = save_argc - optind - 1; - if (*cmd == 'q' && n > 0) { - status_line_bold("%d more file(s) to edit", n); - goto ret; } - if (*cmd == 'n' && n <= 0) { - status_line_bold("No more files to edit"); - goto ret; + return; + } + if (strncmp(p, "write", cnt) == 0 + || strncmp(p, "wq", cnt) == 0 + || strncmp(p, "wn", cnt) == 0 + || (p[0] == 'x' && !p[1]) + ) { + if (modified_count != 0 || p[0] != 'x') { + cnt = file_write(current_filename, text, end - 1); } - if (*cmd == 'p') { - // are there previous files to edit - if (optind < 1) { - status_line_bold("No previous files to edit"); - goto ret; + if (cnt < 0) { + if (cnt == -1) + status_line_bold("Write error: "STRERROR_FMT STRERROR_ERRNO); + } else { + modified_count = 0; + last_modified_count = -1; + status_line("'%s' %dL, %dC", + current_filename, + count_lines(text, end - 1), cnt + ); + if (p[0] == 'x' + || p[1] == 'q' || p[1] == 'n' + || p[1] == 'Q' || p[1] == 'N' + ) { + editing = 0; } - optind -= 2; } - editing = 0; - } else if (strncmp(cmd, "read", i) == 0) { // read file into text[] - int size; + return; + } + if (strncmp(p, "file", cnt) == 0) { + last_status_cksum = 0; // force status update + return; + } + if (sscanf(p, "%d", &cnt) > 0) { + dot = find_line(cnt); + dot_skip_over_ws(); + return; + } + not_implemented(p); +#else - fn = args; - if (!fn[0]) { - status_line_bold("No filename given"); - goto ret; - } + char c, *buf1, *q, *r; + char *fn, cmd[MAX_INPUT_LEN], args[MAX_INPUT_LEN]; + int i, l, li, b, e; + int useforce; +# if ENABLE_FEATURE_VI_SEARCH || ENABLE_FEATURE_ALLOW_EXEC + char *orig_buf; +# endif + + // :3154 // if (-e line 3154) goto it else stay put + // :4,33w! foo // write a portion of buffer to file "foo" + // :w // write all of buffer to current file + // :q // quit + // :q! // quit- dont care about modified file + // :'a,'z!sort -u // filter block through sort + // :'f // goto mark "f" + // :'fl // list literal the mark "f" line + // :.r bar // read file "bar" into buffer before dot + // :/123/,/abc/d // delete lines from "123" line to "abc" line + // :/xyz/ // goto the "xyz" line + // :s/find/replace/ // substitute pattern "find" with "replace" + // :! // run then return + // + + if (!buf[0]) + goto ret; + if (*buf == ':') + buf++; // move past the ':' + + li = i = 0; + b = e = -1; + q = text; // assume 1,$ for the range + r = end - 1; + li = count_lines(text, end - 1); + fn = current_filename; + + // look for optional address(es) :. :1 :1,9 :'q,'a :% + buf = get_address(buf, &b, &e); + +# if ENABLE_FEATURE_VI_SEARCH || ENABLE_FEATURE_ALLOW_EXEC + // remember orig command line + orig_buf = buf; +# endif + + // get the COMMAND into cmd[] + buf1 = cmd; + while (*buf != '\0') { + if (isspace(*buf)) + break; + *buf1++ = *buf++; + } + *buf1 = '\0'; + // get any ARGuments + while (isblank(*buf)) + buf++; + strcpy(args, buf); + useforce = FALSE; + buf1 = last_char_is(cmd, '!'); + if (buf1) { + useforce = TRUE; + *buf1 = '\0'; // get rid of ! + } + if (b >= 0) { + // if there is only one addr, then the addr + // is the line number of the single line the + // user wants. So, reset the end + // pointer to point at end of the "b" line + q = find_line(b); // what line is #b + r = end_line(q); + li = 1; + } + if (e >= 0) { + // we were given two addrs. change the + // end pointer to the addr given by user. + r = find_line(e); // what line is #e + r = end_line(r); + li = e - b + 1; + } + // ------------ now look for the command ------------ + i = strlen(cmd); + if (i == 0) { // :123CR goto line #123 + if (b >= 0) { + dot = find_line(b); // what line is #b + dot_skip_over_ws(); + } + } +# if ENABLE_FEATURE_ALLOW_EXEC + else if (cmd[0] == '!') { // run a cmd + int retcode; + // :!ls run the + go_bottom_and_clear_to_eol(); + cookmode(); + retcode = system(orig_buf + 1); // run the cmd + if (retcode) + printf("\nshell returned %i\n\n", retcode); + rawmode(); + Hit_Return(); // let user see results + } +# endif + else if (cmd[0] == '=' && !cmd[1]) { // where is the address + if (b < 0) { // no addr given- use defaults + b = e = count_lines(text, dot); + } + status_line("%d", b); + } else if (strncmp(cmd, "delete", i) == 0) { // delete lines + if (b < 0) { // no addr given- use defaults + q = begin_line(dot); // assume .,. for the range + r = end_line(dot); + } + dot = yank_delete(q, r, 1, YANKDEL, ALLOW_UNDO); // save, then delete lines + dot_skip_over_ws(); + } else if (strncmp(cmd, "edit", i) == 0) { // Edit a file + int size; + + // don't edit, if the current file has been modified + if (modified_count && !useforce) { + status_line_bold("No write since last change (:%s! overrides)", cmd); + goto ret; + } + if (args[0]) { + // the user supplied a file name + fn = args; + } else if (current_filename && current_filename[0]) { + // no user supplied name- use the current filename + // fn = current_filename; was set by default + } else { + // no user file name, no current name- punt + status_line_bold("No current filename"); + goto ret; + } + + size = init_text_buffer(fn); + +# if ENABLE_FEATURE_VI_YANKMARK + if (Ureg >= 0 && Ureg < 28) { + free(reg[Ureg]); // free orig line reg- for 'U' + reg[Ureg] = NULL; + } + if (YDreg >= 0 && YDreg < 28) { + free(reg[YDreg]); // free default yank/delete register + reg[YDreg] = NULL; + } +# endif + // how many lines in text[]? + li = count_lines(text, end - 1); + status_line("'%s'%s" + IF_FEATURE_VI_READONLY("%s") + " %dL, %dC", + current_filename, + (size < 0 ? " [New file]" : ""), + IF_FEATURE_VI_READONLY( + ((readonly_mode) ? " [Readonly]" : ""), + ) + li, (int)(end - text) + ); + } else if (strncmp(cmd, "file", i) == 0) { // what File is this + if (b != -1 || e != -1) { + status_line_bold("No address allowed on this command"); + goto ret; + } + if (args[0]) { + // user wants a new filename + free(current_filename); + current_filename = xstrdup(args); + } else { + // user wants file status info + last_status_cksum = 0; // force status update + } + } else if (strncmp(cmd, "features", i) == 0) { // what features are available + // print out values of all features + go_bottom_and_clear_to_eol(); + cookmode(); + show_help(); + rawmode(); + Hit_Return(); + } else if (strncmp(cmd, "list", i) == 0) { // literal print line + if (b < 0) { // no addr given- use defaults + q = begin_line(dot); // assume .,. for the range + r = end_line(dot); + } + go_bottom_and_clear_to_eol(); + puts("\r"); + for (; q <= r; q++) { + int c_is_no_print; + + c = *q; + c_is_no_print = (c & 0x80) && !Isprint(c); + if (c_is_no_print) { + c = '.'; + standout_start(); + } + if (c == '\n') { + write1("$\r"); + } else if (c < ' ' || c == 127) { + bb_putchar('^'); + if (c == 127) + c = '?'; + else + c += '@'; + } + bb_putchar(c); + if (c_is_no_print) + standout_end(); + } + Hit_Return(); + } else if (strncmp(cmd, "quit", i) == 0 // quit + || strncmp(cmd, "next", i) == 0 // edit next file + || strncmp(cmd, "prev", i) == 0 // edit previous file + ) { + int n; + if (useforce) { + if (*cmd == 'q') { + // force end of argv list + optind = save_argc; + } + editing = 0; + goto ret; + } + // don't exit if the file been modified + if (modified_count) { + status_line_bold("No write since last change (:%s! overrides)", cmd); + goto ret; + } + // are there other file to edit + n = save_argc - optind - 1; + if (*cmd == 'q' && n > 0) { + status_line_bold("%d more file(s) to edit", n); + goto ret; + } + if (*cmd == 'n' && n <= 0) { + status_line_bold("No more files to edit"); + goto ret; + } + if (*cmd == 'p') { + // are there previous files to edit + if (optind < 1) { + status_line_bold("No previous files to edit"); + goto ret; + } + optind -= 2; + } + editing = 0; + } else if (strncmp(cmd, "read", i) == 0) { // read file into text[] + int size; + + fn = args; + if (!fn[0]) { + status_line_bold("No filename given"); + goto ret; + } if (b < 0) { // no addr given- use defaults q = begin_line(dot); // assume "dot" } @@ -1205,348 +1481,154 @@ static void colon(char *buf) int dont_chain_first_item = ALLOW_UNDO; # endif - // F points to the "find" pattern - // R points to the "replace" pattern - // replace the cmd line delimiters "/" with NULs - c = orig_buf[1]; // what is the delimiter - F = orig_buf + 2; // start of "find" - R = strchr(F, c); // middle delimiter - if (!R) - goto colon_s_fail; - len_F = R - F; - *R++ = '\0'; // terminate "find" - flags = strchr(R, c); - if (!flags) - goto colon_s_fail; - len_R = flags - R; - *flags++ = '\0'; // terminate "replace" - gflag = *flags; - - q = begin_line(q); - if (b < 0) { // maybe :s/foo/bar/ - q = begin_line(dot); // start with cur line - b = count_lines(text, q); // cur line number - } - if (e < 0) - e = b; // maybe :.s/foo/bar/ - - for (i = b; i <= e; i++) { // so, :20,23 s \0 find \0 replace \0 - char *ls = q; // orig line start - char *found; - vc4: - found = char_search(q, F, (FORWARD << 1) | LIMITED); // search cur line only for "find" - if (found) { - uintptr_t bias; - // we found the "find" pattern - delete it - // For undo support, the first item should not be chained - text_hole_delete(found, found + len_F - 1, dont_chain_first_item); -# if ENABLE_FEATURE_VI_UNDO - dont_chain_first_item = ALLOW_UNDO_CHAIN; -# endif - // insert the "replace" patern - bias = string_insert(found, R, ALLOW_UNDO_CHAIN); - found += bias; - ls += bias; - /*q += bias; - recalculated anyway */ - // check for "global" :s/foo/bar/g - if (gflag == 'g') { - if ((found + len_R) < end_line(ls)) { - q = found + len_R; - goto vc4; // don't let q move past cur line - } - } - } - q = next_line(ls); - } -# endif /* FEATURE_VI_SEARCH */ - } else if (strncmp(cmd, "version", i) == 0) { // show software version - status_line(BB_VER); - } else if (strncmp(cmd, "write", i) == 0 // write text to file - || strncmp(cmd, "wq", i) == 0 - || strncmp(cmd, "wn", i) == 0 - || (cmd[0] == 'x' && !cmd[1]) - ) { - int size; - //int forced = FALSE; - - // is there a file name to write to? - if (args[0]) { - fn = args; - } -# if ENABLE_FEATURE_VI_READONLY - if (readonly_mode && !useforce) { - status_line_bold("'%s' is read only", fn); - goto ret; - } -# endif - //if (useforce) { - // if "fn" is not write-able, chmod u+w - // sprintf(syscmd, "chmod u+w %s", fn); - // system(syscmd); - // forced = TRUE; - //} - if (modified_count != 0 || cmd[0] != 'x') { - size = r - q + 1; - l = file_write(fn, q, r); - } else { - size = 0; - l = 0; - } - //if (useforce && forced) { - // chmod u-w - // sprintf(syscmd, "chmod u-w %s", fn); - // system(syscmd); - // forced = FALSE; - //} - if (l < 0) { - if (l == -1) - status_line_bold_errno(fn); - } else { - // how many lines written - li = count_lines(q, q + l - 1); - status_line("'%s' %dL, %dC", fn, li, l); - if (l == size) { - if (q == text && q + l == end) { - modified_count = 0; - last_modified_count = -1; - } - if (cmd[0] == 'x' - || cmd[1] == 'q' || cmd[1] == 'n' - || cmd[1] == 'Q' || cmd[1] == 'N' - ) { - editing = 0; - } - } - } -# if ENABLE_FEATURE_VI_YANKMARK - } else if (strncmp(cmd, "yank", i) == 0) { // yank lines - if (b < 0) { // no addr given- use defaults - q = begin_line(dot); // assume .,. for the range - r = end_line(dot); - } - text_yank(q, r, YDreg); - li = count_lines(q, r); - status_line("Yank %d lines (%d chars) into [%c]", - li, strlen(reg[YDreg]), what_reg()); -# endif - } else { - // cmd unknown - not_implemented(cmd); - } - ret: - dot = bound_dot(dot); // make sure "dot" is valid - return; -# if ENABLE_FEATURE_VI_SEARCH - colon_s_fail: - status_line(":s expression missing delimiters"); -# endif -#endif /* FEATURE_VI_COLON */ -} - -static void Hit_Return(void) -{ - int c; - - standout_start(); - write1("[Hit return to continue]"); - standout_end(); - while ((c = get_one_char()) != '\n' && c != '\r') - continue; - redraw(TRUE); // force redraw all -} - -static int next_tabstop(int col) -{ - return col + ((tabstop - 1) - (col % tabstop)); -} - -//----- Synchronize the cursor to Dot -------------------------- -static NOINLINE void sync_cursor(char *d, int *row, int *col) -{ - char *beg_cur; // begin and end of "d" line - char *tp; - int cnt, ro, co; - - beg_cur = begin_line(d); // first char of cur line - - if (beg_cur < screenbegin) { - // "d" is before top line on screen - // how many lines do we have to move - cnt = count_lines(beg_cur, screenbegin); - sc1: - screenbegin = beg_cur; - if (cnt > (rows - 1) / 2) { - // we moved too many lines. put "dot" in middle of screen - for (cnt = 0; cnt < (rows - 1) / 2; cnt++) { - screenbegin = prev_line(screenbegin); - } - } - } else { - char *end_scr; // begin and end of screen - end_scr = end_screen(); // last char of screen - if (beg_cur > end_scr) { - // "d" is after bottom line on screen - // how many lines do we have to move - cnt = count_lines(end_scr, beg_cur); - if (cnt > (rows - 1) / 2) - goto sc1; // too many lines - for (ro = 0; ro < cnt - 1; ro++) { - // move screen begin the same amount - screenbegin = next_line(screenbegin); - // now, move the end of screen - end_scr = next_line(end_scr); - end_scr = end_line(end_scr); - } - } - } - // "d" is on screen- find out which row - tp = screenbegin; - for (ro = 0; ro < rows - 1; ro++) { // drive "ro" to correct row - if (tp == beg_cur) - break; - tp = next_line(tp); - } - - // find out what col "d" is on - co = 0; - while (tp < d) { // drive "co" to correct column - if (*tp == '\n') //vda || *tp == '\0') - break; - if (*tp == '\t') { - // handle tabs like real vi - if (d == tp && cmd_mode) { - break; - } - co = next_tabstop(co); - } else if ((unsigned char)*tp < ' ' || *tp == 0x7f) { - co++; // display as ^X, use 2 columns - } - co++; - tp++; - } - - // "co" is the column where "dot" is. - // The screen has "columns" columns. - // The currently displayed columns are 0+offset -- columns+ofset - // |-------------------------------------------------------------| - // ^ ^ ^ - // offset | |------- columns ----------------| - // - // If "co" is already in this range then we do not have to adjust offset - // but, we do have to subtract the "offset" bias from "co". - // If "co" is outside this range then we have to change "offset". - // If the first char of a line is a tab the cursor will try to stay - // in column 7, but we have to set offset to 0. - - if (co < 0 + offset) { - offset = co; - } - if (co >= columns + offset) { - offset = co - columns + 1; - } - // if the first char of the line is a tab, and "dot" is sitting on it - // force offset to 0. - if (d == beg_cur && *d == '\t') { - offset = 0; - } - co -= offset; - - *row = ro; - *col = co; -} - -//----- Text Movement Routines --------------------------------- -static char *begin_line(char *p) // return pointer to first char cur line -{ - if (p > text) { - p = memrchr(text, '\n', p - text); - if (!p) - return text; - return p + 1; - } - return p; -} - -static char *end_line(char *p) // return pointer to NL of cur line -{ - if (p < end - 1) { - p = memchr(p, '\n', end - p - 1); - if (!p) - return end - 1; - } - return p; -} - -static char *dollar_line(char *p) // return pointer to just before NL line -{ - p = end_line(p); - // Try to stay off of the Newline - if (*p == '\n' && (p - begin_line(p)) > 0) - p--; - return p; -} - -static char *prev_line(char *p) // return pointer first char prev line -{ - p = begin_line(p); // goto beginning of cur line - if (p > text && p[-1] == '\n') - p--; // step to prev line - p = begin_line(p); // goto beginning of prev line - return p; -} - -static char *next_line(char *p) // return pointer first char next line -{ - p = end_line(p); - if (p < end - 1 && *p == '\n') - p++; // step to next line - return p; -} - -//----- Text Information Routines ------------------------------ -static char *end_screen(void) -{ - char *q; - int cnt; + // F points to the "find" pattern + // R points to the "replace" pattern + // replace the cmd line delimiters "/" with NULs + c = orig_buf[1]; // what is the delimiter + F = orig_buf + 2; // start of "find" + R = strchr(F, c); // middle delimiter + if (!R) + goto colon_s_fail; + len_F = R - F; + *R++ = '\0'; // terminate "find" + flags = strchr(R, c); + if (!flags) + goto colon_s_fail; + len_R = flags - R; + *flags++ = '\0'; // terminate "replace" + gflag = *flags; - // find new bottom line - q = screenbegin; - for (cnt = 0; cnt < rows - 2; cnt++) - q = next_line(q); - q = end_line(q); - return q; -} + q = begin_line(q); + if (b < 0) { // maybe :s/foo/bar/ + q = begin_line(dot); // start with cur line + b = count_lines(text, q); // cur line number + } + if (e < 0) + e = b; // maybe :.s/foo/bar/ -// count line from start to stop -static int count_lines(char *start, char *stop) -{ - char *q; - int cnt; + for (i = b; i <= e; i++) { // so, :20,23 s \0 find \0 replace \0 + char *ls = q; // orig line start + char *found; + vc4: + found = char_search(q, F, (FORWARD << 1) | LIMITED); // search cur line only for "find" + if (found) { + uintptr_t bias; + // we found the "find" pattern - delete it + // For undo support, the first item should not be chained + text_hole_delete(found, found + len_F - 1, dont_chain_first_item); +# if ENABLE_FEATURE_VI_UNDO + dont_chain_first_item = ALLOW_UNDO_CHAIN; +# endif + // insert the "replace" patern + bias = string_insert(found, R, ALLOW_UNDO_CHAIN); + found += bias; + ls += bias; + /*q += bias; - recalculated anyway */ + // check for "global" :s/foo/bar/g + if (gflag == 'g') { + if ((found + len_R) < end_line(ls)) { + q = found + len_R; + goto vc4; // don't let q move past cur line + } + } + } + q = next_line(ls); + } +# endif /* FEATURE_VI_SEARCH */ + } else if (strncmp(cmd, "version", i) == 0) { // show software version + status_line(BB_VER); + } else if (strncmp(cmd, "write", i) == 0 // write text to file + || strncmp(cmd, "wq", i) == 0 + || strncmp(cmd, "wn", i) == 0 + || (cmd[0] == 'x' && !cmd[1]) + ) { + int size; + //int forced = FALSE; - if (stop < start) { // start and stop are backwards- reverse them - q = start; - start = stop; - stop = q; - } - cnt = 0; - stop = end_line(stop); - while (start <= stop && start <= end - 1) { - start = end_line(start); - if (*start == '\n') - cnt++; - start++; + // is there a file name to write to? + if (args[0]) { + fn = args; + } +# if ENABLE_FEATURE_VI_READONLY + if (readonly_mode && !useforce) { + status_line_bold("'%s' is read only", fn); + goto ret; + } +# endif + //if (useforce) { + // if "fn" is not write-able, chmod u+w + // sprintf(syscmd, "chmod u+w %s", fn); + // system(syscmd); + // forced = TRUE; + //} + if (modified_count != 0 || cmd[0] != 'x') { + size = r - q + 1; + l = file_write(fn, q, r); + } else { + size = 0; + l = 0; + } + //if (useforce && forced) { + // chmod u-w + // sprintf(syscmd, "chmod u-w %s", fn); + // system(syscmd); + // forced = FALSE; + //} + if (l < 0) { + if (l == -1) + status_line_bold_errno(fn); + } else { + // how many lines written + li = count_lines(q, q + l - 1); + status_line("'%s' %dL, %dC", fn, li, l); + if (l == size) { + if (q == text && q + l == end) { + modified_count = 0; + last_modified_count = -1; + } + if (cmd[0] == 'x' + || cmd[1] == 'q' || cmd[1] == 'n' + || cmd[1] == 'Q' || cmd[1] == 'N' + ) { + editing = 0; + } + } + } +# if ENABLE_FEATURE_VI_YANKMARK + } else if (strncmp(cmd, "yank", i) == 0) { // yank lines + if (b < 0) { // no addr given- use defaults + q = begin_line(dot); // assume .,. for the range + r = end_line(dot); + } + text_yank(q, r, YDreg); + li = count_lines(q, r); + status_line("Yank %d lines (%d chars) into [%c]", + li, strlen(reg[YDreg]), what_reg()); +# endif + } else { + // cmd unknown + not_implemented(cmd); } - return cnt; + ret: + dot = bound_dot(dot); // make sure "dot" is valid + return; +# if ENABLE_FEATURE_VI_SEARCH + colon_s_fail: + status_line(":s expression missing delimiters"); +# endif +#endif /* FEATURE_VI_COLON */ } -static char *find_line(int li) // find beginning of line #li +static void Hit_Return(void) { - char *q; + int c; - for (q = text; li > 1; li--) { - q = next_line(q); - } - return q; + standout_start(); + write1("[Hit return to continue]"); + standout_end(); + while ((c = get_one_char()) != '\n' && c != '\r') + continue; + redraw(TRUE); // force redraw all } //----- Dot Movement Routines ---------------------------------- @@ -2430,32 +2512,6 @@ static char *swap_context(char *p) // goto new context for '' command make this } #endif /* FEATURE_VI_YANKMARK */ -//----- Set terminal attributes -------------------------------- -static void rawmode(void) -{ - // no TERMIOS_CLEAR_ISIG: leave ISIG on - allow signals - set_termios_to_raw(STDIN_FILENO, &term_orig, TERMIOS_RAW_CRNL); - erase_char = term_orig.c_cc[VERASE]; -} - -static void cookmode(void) -{ - fflush_all(); - tcsetattr_stdin_TCSANOW(&term_orig); -} - -static int mysleep(int hund) // sleep for 'hund' 1/100 seconds or stdin ready -{ - struct pollfd pfd[1]; - - if (hund != 0) - fflush_all(); - - pfd[0].fd = STDIN_FILENO; - pfd[0].events = POLLIN; - return safe_poll(pfd, 1, hund*10) > 0; -} - //----- IO Routines -------------------------------------------- static int readit(void) // read (maybe cursor) key from stdin { @@ -2637,55 +2693,6 @@ static int file_write(char *fn, char *first, char *last) return charcnt; } -//----- Terminal Drawing --------------------------------------- -// The terminal is made up of 'rows' line of 'columns' columns. -// classically this would be 24 x 80. -// screen coordinates -// 0,0 ... 0,79 -// 1,0 ... 1,79 -// . ... . -// . ... . -// 22,0 ... 22,79 -// 23,0 ... 23,79 <- status line - -//----- Move the cursor to row x col (count from 0, not 1) ------- -static void place_cursor(int row, int col) -{ - char cm1[sizeof(ESC_SET_CURSOR_POS) + sizeof(int)*3 * 2]; - - if (row < 0) row = 0; - if (row >= rows) row = rows - 1; - if (col < 0) col = 0; - if (col >= columns) col = columns - 1; - - sprintf(cm1, ESC_SET_CURSOR_POS, row + 1, col + 1); - write1(cm1); -} - -//----- Erase from cursor to end of line ----------------------- -static void clear_to_eol(void) -{ - write1(ESC_CLEAR2EOL); -} - -static void go_bottom_and_clear_to_eol(void) -{ - place_cursor(rows - 1, 0); - clear_to_eol(); -} - -//----- Start standout mode ------------------------------------ -static void standout_start(void) -{ - write1(ESC_BOLD_TEXT); -} - -//----- End standout mode -------------------------------------- -static void standout_end(void) -{ - write1(ESC_NORM_TEXT); -} - //----- Flash the screen -------------------------------------- static void flash(int h) { @@ -2709,13 +2716,6 @@ static void indicate_error(void) } } -//----- Screen[] Routines -------------------------------------- -//----- Erase the Screen[] memory ------------------------------ -static void screen_erase(void) -{ - memset(screen, ' ', screensize); // clear new screen -} - static int bufsum(char *buf, int count) { int sum = 0; -- cgit v1.2.3-55-g6feb From d4f2e7ff71f253ee993e11cf7ce6a1244dec52e0 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Mon, 1 Apr 2019 14:18:02 +0200 Subject: vi: rearrange functions, no logic changes Signed-off-by: Denys Vlasenko --- editors/vi.c | 3437 ++++++++++++++++++++++++++++------------------------------ 1 file changed, 1668 insertions(+), 1769 deletions(-) (limited to 'editors/vi.c') diff --git a/editors/vi.c b/editors/vi.c index 9db763ccd..a0a2b7a82 100644 --- a/editors/vi.c +++ b/editors/vi.c @@ -483,123 +483,8 @@ struct globals { } while (0) -static void do_cmd(int); // execute a command -static int next_tabstop(int); -static void sync_cursor(char *, int *, int *); // synchronize the screen cursor to dot -static char *begin_line(char *); // return pointer to cur line B-o-l -static char *end_line(char *); // return pointer to cur line E-o-l -static char *prev_line(char *); // return pointer to prev line B-o-l -static char *next_line(char *); // return pointer to next line B-o-l -static char *end_screen(void); // get pointer to last char on screen -static int count_lines(char *, char *); // count line from start to stop -static char *find_line(int); // find beginning of line #li -static char *move_to_col(char *, int); // move "p" to column l -static void dot_left(void); // move dot left- dont leave line -static void dot_right(void); // move dot right- dont leave line -static void dot_begin(void); // move dot to B-o-l -static void dot_end(void); // move dot to E-o-l -static void dot_next(void); // move dot to next line B-o-l -static void dot_prev(void); // move dot to prev line B-o-l -static void dot_scroll(int, int); // move the screen up or down -static void dot_skip_over_ws(void); // move dot pat WS -static char *bound_dot(char *); // make sure text[0] <= P < "end" -static char *new_screen(int, int); // malloc virtual screen memory -#if !ENABLE_FEATURE_VI_UNDO -#define char_insert(a,b,c) char_insert(a,b) -#endif -static char *char_insert(char *, char, int); // insert the char c at 'p' -// might reallocate text[]! use p += stupid_insert(p, ...), -// and be careful to not use pointers into potentially freed text[]! -static uintptr_t stupid_insert(char *, char); // stupidly insert the char c at 'p' -static int st_test(char *, int, int, char *); // helper for skip_thing() -static char *skip_thing(char *, int, int, int); // skip some object -static char *find_pair(char *, char); // find matching pair () [] {} -#if !ENABLE_FEATURE_VI_UNDO -#define text_hole_delete(a,b,c) text_hole_delete(a,b) -#endif -static char *text_hole_delete(char *, char *, int); // at "p", delete a 'size' byte hole -// might reallocate text[]! use p += text_hole_make(p, ...), -// and be careful to not use pointers into potentially freed text[]! -static uintptr_t text_hole_make(char *, int); // at "p", make a 'size' byte hole -#if !ENABLE_FEATURE_VI_UNDO -#define yank_delete(a,b,c,d,e) yank_delete(a,b,c,d) -#endif -static char *yank_delete(char *, char *, int, int, int); // yank text[] into register then delete -static void rawmode(void); // set "raw" mode on tty -static void cookmode(void); // return to "cooked" mode on tty -// sleep for 'h' 1/100 seconds, return 1/0 if stdin is (ready for read)/(not ready) -static int mysleep(int); -static int get_one_char(void); // read 1 char from stdin -// file_insert might reallocate text[]! -static int file_insert(const char *, char *, int); -static int file_write(char *, char *, char *); -static void screen_erase(void); -static void go_bottom_and_clear_to_eol(void); -static void standout_start(void); // send "start reverse video" sequence -static void standout_end(void); // send "end reverse video" sequence -static void flash(int); // flash the terminal screen static void show_status_line(void); // put a message on the bottom line -static void status_line(const char *, ...); // print to status buf static void status_line_bold(const char *, ...); -static void status_line_bold_errno(const char *fn); -static void not_implemented(const char *); // display "Not implemented" message -static int format_edit_status(void); // format file status on status line -static void redraw(int); // force a full screen refresh -static char* format_line(char* /*, int*/); -static void refresh(int); // update the terminal from screen[] - -static void indicate_error(void); // use flash or beep to indicate error -static void Hit_Return(void); - -#if ENABLE_FEATURE_VI_SEARCH -static char *char_search(char *, const char *, int); // search for pattern starting at p -#endif -#if ENABLE_FEATURE_VI_COLON -static char *get_one_address(char *, int *); // get colon addr, if present -static char *get_address(char *, int *, int *); // get two colon addrs, if present -#endif -static void colon(char *); // execute the "colon" mode cmds -#if ENABLE_FEATURE_VI_USE_SIGNALS -static void winch_handler(int); // catch window size changes -static void tstp_handler(int); // catch ctrl-Z -static void int_handler(int); // catch ctrl-C -#endif -#if ENABLE_FEATURE_VI_DOT_CMD -static void start_new_cmd_q(char); // new queue for command -static void end_cmd_q(void); // stop saving input chars -#else -#define end_cmd_q() ((void)0) -#endif -#if ENABLE_FEATURE_VI_SETOPTS -static void showmatching(char *); // show the matching pair () [] {} -#endif -#if ENABLE_FEATURE_VI_YANKMARK || (ENABLE_FEATURE_VI_COLON && ENABLE_FEATURE_VI_SEARCH) || ENABLE_FEATURE_VI_CRASHME -// might reallocate text[]! use p += string_insert(p, ...), -// and be careful to not use pointers into potentially freed text[]! -# if !ENABLE_FEATURE_VI_UNDO -#define string_insert(a,b,c) string_insert(a,b) -# endif -static uintptr_t string_insert(char *, const char *, int); // insert the string at 'p' -#endif -#if ENABLE_FEATURE_VI_YANKMARK -static char *text_yank(char *, char *, int); // save copy of "p" into a register -static char what_reg(void); // what is letter of current YDreg -static void check_context(char); // remember context for '' command -#endif -#if ENABLE_FEATURE_VI_UNDO -static void flush_undo_data(void); -static void undo_push(char *, unsigned, unsigned char); // push an operation on the undo stack -static void undo_push_insert(char *, int, int); // convenience function -static void undo_pop(void); // undo the last operation -# if ENABLE_FEATURE_VI_UNDO_QUEUE -static void undo_queue_commit(void); // flush any queued objects to the undo stack -# else -# define undo_queue_commit() ((void)0) -# endif -#else -#define flush_undo_data() ((void)0) -#define undo_queue_commit() ((void)0) -#endif #if ENABLE_FEATURE_VI_CRASHME static void crash_dummy(); @@ -645,37 +530,6 @@ static void write1(const char *out) fputs(out, stdout); } -/* read text from file or create an empty buf */ -/* will also update current_filename */ -static int init_text_buffer(char *fn) -{ - int rc; - - /* allocate/reallocate text buffer */ - free(text); - text_size = 10240; - screenbegin = dot = end = text = xzalloc(text_size); - - if (fn != current_filename) { - free(current_filename); - current_filename = xstrdup(fn); - } - rc = file_insert(fn, text, 1); - if (rc < 0) { - // file doesnt exist. Start empty buf with dummy line - char_insert(text, '\n', NO_UNDO); - } - - flush_undo_data(); - modified_count = 0; - last_modified_count = -1; -#if ENABLE_FEATURE_VI_YANKMARK - /* init the marks */ - memset(mark, 0, sizeof(mark)); -#endif - return rc; -} - #if ENABLE_FEATURE_VI_WIN_RESIZE static int query_screen_dimensions(void) { @@ -969,654 +823,288 @@ static NOINLINE void sync_cursor(char *d, int *row, int *col) *col = co; } -//----- The Colon commands ------------------------------------- -#if ENABLE_FEATURE_VI_COLON -static char *get_one_address(char *p, int *addr) // get colon addr, if present +//----- Format a text[] line into a buffer --------------------- +static char* format_line(char *src /*, int li*/) { - int st; - char *q; - IF_FEATURE_VI_YANKMARK(char c;) - IF_FEATURE_VI_SEARCH(char *pat;) + unsigned char c; + int co; + int ofs = offset; + char *dest = scr_out_buf; // [MAX_SCR_COLS + MAX_TABSTOP * 2] - *addr = -1; // assume no addr - if (*p == '.') { // the current line - p++; - q = begin_line(dot); - *addr = count_lines(text, q); - } -#if ENABLE_FEATURE_VI_YANKMARK - else if (*p == '\'') { // is this a mark addr - p++; - c = tolower(*p); - p++; - if (c >= 'a' && c <= 'z') { - // we have a mark - c = c - 'a'; - q = mark[(unsigned char) c]; - if (q != NULL) { // is mark valid - *addr = count_lines(text, q); + c = '~'; // char in col 0 in non-existent lines is '~' + co = 0; + while (co < columns + tabstop) { + // have we gone past the end? + if (src < end) { + c = *src++; + if (c == '\n') + break; + if ((c & 0x80) && !Isprint(c)) { + c = '.'; + } + if (c < ' ' || c == 0x7f) { + if (c == '\t') { + c = ' '; + // co % 8 != 7 + while ((co % tabstop) != (tabstop - 1)) { + dest[co++] = c; + } + } else { + dest[co++] = '^'; + if (c == 0x7f) + c = '?'; + else + c += '@'; // Ctrl-X -> 'X' + } } } - } -#endif -#if ENABLE_FEATURE_VI_SEARCH - else if (*p == '/') { // a search pattern - q = strchrnul(++p, '/'); - pat = xstrndup(p, q - p); // save copy of pattern - p = q; - if (*p == '/') - p++; - q = char_search(dot, pat, (FORWARD << 1) | FULL); - if (q != NULL) { - *addr = count_lines(text, q); + dest[co++] = c; + // discard scrolled-off-to-the-left portion, + // in tabstop-sized pieces + if (ofs >= tabstop && co >= tabstop) { + memmove(dest, dest + tabstop, co); + co -= tabstop; + ofs -= tabstop; } - free(pat); - } -#endif - else if (*p == '$') { // the last line in file - p++; - q = begin_line(end - 1); - *addr = count_lines(text, q); - } else if (isdigit(*p)) { // specific line number - sscanf(p, "%d%n", addr, &st); - p += st; - } else { - // unrecognized address - assume -1 - *addr = -1; + if (src >= end) + break; } - return p; + // check "short line, gigantic offset" case + if (co < ofs) + ofs = co; + // discard last scrolled off part + co -= ofs; + dest += ofs; + // fill the rest with spaces + if (co < columns) + memset(&dest[co], ' ', columns - co); + return dest; } -static char *get_address(char *p, int *b, int *e) // get two colon addrs, if present +//----- Refresh the changed screen lines ----------------------- +// Copy the source line from text[] into the buffer and note +// if the current screenline is different from the new buffer. +// If they differ then that line needs redrawing on the terminal. +// +static void refresh(int full_screen) { - //----- get the address' i.e., 1,3 'a,'b ----- - // get FIRST addr, if present - while (isblank(*p)) - p++; // skip over leading spaces - if (*p == '%') { // alias for 1,$ - p++; - *b = 1; - *e = count_lines(text, end-1); - goto ga0; - } - p = get_one_address(p, b); - while (isblank(*p)) - p++; - if (*p == ',') { // is there a address separator - p++; - while (isblank(*p)) - p++; - // get SECOND addr, if present - p = get_one_address(p, e); - } - ga0: - while (isblank(*p)) - p++; // skip over trailing spaces - return p; -} +#define old_offset refresh__old_offset -#if ENABLE_FEATURE_VI_SET && ENABLE_FEATURE_VI_SETOPTS -static void setops(const char *args, const char *opname, int flg_no, - const char *short_opname, int opt) -{ - const char *a = args + flg_no; - int l = strlen(opname) - 1; // opname have + ' ' + int li, changed; + char *tp, *sp; // pointer into text[] and screen[] - // maybe strncmp? we had tons of erroneous strncasecmp's... - if (strncasecmp(a, opname, l) == 0 - || strncasecmp(a, short_opname, 2) == 0 - ) { - if (flg_no) - vi_setops &= ~opt; - else - vi_setops |= opt; - } -} + if (ENABLE_FEATURE_VI_WIN_RESIZE IF_FEATURE_VI_ASK_TERMINAL(&& !G.get_rowcol_error) ) { + unsigned c = columns, r = rows; + query_screen_dimensions(); +#if ENABLE_FEATURE_VI_USE_SIGNALS + full_screen |= (c - columns) | (r - rows); +#else + if (c != columns || r != rows) { + full_screen = TRUE; + // update screen memory since SIGWINCH won't have done it + new_screen(rows, columns); + } #endif + } + sync_cursor(dot, &crow, &ccol); // where cursor will be (on "dot") + tp = screenbegin; // index into text[] of top line -#endif /* FEATURE_VI_COLON */ + // compare text[] to screen[] and mark screen[] lines that need updating + for (li = 0; li < rows - 1; li++) { + int cs, ce; // column start & end + char *out_buf; + // format current text line + out_buf = format_line(tp /*, li*/); -// buf must be no longer than MAX_INPUT_LEN! -static void colon(char *buf) -{ -#if !ENABLE_FEATURE_VI_COLON - // Simple ":cmd" handler with minimal set of commands - char *p = buf; - int cnt; + // skip to the end of the current text[] line + if (tp < end) { + char *t = memchr(tp, '\n', end - tp); + if (!t) t = end - 1; + tp = t + 1; + } - if (*p == ':') - p++; - cnt = strlen(p); - if (cnt == 0) - return; - if (strncmp(p, "quit", cnt) == 0 - || strncmp(p, "q!", cnt) == 0 - ) { - if (modified_count && p[1] != '!') { - status_line_bold("No write since last change (:%s! overrides)", p); - } else { - editing = 0; + // see if there are any changes between virtual screen and out_buf + changed = FALSE; // assume no change + cs = 0; + ce = columns - 1; + sp = &screen[li * columns]; // start of screen line + if (full_screen) { + // force re-draw of every single column from 0 - columns-1 + goto re0; } - return; - } - if (strncmp(p, "write", cnt) == 0 - || strncmp(p, "wq", cnt) == 0 - || strncmp(p, "wn", cnt) == 0 - || (p[0] == 'x' && !p[1]) - ) { - if (modified_count != 0 || p[0] != 'x') { - cnt = file_write(current_filename, text, end - 1); + // compare newly formatted buffer with virtual screen + // look forward for first difference between buf and screen + for (; cs <= ce; cs++) { + if (out_buf[cs] != sp[cs]) { + changed = TRUE; // mark for redraw + break; + } } - if (cnt < 0) { - if (cnt == -1) - status_line_bold("Write error: "STRERROR_FMT STRERROR_ERRNO); - } else { - modified_count = 0; - last_modified_count = -1; - status_line("'%s' %dL, %dC", - current_filename, - count_lines(text, end - 1), cnt - ); - if (p[0] == 'x' - || p[1] == 'q' || p[1] == 'n' - || p[1] == 'Q' || p[1] == 'N' - ) { - editing = 0; + + // look backward for last difference between out_buf and screen + for (; ce >= cs; ce--) { + if (out_buf[ce] != sp[ce]) { + changed = TRUE; // mark for redraw + break; } } - return; - } - if (strncmp(p, "file", cnt) == 0) { - last_status_cksum = 0; // force status update - return; - } - if (sscanf(p, "%d", &cnt) > 0) { - dot = find_line(cnt); - dot_skip_over_ws(); - return; - } - not_implemented(p); -#else + // now, cs is index of first diff, and ce is index of last diff - char c, *buf1, *q, *r; - char *fn, cmd[MAX_INPUT_LEN], args[MAX_INPUT_LEN]; - int i, l, li, b, e; - int useforce; -# if ENABLE_FEATURE_VI_SEARCH || ENABLE_FEATURE_ALLOW_EXEC - char *orig_buf; -# endif + // if horz offset has changed, force a redraw + if (offset != old_offset) { + re0: + changed = TRUE; + } - // :3154 // if (-e line 3154) goto it else stay put - // :4,33w! foo // write a portion of buffer to file "foo" - // :w // write all of buffer to current file - // :q // quit - // :q! // quit- dont care about modified file - // :'a,'z!sort -u // filter block through sort - // :'f // goto mark "f" - // :'fl // list literal the mark "f" line - // :.r bar // read file "bar" into buffer before dot - // :/123/,/abc/d // delete lines from "123" line to "abc" line - // :/xyz/ // goto the "xyz" line - // :s/find/replace/ // substitute pattern "find" with "replace" - // :! // run then return - // + // make a sanity check of columns indexes + if (cs < 0) cs = 0; + if (ce > columns - 1) ce = columns - 1; + if (cs > ce) { cs = 0; ce = columns - 1; } + // is there a change between virtual screen and out_buf + if (changed) { + // copy changed part of buffer to virtual screen + memcpy(sp+cs, out_buf+cs, ce-cs+1); + place_cursor(li, cs); + // write line out to terminal + fwrite(&sp[cs], ce - cs + 1, 1, stdout); + } + } - if (!buf[0]) - goto ret; - if (*buf == ':') - buf++; // move past the ':' + place_cursor(crow, ccol); - li = i = 0; - b = e = -1; - q = text; // assume 1,$ for the range - r = end - 1; - li = count_lines(text, end - 1); - fn = current_filename; + old_offset = offset; +#undef old_offset +} - // look for optional address(es) :. :1 :1,9 :'q,'a :% - buf = get_address(buf, &b, &e); +//----- Force refresh of all Lines ----------------------------- +static void redraw(int full_screen) +{ + // cursor to top,left; clear to the end of screen + write1(ESC_SET_CURSOR_TOPLEFT ESC_CLEAR2EOS); + screen_erase(); // erase the internal screen buffer + last_status_cksum = 0; // force status update + refresh(full_screen); // this will redraw the entire display + show_status_line(); +} -# if ENABLE_FEATURE_VI_SEARCH || ENABLE_FEATURE_ALLOW_EXEC - // remember orig command line - orig_buf = buf; -# endif +//----- Flash the screen -------------------------------------- +static void flash(int h) +{ + standout_start(); + redraw(TRUE); + mysleep(h); + standout_end(); + redraw(TRUE); +} - // get the COMMAND into cmd[] - buf1 = cmd; - while (*buf != '\0') { - if (isspace(*buf)) - break; - *buf1++ = *buf++; - } - *buf1 = '\0'; - // get any ARGuments - while (isblank(*buf)) - buf++; - strcpy(args, buf); - useforce = FALSE; - buf1 = last_char_is(cmd, '!'); - if (buf1) { - useforce = TRUE; - *buf1 = '\0'; // get rid of ! - } - if (b >= 0) { - // if there is only one addr, then the addr - // is the line number of the single line the - // user wants. So, reset the end - // pointer to point at end of the "b" line - q = find_line(b); // what line is #b - r = end_line(q); - li = 1; - } - if (e >= 0) { - // we were given two addrs. change the - // end pointer to the addr given by user. - r = find_line(e); // what line is #e - r = end_line(r); - li = e - b + 1; - } - // ------------ now look for the command ------------ - i = strlen(cmd); - if (i == 0) { // :123CR goto line #123 - if (b >= 0) { - dot = find_line(b); // what line is #b - dot_skip_over_ws(); - } - } -# if ENABLE_FEATURE_ALLOW_EXEC - else if (cmd[0] == '!') { // run a cmd - int retcode; - // :!ls run the - go_bottom_and_clear_to_eol(); - cookmode(); - retcode = system(orig_buf + 1); // run the cmd - if (retcode) - printf("\nshell returned %i\n\n", retcode); - rawmode(); - Hit_Return(); // let user see results +static void indicate_error(void) +{ +#if ENABLE_FEATURE_VI_CRASHME + if (crashme > 0) + return; +#endif + if (!err_method) { + write1(ESC_BELL); + } else { + flash(10); } -# endif - else if (cmd[0] == '=' && !cmd[1]) { // where is the address - if (b < 0) { // no addr given- use defaults - b = e = count_lines(text, dot); - } - status_line("%d", b); - } else if (strncmp(cmd, "delete", i) == 0) { // delete lines - if (b < 0) { // no addr given- use defaults - q = begin_line(dot); // assume .,. for the range - r = end_line(dot); - } - dot = yank_delete(q, r, 1, YANKDEL, ALLOW_UNDO); // save, then delete lines - dot_skip_over_ws(); - } else if (strncmp(cmd, "edit", i) == 0) { // Edit a file - int size; +} - // don't edit, if the current file has been modified - if (modified_count && !useforce) { - status_line_bold("No write since last change (:%s! overrides)", cmd); - goto ret; - } - if (args[0]) { - // the user supplied a file name - fn = args; - } else if (current_filename && current_filename[0]) { - // no user supplied name- use the current filename - // fn = current_filename; was set by default - } else { - // no user file name, no current name- punt - status_line_bold("No current filename"); - goto ret; - } +//----- IO Routines -------------------------------------------- +static int readit(void) // read (maybe cursor) key from stdin +{ + int c; - size = init_text_buffer(fn); + fflush_all(); -# if ENABLE_FEATURE_VI_YANKMARK - if (Ureg >= 0 && Ureg < 28) { - free(reg[Ureg]); // free orig line reg- for 'U' - reg[Ureg] = NULL; - } - if (YDreg >= 0 && YDreg < 28) { - free(reg[YDreg]); // free default yank/delete register - reg[YDreg] = NULL; - } -# endif - // how many lines in text[]? - li = count_lines(text, end - 1); - status_line("'%s'%s" - IF_FEATURE_VI_READONLY("%s") - " %dL, %dC", - current_filename, - (size < 0 ? " [New file]" : ""), - IF_FEATURE_VI_READONLY( - ((readonly_mode) ? " [Readonly]" : ""), - ) - li, (int)(end - text) - ); - } else if (strncmp(cmd, "file", i) == 0) { // what File is this - if (b != -1 || e != -1) { - status_line_bold("No address allowed on this command"); - goto ret; - } - if (args[0]) { - // user wants a new filename - free(current_filename); - current_filename = xstrdup(args); - } else { - // user wants file status info - last_status_cksum = 0; // force status update - } - } else if (strncmp(cmd, "features", i) == 0) { // what features are available - // print out values of all features - go_bottom_and_clear_to_eol(); - cookmode(); - show_help(); - rawmode(); - Hit_Return(); - } else if (strncmp(cmd, "list", i) == 0) { // literal print line - if (b < 0) { // no addr given- use defaults - q = begin_line(dot); // assume .,. for the range - r = end_line(dot); - } + // Wait for input. TIMEOUT = -1 makes read_key wait even + // on nonblocking stdin. + // Note: read_key sets errno to 0 on success. + again: + c = read_key(STDIN_FILENO, readbuffer, /*timeout:*/ -1); + if (c == -1) { // EOF/error + if (errno == EAGAIN) // paranoia + goto again; go_bottom_and_clear_to_eol(); - puts("\r"); - for (; q <= r; q++) { - int c_is_no_print; + cookmode(); // terminal to "cooked" + bb_error_msg_and_die("can't read user input"); + } + return c; +} - c = *q; - c_is_no_print = (c & 0x80) && !Isprint(c); - if (c_is_no_print) { - c = '.'; - standout_start(); - } - if (c == '\n') { - write1("$\r"); - } else if (c < ' ' || c == 127) { - bb_putchar('^'); - if (c == 127) - c = '?'; - else - c += '@'; - } - bb_putchar(c); - if (c_is_no_print) - standout_end(); - } - Hit_Return(); - } else if (strncmp(cmd, "quit", i) == 0 // quit - || strncmp(cmd, "next", i) == 0 // edit next file - || strncmp(cmd, "prev", i) == 0 // edit previous file - ) { - int n; - if (useforce) { - if (*cmd == 'q') { - // force end of argv list - optind = save_argc; - } - editing = 0; - goto ret; - } - // don't exit if the file been modified - if (modified_count) { - status_line_bold("No write since last change (:%s! overrides)", cmd); - goto ret; - } - // are there other file to edit - n = save_argc - optind - 1; - if (*cmd == 'q' && n > 0) { - status_line_bold("%d more file(s) to edit", n); - goto ret; - } - if (*cmd == 'n' && n <= 0) { - status_line_bold("No more files to edit"); - goto ret; - } - if (*cmd == 'p') { - // are there previous files to edit - if (optind < 1) { - status_line_bold("No previous files to edit"); - goto ret; - } - optind -= 2; - } - editing = 0; - } else if (strncmp(cmd, "read", i) == 0) { // read file into text[] - int size; +static int get_one_char(void) +{ + int c; - fn = args; - if (!fn[0]) { - status_line_bold("No filename given"); - goto ret; - } - if (b < 0) { // no addr given- use defaults - q = begin_line(dot); // assume "dot" - } - // read after current line- unless user said ":0r foo" - if (b != 0) { - q = next_line(q); - // read after last line - if (q == end-1) - ++q; - } - { // dance around potentially-reallocated text[] - uintptr_t ofs = q - text; - size = file_insert(fn, q, 0); - q = text + ofs; - } - if (size < 0) - goto ret; // nothing was inserted - // how many lines in text[]? - li = count_lines(q, q + size - 1); - status_line("'%s'" - IF_FEATURE_VI_READONLY("%s") - " %dL, %dC", - fn, - IF_FEATURE_VI_READONLY((readonly_mode ? " [Readonly]" : ""),) - li, size - ); - if (size > 0) { - // if the insert is before "dot" then we need to update - if (q <= dot) - dot += size; - } - } else if (strncmp(cmd, "rewind", i) == 0) { // rewind cmd line args - if (modified_count && !useforce) { - status_line_bold("No write since last change (:%s! overrides)", cmd); +#if ENABLE_FEATURE_VI_DOT_CMD + if (!adding2q) { + // we are not adding to the q. + // but, we may be reading from a q + if (ioq == 0) { + // there is no current q, read from STDIN + c = readit(); // get the users input } else { - // reset the filenames to edit - optind = -1; // start from 0th file - editing = 0; - } -# if ENABLE_FEATURE_VI_SET - } else if (strncmp(cmd, "set", i) == 0) { // set or clear features -# if ENABLE_FEATURE_VI_SETOPTS - char *argp; -# endif - i = 0; // offset into args - // only blank is regarded as args delimiter. What about tab '\t'? - if (!args[0] || strcasecmp(args, "all") == 0) { - // print out values of all options -# if ENABLE_FEATURE_VI_SETOPTS - status_line_bold( - "%sautoindent " - "%sflash " - "%signorecase " - "%sshowmatch " - "tabstop=%u", - autoindent ? "" : "no", - err_method ? "" : "no", - ignorecase ? "" : "no", - showmatch ? "" : "no", - tabstop - ); -# endif - goto ret; - } -# if ENABLE_FEATURE_VI_SETOPTS - argp = args; - while (*argp) { - if (strncmp(argp, "no", 2) == 0) - i = 2; // ":set noautoindent" - setops(argp, "autoindent ", i, "ai", VI_AUTOINDENT); - setops(argp, "flash " , i, "fl", VI_ERR_METHOD); - setops(argp, "ignorecase ", i, "ic", VI_IGNORECASE); - setops(argp, "showmatch " , i, "sm", VI_SHOWMATCH ); - if (strncmp(argp + i, "tabstop=", 8) == 0) { - int t = 0; - sscanf(argp + i+8, "%u", &t); - if (t > 0 && t <= MAX_TABSTOP) - tabstop = t; + // there is a queue to get chars from first + // careful with correct sign expansion! + c = (unsigned char)*ioq++; + if (c == '\0') { + // the end of the q, read from STDIN + free(ioq_start); + ioq_start = ioq = 0; + c = readit(); // get the users input } - argp = skip_non_whitespace(argp); - argp = skip_whitespace(argp); } -# endif /* FEATURE_VI_SETOPTS */ -# endif /* FEATURE_VI_SET */ + } else { + // adding STDIN chars to q + c = readit(); // get the users input + if (lmc_len >= MAX_INPUT_LEN - 1) { + status_line_bold("last_modifying_cmd overrun"); + } else { + // add new char to q + last_modifying_cmd[lmc_len++] = c; + } + } +#else + c = readit(); // get the users input +#endif /* FEATURE_VI_DOT_CMD */ + return c; +} -# if ENABLE_FEATURE_VI_SEARCH - } else if (cmd[0] == 's') { // substitute a pattern with a replacement pattern - char *F, *R, *flags; - size_t len_F, len_R; - int gflag; // global replace flag -# if ENABLE_FEATURE_VI_UNDO - int dont_chain_first_item = ALLOW_UNDO; -# endif +// Get input line (uses "status line" area) +static char *get_input_line(const char *prompt) +{ + // char [MAX_INPUT_LEN] +#define buf get_input_line__buf - // F points to the "find" pattern - // R points to the "replace" pattern - // replace the cmd line delimiters "/" with NULs - c = orig_buf[1]; // what is the delimiter - F = orig_buf + 2; // start of "find" - R = strchr(F, c); // middle delimiter - if (!R) - goto colon_s_fail; - len_F = R - F; - *R++ = '\0'; // terminate "find" - flags = strchr(R, c); - if (!flags) - goto colon_s_fail; - len_R = flags - R; - *flags++ = '\0'; // terminate "replace" - gflag = *flags; - - q = begin_line(q); - if (b < 0) { // maybe :s/foo/bar/ - q = begin_line(dot); // start with cur line - b = count_lines(text, q); // cur line number - } - if (e < 0) - e = b; // maybe :.s/foo/bar/ + int c; + int i; - for (i = b; i <= e; i++) { // so, :20,23 s \0 find \0 replace \0 - char *ls = q; // orig line start - char *found; - vc4: - found = char_search(q, F, (FORWARD << 1) | LIMITED); // search cur line only for "find" - if (found) { - uintptr_t bias; - // we found the "find" pattern - delete it - // For undo support, the first item should not be chained - text_hole_delete(found, found + len_F - 1, dont_chain_first_item); -# if ENABLE_FEATURE_VI_UNDO - dont_chain_first_item = ALLOW_UNDO_CHAIN; -# endif - // insert the "replace" patern - bias = string_insert(found, R, ALLOW_UNDO_CHAIN); - found += bias; - ls += bias; - /*q += bias; - recalculated anyway */ - // check for "global" :s/foo/bar/g - if (gflag == 'g') { - if ((found + len_R) < end_line(ls)) { - q = found + len_R; - goto vc4; // don't let q move past cur line - } - } - } - q = next_line(ls); - } -# endif /* FEATURE_VI_SEARCH */ - } else if (strncmp(cmd, "version", i) == 0) { // show software version - status_line(BB_VER); - } else if (strncmp(cmd, "write", i) == 0 // write text to file - || strncmp(cmd, "wq", i) == 0 - || strncmp(cmd, "wn", i) == 0 - || (cmd[0] == 'x' && !cmd[1]) - ) { - int size; - //int forced = FALSE; + strcpy(buf, prompt); + last_status_cksum = 0; // force status update + go_bottom_and_clear_to_eol(); + write1(prompt); // write out the :, /, or ? prompt - // is there a file name to write to? - if (args[0]) { - fn = args; - } -# if ENABLE_FEATURE_VI_READONLY - if (readonly_mode && !useforce) { - status_line_bold("'%s' is read only", fn); - goto ret; - } -# endif - //if (useforce) { - // if "fn" is not write-able, chmod u+w - // sprintf(syscmd, "chmod u+w %s", fn); - // system(syscmd); - // forced = TRUE; - //} - if (modified_count != 0 || cmd[0] != 'x') { - size = r - q + 1; - l = file_write(fn, q, r); - } else { - size = 0; - l = 0; - } - //if (useforce && forced) { - // chmod u-w - // sprintf(syscmd, "chmod u-w %s", fn); - // system(syscmd); - // forced = FALSE; - //} - if (l < 0) { - if (l == -1) - status_line_bold_errno(fn); - } else { - // how many lines written - li = count_lines(q, q + l - 1); - status_line("'%s' %dL, %dC", fn, li, l); - if (l == size) { - if (q == text && q + l == end) { - modified_count = 0; - last_modified_count = -1; - } - if (cmd[0] == 'x' - || cmd[1] == 'q' || cmd[1] == 'n' - || cmd[1] == 'Q' || cmd[1] == 'N' - ) { - editing = 0; - } - } - } -# if ENABLE_FEATURE_VI_YANKMARK - } else if (strncmp(cmd, "yank", i) == 0) { // yank lines - if (b < 0) { // no addr given- use defaults - q = begin_line(dot); // assume .,. for the range - r = end_line(dot); + i = strlen(buf); + while (i < MAX_INPUT_LEN) { + c = get_one_char(); + if (c == '\n' || c == '\r' || c == 27) + break; // this is end of input + if (c == erase_char || c == 8 || c == 127) { + // user wants to erase prev char + buf[--i] = '\0'; + write1("\b \b"); // erase char on screen + if (i <= 0) // user backs up before b-o-l, exit + break; + } else if (c > 0 && c < 256) { // exclude Unicode + // (TODO: need to handle Unicode) + buf[i] = c; + buf[++i] = '\0'; + bb_putchar(c); } - text_yank(q, r, YDreg); - li = count_lines(q, r); - status_line("Yank %d lines (%d chars) into [%c]", - li, strlen(reg[YDreg]), what_reg()); -# endif - } else { - // cmd unknown - not_implemented(cmd); } - ret: - dot = bound_dot(dot); // make sure "dot" is valid - return; -# if ENABLE_FEATURE_VI_SEARCH - colon_s_fail: - status_line(":s expression missing delimiters"); -# endif -#endif /* FEATURE_VI_COLON */ + refresh(FALSE); + return buf; +#undef buf } static void Hit_Return(void) @@ -1631,436 +1119,366 @@ static void Hit_Return(void) redraw(TRUE); // force redraw all } -//----- Dot Movement Routines ---------------------------------- -static void dot_left(void) +//----- Draw the status line at bottom of the screen ------------- +// show file status on status line +static int format_edit_status(void) { - undo_queue_commit(); - if (dot > text && dot[-1] != '\n') - dot--; -} + static const char cmd_mode_indicator[] ALIGN1 = "-IR-"; -static void dot_right(void) -{ - undo_queue_commit(); - if (dot < end - 1 && *dot != '\n') - dot++; -} +#define tot format_edit_status__tot -static void dot_begin(void) -{ - undo_queue_commit(); - dot = begin_line(dot); // return pointer to first char cur line -} + int cur, percent, ret, trunc_at; -static void dot_end(void) -{ - undo_queue_commit(); - dot = end_line(dot); // return pointer to last char cur line -} + // modified_count is now a counter rather than a flag. this + // helps reduce the amount of line counting we need to do. + // (this will cause a mis-reporting of modified status + // once every MAXINT editing operations.) -static char *move_to_col(char *p, int l) -{ - int co; + // it would be nice to do a similar optimization here -- if + // we haven't done a motion that could have changed which line + // we're on, then we shouldn't have to do this count_lines() + cur = count_lines(text, dot); - p = begin_line(p); - co = 0; - while (co < l && p < end) { - if (*p == '\n') //vda || *p == '\0') - break; - if (*p == '\t') { - co = next_tabstop(co); - } else if (*p < ' ' || *p == 127) { - co++; // display as ^X, use 2 columns - } - co++; - p++; + // count_lines() is expensive. + // Call it only if something was changed since last time + // we were here: + if (modified_count != last_modified_count) { + tot = cur + count_lines(dot, end - 1) - 1; + last_modified_count = modified_count; } - return p; -} -static void dot_next(void) -{ - undo_queue_commit(); - dot = next_line(dot); + // current line percent + // ------------- ~~ ---------- + // total lines 100 + if (tot > 0) { + percent = (100 * cur) / tot; + } else { + cur = tot = 0; + percent = 100; + } + + trunc_at = columns < STATUS_BUFFER_LEN-1 ? + columns : STATUS_BUFFER_LEN-1; + + ret = snprintf(status_buffer, trunc_at+1, +#if ENABLE_FEATURE_VI_READONLY + "%c %s%s%s %d/%d %d%%", +#else + "%c %s%s %d/%d %d%%", +#endif + cmd_mode_indicator[cmd_mode & 3], + (current_filename != NULL ? current_filename : "No file"), +#if ENABLE_FEATURE_VI_READONLY + (readonly_mode ? " [Readonly]" : ""), +#endif + (modified_count ? " [Modified]" : ""), + cur, tot, percent); + + if (ret >= 0 && ret < trunc_at) + return ret; // it all fit + + return trunc_at; // had to truncate +#undef tot } -static void dot_prev(void) +static int bufsum(char *buf, int count) { - undo_queue_commit(); - dot = prev_line(dot); + int sum = 0; + char *e = buf + count; + while (buf < e) + sum += (unsigned char) *buf++; + return sum; } -static void dot_scroll(int cnt, int dir) +static void show_status_line(void) { - char *q; + int cnt = 0, cksum = 0; - undo_queue_commit(); - for (; cnt > 0; cnt--) { - if (dir < 0) { - // scroll Backwards - // ctrl-Y scroll up one line - screenbegin = prev_line(screenbegin); - } else { - // scroll Forwards - // ctrl-E scroll down one line - screenbegin = next_line(screenbegin); + // either we already have an error or status message, or we + // create one. + if (!have_status_msg) { + cnt = format_edit_status(); + cksum = bufsum(status_buffer, cnt); + } + if (have_status_msg || ((cnt > 0 && last_status_cksum != cksum))) { + last_status_cksum = cksum; // remember if we have seen this line + go_bottom_and_clear_to_eol(); + write1(status_buffer); + if (have_status_msg) { + if (((int)strlen(status_buffer) - (have_status_msg - 1)) > + (columns - 1) ) { + have_status_msg = 0; + Hit_Return(); + } + have_status_msg = 0; } + place_cursor(crow, ccol); // put cursor back in correct place } - // make sure "dot" stays on the screen so we dont scroll off - if (dot < screenbegin) - dot = screenbegin; - q = end_screen(); // find new bottom line - if (dot > q) - dot = begin_line(q); // is dot is below bottom line? - dot_skip_over_ws(); + fflush_all(); } -static void dot_skip_over_ws(void) +//----- format the status buffer, the bottom line of screen ------ +// format status buffer, with STANDOUT mode +static void status_line_bold(const char *format, ...) { - // skip WS - while (isspace(*dot) && *dot != '\n' && dot < end - 1) - dot++; + va_list args; + + va_start(args, format); + strcpy(status_buffer, ESC_BOLD_TEXT); + vsprintf(status_buffer + sizeof(ESC_BOLD_TEXT)-1, format, args); + strcat(status_buffer, ESC_NORM_TEXT); + va_end(args); + + have_status_msg = 1 + sizeof(ESC_BOLD_TEXT) + sizeof(ESC_NORM_TEXT) - 2; } -static char *bound_dot(char *p) // make sure text[0] <= P < "end" +static void status_line_bold_errno(const char *fn) { - if (p >= end && end > text) { - p = end - 1; - indicate_error(); - } - if (p < text) { - p = text; - indicate_error(); - } - return p; + status_line_bold("'%s' "STRERROR_FMT, fn STRERROR_ERRNO); } -//----- Helper Utility Routines -------------------------------- - -//---------------------------------------------------------------- -//----- Char Routines -------------------------------------------- -/* Chars that are part of a word- - * 0123456789_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz - * Chars that are Not part of a word (stoppers) - * !"#$%&'()*+,-./:;<=>?@[\]^`{|}~ - * Chars that are WhiteSpace - * TAB NEWLINE VT FF RETURN SPACE - * DO NOT COUNT NEWLINE AS WHITESPACE - */ - -static char *new_screen(int ro, int co) +// format status buffer +static void status_line(const char *format, ...) { - int li; - - free(screen); - screensize = ro * co + 8; - screen = xmalloc(screensize); - // initialize the new screen. assume this will be a empty file. - screen_erase(); - // non-existent text[] lines start with a tilde (~). - for (li = 1; li < ro - 1; li++) { - screen[(li * co) + 0] = '~'; - } - return screen; -} + va_list args; -#if ENABLE_FEATURE_VI_SEARCH + va_start(args, format); + vsprintf(status_buffer, format, args); + va_end(args); -# if ENABLE_FEATURE_VI_REGEX_SEARCH + have_status_msg = 1; +} -// search for pattern starting at p -static char *char_search(char *p, const char *pat, int dir_and_range) +// copy s to buf, convert unprintable +static void print_literal(char *buf, const char *s) { - struct re_pattern_buffer preg; - const char *err; - char *q; - int i; - int size; - int range; - - re_syntax_options = RE_SYNTAX_POSIX_EXTENDED; - if (ignorecase) - re_syntax_options = RE_SYNTAX_POSIX_EXTENDED | RE_ICASE; + char *d; + unsigned char c; - memset(&preg, 0, sizeof(preg)); - err = re_compile_pattern(pat, strlen(pat), &preg); - if (err != NULL) { - status_line_bold("bad search pattern '%s': %s", pat, err); - return p; - } + buf[0] = '\0'; + if (!s[0]) + s = "(NULL)"; - range = (dir_and_range & 1); - q = end - 1; // if FULL - if (range == LIMITED) - q = next_line(p); - if (dir_and_range < 0) { // BACK? - q = text; - if (range == LIMITED) - q = prev_line(p); - } + d = buf; + for (; *s; s++) { + int c_is_no_print; - // RANGE could be negative if we are searching backwards - range = q - p; - q = p; - size = range; - if (range < 0) { - size = -size; - q = p - size; - if (q < text) - q = text; + c = *s; + c_is_no_print = (c & 0x80) && !Isprint(c); + if (c_is_no_print) { + strcpy(d, ESC_NORM_TEXT); + d += sizeof(ESC_NORM_TEXT)-1; + c = '.'; + } + if (c < ' ' || c == 0x7f) { + *d++ = '^'; + c |= '@'; // 0x40 + if (c == 0x7f) + c = '?'; + } + *d++ = c; + *d = '\0'; + if (c_is_no_print) { + strcpy(d, ESC_BOLD_TEXT); + d += sizeof(ESC_BOLD_TEXT)-1; + } + if (*s == '\n') { + *d++ = '$'; + *d = '\0'; + } + if (d - buf > MAX_INPUT_LEN - 10) // paranoia + break; } - // search for the compiled pattern, preg, in p[] - // range < 0: search backward - // range > 0: search forward - // 0 < start < size - // re_search() < 0: not found or error - // re_search() >= 0: index of found pattern - // struct pattern char int int int struct reg - // re_search(*pattern_buffer, *string, size, start, range, *regs) - i = re_search(&preg, q, size, /*start:*/ 0, range, /*struct re_registers*:*/ NULL); - regfree(&preg); - if (i < 0) - return NULL; - if (dir_and_range > 0) // FORWARD? - p = p + i; - else - p = p - i; - return p; } -# else - -# if ENABLE_FEATURE_VI_SETOPTS -static int mycmp(const char *s1, const char *s2, int len) +static void not_implemented(const char *s) { - if (ignorecase) { - return strncasecmp(s1, s2, len); - } - return strncmp(s1, s2, len); + char buf[MAX_INPUT_LEN]; + + print_literal(buf, s); + status_line_bold("\'%s\' is not implemented", buf); } -# else -# define mycmp strncmp -# endif -static char *char_search(char *p, const char *pat, int dir_and_range) +#if ENABLE_FEATURE_VI_YANKMARK +static char *text_yank(char *p, char *q, int dest) // copy text into a register { - char *start, *stop; - int len; - int range; - - len = strlen(pat); - range = (dir_and_range & 1); - if (dir_and_range > 0) { //FORWARD? - stop = end - 1; // assume range is p..end-1 - if (range == LIMITED) - stop = next_line(p); // range is to next line - for (start = p; start < stop; start++) { - if (mycmp(start, pat, len) == 0) { - return start; - } - } - } else { //BACK - stop = text; // assume range is text..p - if (range == LIMITED) - stop = prev_line(p); // range is to prev line - for (start = p - len; start >= stop; start--) { - if (mycmp(start, pat, len) == 0) { - return start; - } - } + int cnt = q - p; + if (cnt < 0) { // they are backwards- reverse them + p = q; + cnt = -cnt; } - // pattern not found - return NULL; + free(reg[dest]); // if already a yank register, free it + reg[dest] = xstrndup(p, cnt + 1); + return p; } -# endif +static char what_reg(void) +{ + char c; -#endif /* FEATURE_VI_SEARCH */ + c = 'D'; // default to D-reg + if (0 <= YDreg && YDreg <= 25) + c = 'a' + (char) YDreg; + if (YDreg == 26) + c = 'D'; + if (YDreg == 27) + c = 'U'; + return c; +} -static char *char_insert(char *p, char c, int undo) // insert the char c at 'p' +static void check_context(char cmd) { - if (c == 22) { // Is this an ctrl-V? - p += stupid_insert(p, '^'); // use ^ to indicate literal next - refresh(FALSE); // show the ^ - c = get_one_char(); - *p = c; -#if ENABLE_FEATURE_VI_UNDO - undo_push_insert(p, 1, undo); -#else - modified_count++; -#endif /* ENABLE_FEATURE_VI_UNDO */ - p++; - } else if (c == 27) { // Is this an ESC? - cmd_mode = 0; - undo_queue_commit(); - cmdcnt = 0; - end_cmd_q(); // stop adding to q - last_status_cksum = 0; // force status update - if ((p[-1] != '\n') && (dot > text)) { - p--; - } - } else if (c == erase_char || c == 8 || c == 127) { // Is this a BS - if (p > text) { - p--; - p = text_hole_delete(p, p, ALLOW_UNDO_QUEUED); // shrink buffer 1 char - } - } else { - // insert a char into text[] - if (c == 13) - c = '\n'; // translate \r to \n -#if ENABLE_FEATURE_VI_UNDO -# if ENABLE_FEATURE_VI_UNDO_QUEUE - if (c == '\n') - undo_queue_commit(); -# endif - undo_push_insert(p, 1, undo); -#else - modified_count++; -#endif /* ENABLE_FEATURE_VI_UNDO */ - p += 1 + stupid_insert(p, c); // insert the char -#if ENABLE_FEATURE_VI_SETOPTS - if (showmatch && strchr(")]}", c) != NULL) { - showmatching(p - 1); - } - if (autoindent && c == '\n') { // auto indent the new line - char *q; - size_t len; - q = prev_line(p); // use prev line as template - len = strspn(q, " \t"); // space or tab - if (len) { - uintptr_t bias; - bias = text_hole_make(p, len); - p += bias; - q += bias; -#if ENABLE_FEATURE_VI_UNDO - undo_push_insert(p, len, undo); -#endif - memcpy(p, q, len); - p += len; - } + // A context is defined to be "modifying text" + // Any modifying command establishes a new context. + + if (dot < context_start || dot > context_end) { + if (strchr(modifying_cmds, cmd) != NULL) { + // we are trying to modify text[]- make this the current context + mark[27] = mark[26]; // move cur to prev + mark[26] = dot; // move local to cur + context_start = prev_line(prev_line(dot)); + context_end = next_line(next_line(dot)); + //loiter= start_loiter= now; } -#endif } - return p; } -// might reallocate text[]! use p += stupid_insert(p, ...), -// and be careful to not use pointers into potentially freed text[]! -static uintptr_t stupid_insert(char *p, char c) // stupidly insert the char c at 'p' +static char *swap_context(char *p) // goto new context for '' command make this the current context { - uintptr_t bias; - bias = text_hole_make(p, 1); - p += bias; - *p = c; - return bias; + char *tmp; + + // the current context is in mark[26] + // the previous context is in mark[27] + // only swap context if other context is valid + if (text <= mark[27] && mark[27] <= end - 1) { + tmp = mark[27]; + mark[27] = p; + mark[26] = p = tmp; + context_start = prev_line(prev_line(prev_line(p))); + context_end = next_line(next_line(next_line(p))); + } + return p; } +#endif /* FEATURE_VI_YANKMARK */ -static int st_test(char *p, int type, int dir, char *tested) -{ - char c, c0, ci; - int test, inc; +#if ENABLE_FEATURE_VI_UNDO +static void undo_push(char *, unsigned, unsigned char); +#endif - inc = dir; - c = c0 = p[0]; - ci = p[inc]; - test = 0; +// open a hole in text[] +// might reallocate text[]! use p += text_hole_make(p, ...), +// and be careful to not use pointers into potentially freed text[]! +static uintptr_t text_hole_make(char *p, int size) // at "p", make a 'size' byte hole +{ + uintptr_t bias = 0; - if (type == S_BEFORE_WS) { - c = ci; - test = (!isspace(c) || c == '\n'); - } - if (type == S_TO_WS) { - c = c0; - test = (!isspace(c) || c == '\n'); - } - if (type == S_OVER_WS) { - c = c0; - test = isspace(c); - } - if (type == S_END_PUNCT) { - c = ci; - test = ispunct(c); - } - if (type == S_END_ALNUM) { - c = ci; - test = (isalnum(c) || c == '_'); + if (size <= 0) + return bias; + end += size; // adjust the new END + if (end >= (text + text_size)) { + char *new_text; + text_size += end - (text + text_size) + 10240; + new_text = xrealloc(text, text_size); + bias = (new_text - text); + screenbegin += bias; + dot += bias; + end += bias; + p += bias; +#if ENABLE_FEATURE_VI_YANKMARK + { + int i; + for (i = 0; i < ARRAY_SIZE(mark); i++) + if (mark[i]) + mark[i] += bias; + } +#endif + text = new_text; } - *tested = c; - return test; + memmove(p + size, p, end - size - p); + memset(p, ' ', size); // clear new hole + return bias; } -static char *skip_thing(char *p, int linecnt, int dir, int type) +// close a hole in text[] - delete "p" through "q", inclusive +// "undo" value indicates if this operation should be undo-able +#if !ENABLE_FEATURE_VI_UNDO +#define text_hole_delete(a,b,c) text_hole_delete(a,b) +#endif +static char *text_hole_delete(char *p, char *q, int undo) { - char c; + char *src, *dest; + int cnt, hole_size; - while (st_test(p, type, dir, &c)) { - // make sure we limit search to correct number of lines - if (c == '\n' && --linecnt < 1) + // move forwards, from beginning + // assume p <= q + src = q + 1; + dest = p; + if (q < p) { // they are backward- swap them + src = p + 1; + dest = q; + } + hole_size = q - p + 1; + cnt = end - src; +#if ENABLE_FEATURE_VI_UNDO + switch (undo) { + case NO_UNDO: break; - if (dir >= 0 && p >= end - 1) + case ALLOW_UNDO: + undo_push(p, hole_size, UNDO_DEL); break; - if (dir < 0 && p <= text) + case ALLOW_UNDO_CHAIN: + undo_push(p, hole_size, UNDO_DEL_CHAIN); break; - p += dir; // move to next char +# if ENABLE_FEATURE_VI_UNDO_QUEUE + case ALLOW_UNDO_QUEUED: + undo_push(p, hole_size, UNDO_DEL_QUEUED); + break; +# endif } - return p; + modified_count--; +#endif + if (src < text || src > end) + goto thd0; + if (dest < text || dest >= end) + goto thd0; + modified_count++; + if (src >= end) + goto thd_atend; // just delete the end of the buffer + memmove(dest, src, cnt); + thd_atend: + end = end - hole_size; // adjust the new END + if (dest >= end) + dest = end - 1; // make sure dest in below end-1 + if (end <= text) + dest = end = text; // keep pointers valid + thd0: + return dest; } -// find matching char of pair () [] {} -// will crash if c is not one of these -static char *find_pair(char *p, const char c) -{ - const char *braces = "()[]{}"; - char match; - int dir, level; - - dir = strchr(braces, c) - braces; - dir ^= 1; - match = braces[dir]; - dir = ((dir & 1) << 1) - 1; // 1 for ([{, -1 for )\} +#if ENABLE_FEATURE_VI_UNDO - // look for match, count levels of pairs (( )) - level = 1; - for (;;) { - p += dir; - if (p < text || p >= end) - return NULL; - if (*p == c) - level++; // increase pair levels - if (*p == match) { - level--; // reduce pair level - if (level == 0) - return p; // found matching pair - } +# if ENABLE_FEATURE_VI_UNDO_QUEUE +// Flush any queued objects to the undo stack +static void undo_queue_commit(void) +{ + // Pushes the queue object onto the undo stack + if (undo_q > 0) { + // Deleted character undo events grow from the end + undo_push(undo_queue + CONFIG_FEATURE_VI_UNDO_QUEUE_MAX - undo_q, + undo_q, + (undo_queue_state | UNDO_USE_SPOS) + ); + undo_queue_state = UNDO_EMPTY; + undo_q = 0; } } +# else +# define undo_queue_commit() ((void)0) +# endif -#if ENABLE_FEATURE_VI_SETOPTS -// show the matching char of a pair, () [] {} -static void showmatching(char *p) +static void flush_undo_data(void) { - char *q, *save_dot; - - // we found half of a pair - q = find_pair(p, *p); // get loc of matching char - if (q == NULL) { - indicate_error(); // no matching char - } else { - // "q" now points to matching pair - save_dot = dot; // remember where we are - dot = q; // go to new loc - refresh(FALSE); // let the user see it - mysleep(40); // give user some time - dot = save_dot; // go back to old loc - refresh(FALSE); - } -} -#endif /* FEATURE_VI_SETOPTS */ - -#if ENABLE_FEATURE_VI_UNDO -static void flush_undo_data(void) -{ - struct undo_object *undo_entry; + struct undo_object *undo_entry; while (undo_stack_tail) { undo_entry = undo_stack_tail; @@ -2085,7 +1503,7 @@ static void undo_push(char *src, unsigned length, uint8_t u_type) // for the INS/DEL operation. The raw values should be equal to the values of // UNDO_{INS,DEL} ORed with UNDO_QUEUED_FLAG -#if ENABLE_FEATURE_VI_UNDO_QUEUE +# if ENABLE_FEATURE_VI_UNDO_QUEUE // This undo queuing functionality groups multiple character typing or backspaces // into a single large undo object. This greatly reduces calls to malloc() for // single-character operations while typing and has the side benefit of letting @@ -2136,10 +1554,10 @@ static void undo_push(char *src, unsigned length, uint8_t u_type) } break; } -#else +# else // If undo queuing is disabled, ignore the queuing flag entirely u_type = u_type & ~UNDO_QUEUED_FLAG; -#endif +# endif // Allocate a new undo object if (u_type == UNDO_DEL || u_type == UNDO_DEL_CHAIN) { @@ -2154,16 +1572,16 @@ static void undo_push(char *src, unsigned length, uint8_t u_type) undo_entry = xzalloc(sizeof(*undo_entry)); } undo_entry->length = length; -#if ENABLE_FEATURE_VI_UNDO_QUEUE +# if ENABLE_FEATURE_VI_UNDO_QUEUE if ((u_type & UNDO_USE_SPOS) != 0) { undo_entry->start = undo_queue_spos - text; // use start position from queue } else { undo_entry->start = src - text; // use offset from start of text buffer } u_type = (u_type & ~UNDO_USE_SPOS); -#else +# else undo_entry->start = src - text; -#endif +# endif undo_entry->u_type = u_type; // Push it on undo stack @@ -2253,115 +1671,145 @@ static void undo_pop(void) } } -#if ENABLE_FEATURE_VI_UNDO_QUEUE -// Flush any queued objects to the undo stack -static void undo_queue_commit(void) +#else +# define flush_undo_data() ((void)0) +# define undo_queue_commit() ((void)0) +#endif /* ENABLE_FEATURE_VI_UNDO */ + +//----- Dot Movement Routines ---------------------------------- +static void dot_left(void) { - // Pushes the queue object onto the undo stack - if (undo_q > 0) { - // Deleted character undo events grow from the end - undo_push(undo_queue + CONFIG_FEATURE_VI_UNDO_QUEUE_MAX - undo_q, - undo_q, - (undo_queue_state | UNDO_USE_SPOS) - ); - undo_queue_state = UNDO_EMPTY; - undo_q = 0; + undo_queue_commit(); + if (dot > text && dot[-1] != '\n') + dot--; +} + +static void dot_right(void) +{ + undo_queue_commit(); + if (dot < end - 1 && *dot != '\n') + dot++; +} + +static void dot_begin(void) +{ + undo_queue_commit(); + dot = begin_line(dot); // return pointer to first char cur line +} + +static void dot_end(void) +{ + undo_queue_commit(); + dot = end_line(dot); // return pointer to last char cur line +} + +static char *move_to_col(char *p, int l) +{ + int co; + + p = begin_line(p); + co = 0; + while (co < l && p < end) { + if (*p == '\n') //vda || *p == '\0') + break; + if (*p == '\t') { + co = next_tabstop(co); + } else if (*p < ' ' || *p == 127) { + co++; // display as ^X, use 2 columns + } + co++; + p++; } + return p; } -#endif -#endif /* ENABLE_FEATURE_VI_UNDO */ +static void dot_next(void) +{ + undo_queue_commit(); + dot = next_line(dot); +} -// open a hole in text[] -// might reallocate text[]! use p += text_hole_make(p, ...), -// and be careful to not use pointers into potentially freed text[]! -static uintptr_t text_hole_make(char *p, int size) // at "p", make a 'size' byte hole +static void dot_prev(void) { - uintptr_t bias = 0; + undo_queue_commit(); + dot = prev_line(dot); +} - if (size <= 0) - return bias; - end += size; // adjust the new END - if (end >= (text + text_size)) { - char *new_text; - text_size += end - (text + text_size) + 10240; - new_text = xrealloc(text, text_size); - bias = (new_text - text); - screenbegin += bias; - dot += bias; - end += bias; - p += bias; -#if ENABLE_FEATURE_VI_YANKMARK - { - int i; - for (i = 0; i < ARRAY_SIZE(mark); i++) - if (mark[i]) - mark[i] += bias; +static void dot_skip_over_ws(void) +{ + // skip WS + while (isspace(*dot) && *dot != '\n' && dot < end - 1) + dot++; +} + +static void dot_scroll(int cnt, int dir) +{ + char *q; + + undo_queue_commit(); + for (; cnt > 0; cnt--) { + if (dir < 0) { + // scroll Backwards + // ctrl-Y scroll up one line + screenbegin = prev_line(screenbegin); + } else { + // scroll Forwards + // ctrl-E scroll down one line + screenbegin = next_line(screenbegin); } -#endif - text = new_text; } - memmove(p + size, p, end - size - p); - memset(p, ' ', size); // clear new hole - return bias; + // make sure "dot" stays on the screen so we dont scroll off + if (dot < screenbegin) + dot = screenbegin; + q = end_screen(); // find new bottom line + if (dot > q) + dot = begin_line(q); // is dot is below bottom line? + dot_skip_over_ws(); } -// close a hole in text[] -// "undo" value indicates if this operation should be undo-able -static char *text_hole_delete(char *p, char *q, int undo) // delete "p" through "q", inclusive +static char *bound_dot(char *p) // make sure text[0] <= P < "end" { - char *src, *dest; - int cnt, hole_size; + if (p >= end && end > text) { + p = end - 1; + indicate_error(); + } + if (p < text) { + p = text; + indicate_error(); + } + return p; +} - // move forwards, from beginning - // assume p <= q - src = q + 1; - dest = p; - if (q < p) { // they are backward- swap them - src = p + 1; - dest = q; +#if ENABLE_FEATURE_VI_DOT_CMD +static void start_new_cmd_q(char c) +{ + // get buffer for new cmd + // if there is a current cmd count put it in the buffer first + if (cmdcnt > 0) { + lmc_len = sprintf(last_modifying_cmd, "%d%c", cmdcnt, c); + } else { // just save char c onto queue + last_modifying_cmd[0] = c; + lmc_len = 1; } - hole_size = q - p + 1; - cnt = end - src; -#if ENABLE_FEATURE_VI_UNDO - switch (undo) { - case NO_UNDO: - break; - case ALLOW_UNDO: - undo_push(p, hole_size, UNDO_DEL); - break; - case ALLOW_UNDO_CHAIN: - undo_push(p, hole_size, UNDO_DEL_CHAIN); - break; -# if ENABLE_FEATURE_VI_UNDO_QUEUE - case ALLOW_UNDO_QUEUED: - undo_push(p, hole_size, UNDO_DEL_QUEUED); - break; + adding2q = 1; +} +static void end_cmd_q(void) +{ +# if ENABLE_FEATURE_VI_YANKMARK + YDreg = 26; // go back to default Yank/Delete reg # endif - } - modified_count--; -#endif - if (src < text || src > end) - goto thd0; - if (dest < text || dest >= end) - goto thd0; - modified_count++; - if (src >= end) - goto thd_atend; // just delete the end of the buffer - memmove(dest, src, cnt); - thd_atend: - end = end - hole_size; // adjust the new END - if (dest >= end) - dest = end - 1; // make sure dest in below end-1 - if (end <= text) - dest = end = text; // keep pointers valid - thd0: - return dest; + adding2q = 0; } +#else +# define end_cmd_q() ((void)0) +#endif /* FEATURE_VI_DOT_CMD */ // copy text into register, then delete text. // if dist <= 0, do not include, or go past, a NewLine // +#if !ENABLE_FEATURE_VI_UNDO +#define yank_delete(a,b,c,d,e) yank_delete(a,b,c,d) +#endif static char *yank_delete(char *start, char *stop, int dist, int yf, int undo) { char *p; @@ -2396,226 +1844,12 @@ static char *yank_delete(char *start, char *stop, int dist, int yf, int undo) return p; } -#if ENABLE_FEATURE_VI_DOT_CMD -static void start_new_cmd_q(char c) +// might reallocate text[]! +static int file_insert(const char *fn, char *p, int initial) { - // get buffer for new cmd - // if there is a current cmd count put it in the buffer first - if (cmdcnt > 0) { - lmc_len = sprintf(last_modifying_cmd, "%d%c", cmdcnt, c); - } else { // just save char c onto queue - last_modifying_cmd[0] = c; - lmc_len = 1; - } - adding2q = 1; -} - -static void end_cmd_q(void) -{ -#if ENABLE_FEATURE_VI_YANKMARK - YDreg = 26; // go back to default Yank/Delete reg -#endif - adding2q = 0; -} -#endif /* FEATURE_VI_DOT_CMD */ - -#if ENABLE_FEATURE_VI_YANKMARK \ - || (ENABLE_FEATURE_VI_COLON && ENABLE_FEATURE_VI_SEARCH) \ - || ENABLE_FEATURE_VI_CRASHME -// might reallocate text[]! use p += string_insert(p, ...), -// and be careful to not use pointers into potentially freed text[]! -static uintptr_t string_insert(char *p, const char *s, int undo) // insert the string at 'p' -{ - uintptr_t bias; - int i; - - i = strlen(s); -#if ENABLE_FEATURE_VI_UNDO - undo_push_insert(p, i, undo); -#endif - bias = text_hole_make(p, i); - p += bias; - memcpy(p, s, i); -#if ENABLE_FEATURE_VI_YANKMARK - { - int cnt; - for (cnt = 0; *s != '\0'; s++) { - if (*s == '\n') - cnt++; - } - status_line("Put %d lines (%d chars) from [%c]", cnt, i, what_reg()); - } -#endif - return bias; -} -#endif - -#if ENABLE_FEATURE_VI_YANKMARK -static char *text_yank(char *p, char *q, int dest) // copy text into a register -{ - int cnt = q - p; - if (cnt < 0) { // they are backwards- reverse them - p = q; - cnt = -cnt; - } - free(reg[dest]); // if already a yank register, free it - reg[dest] = xstrndup(p, cnt + 1); - return p; -} - -static char what_reg(void) -{ - char c; - - c = 'D'; // default to D-reg - if (0 <= YDreg && YDreg <= 25) - c = 'a' + (char) YDreg; - if (YDreg == 26) - c = 'D'; - if (YDreg == 27) - c = 'U'; - return c; -} - -static void check_context(char cmd) -{ - // A context is defined to be "modifying text" - // Any modifying command establishes a new context. - - if (dot < context_start || dot > context_end) { - if (strchr(modifying_cmds, cmd) != NULL) { - // we are trying to modify text[]- make this the current context - mark[27] = mark[26]; // move cur to prev - mark[26] = dot; // move local to cur - context_start = prev_line(prev_line(dot)); - context_end = next_line(next_line(dot)); - //loiter= start_loiter= now; - } - } -} - -static char *swap_context(char *p) // goto new context for '' command make this the current context -{ - char *tmp; - - // the current context is in mark[26] - // the previous context is in mark[27] - // only swap context if other context is valid - if (text <= mark[27] && mark[27] <= end - 1) { - tmp = mark[27]; - mark[27] = p; - mark[26] = p = tmp; - context_start = prev_line(prev_line(prev_line(p))); - context_end = next_line(next_line(next_line(p))); - } - return p; -} -#endif /* FEATURE_VI_YANKMARK */ - -//----- IO Routines -------------------------------------------- -static int readit(void) // read (maybe cursor) key from stdin -{ - int c; - - fflush_all(); - - // Wait for input. TIMEOUT = -1 makes read_key wait even - // on nonblocking stdin. - // Note: read_key sets errno to 0 on success. - again: - c = read_key(STDIN_FILENO, readbuffer, /*timeout:*/ -1); - if (c == -1) { // EOF/error - if (errno == EAGAIN) // paranoia - goto again; - go_bottom_and_clear_to_eol(); - cookmode(); // terminal to "cooked" - bb_error_msg_and_die("can't read user input"); - } - return c; -} - -//----- IO Routines -------------------------------------------- -static int get_one_char(void) -{ - int c; - -#if ENABLE_FEATURE_VI_DOT_CMD - if (!adding2q) { - // we are not adding to the q. - // but, we may be reading from a q - if (ioq == 0) { - // there is no current q, read from STDIN - c = readit(); // get the users input - } else { - // there is a queue to get chars from first - // careful with correct sign expansion! - c = (unsigned char)*ioq++; - if (c == '\0') { - // the end of the q, read from STDIN - free(ioq_start); - ioq_start = ioq = 0; - c = readit(); // get the users input - } - } - } else { - // adding STDIN chars to q - c = readit(); // get the users input - if (lmc_len >= MAX_INPUT_LEN - 1) { - status_line_bold("last_modifying_cmd overrun"); - } else { - // add new char to q - last_modifying_cmd[lmc_len++] = c; - } - } -#else - c = readit(); // get the users input -#endif /* FEATURE_VI_DOT_CMD */ - return c; -} - -// Get input line (uses "status line" area) -static char *get_input_line(const char *prompt) -{ - // char [MAX_INPUT_LEN] -#define buf get_input_line__buf - - int c; - int i; - - strcpy(buf, prompt); - last_status_cksum = 0; // force status update - go_bottom_and_clear_to_eol(); - write1(prompt); // write out the :, /, or ? prompt - - i = strlen(buf); - while (i < MAX_INPUT_LEN) { - c = get_one_char(); - if (c == '\n' || c == '\r' || c == 27) - break; // this is end of input - if (c == erase_char || c == 8 || c == 127) { - // user wants to erase prev char - buf[--i] = '\0'; - write1("\b \b"); // erase char on screen - if (i <= 0) // user backs up before b-o-l, exit - break; - } else if (c > 0 && c < 256) { // exclude Unicode - // (TODO: need to handle Unicode) - buf[i] = c; - buf[++i] = '\0'; - bb_putchar(c); - } - } - refresh(FALSE); - return buf; -#undef buf -} - -// might reallocate text[]! -static int file_insert(const char *fn, char *p, int initial) -{ - int cnt = -1; - int fd, size; - struct stat statbuf; + int cnt = -1; + int fd, size; + struct stat statbuf; if (p < text) p = text; @@ -2666,399 +1900,1064 @@ static int file_insert(const char *fn, char *p, int initial) return cnt; } -static int file_write(char *fn, char *first, char *last) +// find matching char of pair () [] {} +// will crash if c is not one of these +static char *find_pair(char *p, const char c) { - int fd, cnt, charcnt; + const char *braces = "()[]{}"; + char match; + int dir, level; - if (fn == 0) { - status_line_bold("No current filename"); - return -2; - } - // By popular request we do not open file with O_TRUNC, - // but instead ftruncate() it _after_ successful write. - // Might reduce amount of data lost on power fail etc. - fd = open(fn, (O_WRONLY | O_CREAT), 0666); - if (fd < 0) - return -1; - cnt = last - first + 1; - charcnt = full_write(fd, first, cnt); - ftruncate(fd, charcnt); - if (charcnt == cnt) { - // good write - //modified_count = FALSE; - } else { - charcnt = 0; + dir = strchr(braces, c) - braces; + dir ^= 1; + match = braces[dir]; + dir = ((dir & 1) << 1) - 1; // 1 for ([{, -1 for )\} + + // look for match, count levels of pairs (( )) + level = 1; + for (;;) { + p += dir; + if (p < text || p >= end) + return NULL; + if (*p == c) + level++; // increase pair levels + if (*p == match) { + level--; // reduce pair level + if (level == 0) + return p; // found matching pair + } } - close(fd); - return charcnt; } -//----- Flash the screen -------------------------------------- -static void flash(int h) +#if ENABLE_FEATURE_VI_SETOPTS +// show the matching char of a pair, () [] {} +static void showmatching(char *p) { - standout_start(); - redraw(TRUE); - mysleep(h); - standout_end(); - redraw(TRUE); + char *q, *save_dot; + + // we found half of a pair + q = find_pair(p, *p); // get loc of matching char + if (q == NULL) { + indicate_error(); // no matching char + } else { + // "q" now points to matching pair + save_dot = dot; // remember where we are + dot = q; // go to new loc + refresh(FALSE); // let the user see it + mysleep(40); // give user some time + dot = save_dot; // go back to old loc + refresh(FALSE); + } } +#endif /* FEATURE_VI_SETOPTS */ -static void indicate_error(void) +// might reallocate text[]! use p += stupid_insert(p, ...), +// and be careful to not use pointers into potentially freed text[]! +static uintptr_t stupid_insert(char *p, char c) // stupidly insert the char c at 'p' { -#if ENABLE_FEATURE_VI_CRASHME - if (crashme > 0) - return; + uintptr_t bias; + bias = text_hole_make(p, 1); + p += bias; + *p = c; + return bias; +} + +#if !ENABLE_FEATURE_VI_UNDO +#define char_insert(a,b,c) char_insert(a,b) #endif - if (!err_method) { - write1(ESC_BELL); +static char *char_insert(char *p, char c, int undo) // insert the char c at 'p' +{ + if (c == 22) { // Is this an ctrl-V? + p += stupid_insert(p, '^'); // use ^ to indicate literal next + refresh(FALSE); // show the ^ + c = get_one_char(); + *p = c; +#if ENABLE_FEATURE_VI_UNDO + undo_push_insert(p, 1, undo); +#else + modified_count++; +#endif /* ENABLE_FEATURE_VI_UNDO */ + p++; + } else if (c == 27) { // Is this an ESC? + cmd_mode = 0; + undo_queue_commit(); + cmdcnt = 0; + end_cmd_q(); // stop adding to q + last_status_cksum = 0; // force status update + if ((p[-1] != '\n') && (dot > text)) { + p--; + } + } else if (c == erase_char || c == 8 || c == 127) { // Is this a BS + if (p > text) { + p--; + p = text_hole_delete(p, p, ALLOW_UNDO_QUEUED); // shrink buffer 1 char + } } else { - flash(10); + // insert a char into text[] + if (c == 13) + c = '\n'; // translate \r to \n +#if ENABLE_FEATURE_VI_UNDO +# if ENABLE_FEATURE_VI_UNDO_QUEUE + if (c == '\n') + undo_queue_commit(); +# endif + undo_push_insert(p, 1, undo); +#else + modified_count++; +#endif /* ENABLE_FEATURE_VI_UNDO */ + p += 1 + stupid_insert(p, c); // insert the char +#if ENABLE_FEATURE_VI_SETOPTS + if (showmatch && strchr(")]}", c) != NULL) { + showmatching(p - 1); + } + if (autoindent && c == '\n') { // auto indent the new line + char *q; + size_t len; + q = prev_line(p); // use prev line as template + len = strspn(q, " \t"); // space or tab + if (len) { + uintptr_t bias; + bias = text_hole_make(p, len); + p += bias; + q += bias; +#if ENABLE_FEATURE_VI_UNDO + undo_push_insert(p, len, undo); +#endif + memcpy(p, q, len); + p += len; + } + } +#endif } + return p; } -static int bufsum(char *buf, int count) +// read text from file or create an empty buf +// will also update current_filename +static int init_text_buffer(char *fn) { - int sum = 0; - char *e = buf + count; + int rc; - while (buf < e) - sum += (unsigned char) *buf++; - return sum; + // allocate/reallocate text buffer + free(text); + text_size = 10240; + screenbegin = dot = end = text = xzalloc(text_size); + + if (fn != current_filename) { + free(current_filename); + current_filename = xstrdup(fn); + } + rc = file_insert(fn, text, 1); + if (rc < 0) { + // file doesnt exist. Start empty buf with dummy line + char_insert(text, '\n', NO_UNDO); + } + + flush_undo_data(); + modified_count = 0; + last_modified_count = -1; +#if ENABLE_FEATURE_VI_YANKMARK + // init the marks + memset(mark, 0, sizeof(mark)); +#endif + return rc; } -//----- Draw the status line at bottom of the screen ------------- -static void show_status_line(void) +#if ENABLE_FEATURE_VI_YANKMARK \ + || (ENABLE_FEATURE_VI_COLON && ENABLE_FEATURE_VI_SEARCH) \ + || ENABLE_FEATURE_VI_CRASHME +// might reallocate text[]! use p += string_insert(p, ...), +// and be careful to not use pointers into potentially freed text[]! +# if !ENABLE_FEATURE_VI_UNDO +# define string_insert(a,b,c) string_insert(a,b) +# endif +static uintptr_t string_insert(char *p, const char *s, int undo) // insert the string at 'p' { - int cnt = 0, cksum = 0; + uintptr_t bias; + int i; - // either we already have an error or status message, or we - // create one. - if (!have_status_msg) { - cnt = format_edit_status(); - cksum = bufsum(status_buffer, cnt); + i = strlen(s); +#if ENABLE_FEATURE_VI_UNDO + undo_push_insert(p, i, undo); +#endif + bias = text_hole_make(p, i); + p += bias; + memcpy(p, s, i); +#if ENABLE_FEATURE_VI_YANKMARK + { + int cnt; + for (cnt = 0; *s != '\0'; s++) { + if (*s == '\n') + cnt++; + } + status_line("Put %d lines (%d chars) from [%c]", cnt, i, what_reg()); } - if (have_status_msg || ((cnt > 0 && last_status_cksum != cksum))) { - last_status_cksum = cksum; // remember if we have seen this line - go_bottom_and_clear_to_eol(); - write1(status_buffer); - if (have_status_msg) { - if (((int)strlen(status_buffer) - (have_status_msg - 1)) > - (columns - 1) ) { - have_status_msg = 0; - Hit_Return(); +#endif + return bias; +} +#endif + +static int file_write(char *fn, char *first, char *last) +{ + int fd, cnt, charcnt; + + if (fn == 0) { + status_line_bold("No current filename"); + return -2; + } + // By popular request we do not open file with O_TRUNC, + // but instead ftruncate() it _after_ successful write. + // Might reduce amount of data lost on power fail etc. + fd = open(fn, (O_WRONLY | O_CREAT), 0666); + if (fd < 0) + return -1; + cnt = last - first + 1; + charcnt = full_write(fd, first, cnt); + ftruncate(fd, charcnt); + if (charcnt == cnt) { + // good write + //modified_count = FALSE; + } else { + charcnt = 0; + } + close(fd); + return charcnt; +} + +#if ENABLE_FEATURE_VI_SEARCH +# if ENABLE_FEATURE_VI_REGEX_SEARCH +// search for pattern starting at p +static char *char_search(char *p, const char *pat, int dir_and_range) +{ + struct re_pattern_buffer preg; + const char *err; + char *q; + int i; + int size; + int range; + + re_syntax_options = RE_SYNTAX_POSIX_EXTENDED; + if (ignorecase) + re_syntax_options = RE_SYNTAX_POSIX_EXTENDED | RE_ICASE; + + memset(&preg, 0, sizeof(preg)); + err = re_compile_pattern(pat, strlen(pat), &preg); + if (err != NULL) { + status_line_bold("bad search pattern '%s': %s", pat, err); + return p; + } + + range = (dir_and_range & 1); + q = end - 1; // if FULL + if (range == LIMITED) + q = next_line(p); + if (dir_and_range < 0) { // BACK? + q = text; + if (range == LIMITED) + q = prev_line(p); + } + + // RANGE could be negative if we are searching backwards + range = q - p; + q = p; + size = range; + if (range < 0) { + size = -size; + q = p - size; + if (q < text) + q = text; + } + // search for the compiled pattern, preg, in p[] + // range < 0: search backward + // range > 0: search forward + // 0 < start < size + // re_search() < 0: not found or error + // re_search() >= 0: index of found pattern + // struct pattern char int int int struct reg + // re_search(*pattern_buffer, *string, size, start, range, *regs) + i = re_search(&preg, q, size, /*start:*/ 0, range, /*struct re_registers*:*/ NULL); + regfree(&preg); + if (i < 0) + return NULL; + if (dir_and_range > 0) // FORWARD? + p = p + i; + else + p = p - i; + return p; +} +# else +# if ENABLE_FEATURE_VI_SETOPTS +static int mycmp(const char *s1, const char *s2, int len) +{ + if (ignorecase) { + return strncasecmp(s1, s2, len); + } + return strncmp(s1, s2, len); +} +# else +# define mycmp strncmp +# endif +static char *char_search(char *p, const char *pat, int dir_and_range) +{ + char *start, *stop; + int len; + int range; + + len = strlen(pat); + range = (dir_and_range & 1); + if (dir_and_range > 0) { //FORWARD? + stop = end - 1; // assume range is p..end-1 + if (range == LIMITED) + stop = next_line(p); // range is to next line + for (start = p; start < stop; start++) { + if (mycmp(start, pat, len) == 0) { + return start; + } + } + } else { //BACK + stop = text; // assume range is text..p + if (range == LIMITED) + stop = prev_line(p); // range is to prev line + for (start = p - len; start >= stop; start--) { + if (mycmp(start, pat, len) == 0) { + return start; + } + } + } + // pattern not found + return NULL; +} +# endif +#endif /* FEATURE_VI_SEARCH */ + +//----- The Colon commands ------------------------------------- +#if ENABLE_FEATURE_VI_COLON +static char *get_one_address(char *p, int *addr) // get colon addr, if present +{ + int st; + char *q; + IF_FEATURE_VI_YANKMARK(char c;) + IF_FEATURE_VI_SEARCH(char *pat;) + + *addr = -1; // assume no addr + if (*p == '.') { // the current line + p++; + q = begin_line(dot); + *addr = count_lines(text, q); + } +#if ENABLE_FEATURE_VI_YANKMARK + else if (*p == '\'') { // is this a mark addr + p++; + c = tolower(*p); + p++; + if (c >= 'a' && c <= 'z') { + // we have a mark + c = c - 'a'; + q = mark[(unsigned char) c]; + if (q != NULL) { // is mark valid + *addr = count_lines(text, q); + } + } + } +#endif +#if ENABLE_FEATURE_VI_SEARCH + else if (*p == '/') { // a search pattern + q = strchrnul(++p, '/'); + pat = xstrndup(p, q - p); // save copy of pattern + p = q; + if (*p == '/') + p++; + q = char_search(dot, pat, (FORWARD << 1) | FULL); + if (q != NULL) { + *addr = count_lines(text, q); + } + free(pat); + } +#endif + else if (*p == '$') { // the last line in file + p++; + q = begin_line(end - 1); + *addr = count_lines(text, q); + } else if (isdigit(*p)) { // specific line number + sscanf(p, "%d%n", addr, &st); + p += st; + } else { + // unrecognized address - assume -1 + *addr = -1; + } + return p; +} + +static char *get_address(char *p, int *b, int *e) // get two colon addrs, if present +{ + //----- get the address' i.e., 1,3 'a,'b ----- + // get FIRST addr, if present + while (isblank(*p)) + p++; // skip over leading spaces + if (*p == '%') { // alias for 1,$ + p++; + *b = 1; + *e = count_lines(text, end-1); + goto ga0; + } + p = get_one_address(p, b); + while (isblank(*p)) + p++; + if (*p == ',') { // is there a address separator + p++; + while (isblank(*p)) + p++; + // get SECOND addr, if present + p = get_one_address(p, e); + } + ga0: + while (isblank(*p)) + p++; // skip over trailing spaces + return p; +} + +#if ENABLE_FEATURE_VI_SET && ENABLE_FEATURE_VI_SETOPTS +static void setops(const char *args, const char *opname, int flg_no, + const char *short_opname, int opt) +{ + const char *a = args + flg_no; + int l = strlen(opname) - 1; // opname have + ' ' + + // maybe strncmp? we had tons of erroneous strncasecmp's... + if (strncasecmp(a, opname, l) == 0 + || strncasecmp(a, short_opname, 2) == 0 + ) { + if (flg_no) + vi_setops &= ~opt; + else + vi_setops |= opt; + } +} +#endif + +#endif /* FEATURE_VI_COLON */ + +// buf must be no longer than MAX_INPUT_LEN! +static void colon(char *buf) +{ +#if !ENABLE_FEATURE_VI_COLON + // Simple ":cmd" handler with minimal set of commands + char *p = buf; + int cnt; + + if (*p == ':') + p++; + cnt = strlen(p); + if (cnt == 0) + return; + if (strncmp(p, "quit", cnt) == 0 + || strncmp(p, "q!", cnt) == 0 + ) { + if (modified_count && p[1] != '!') { + status_line_bold("No write since last change (:%s! overrides)", p); + } else { + editing = 0; + } + return; + } + if (strncmp(p, "write", cnt) == 0 + || strncmp(p, "wq", cnt) == 0 + || strncmp(p, "wn", cnt) == 0 + || (p[0] == 'x' && !p[1]) + ) { + if (modified_count != 0 || p[0] != 'x') { + cnt = file_write(current_filename, text, end - 1); + } + if (cnt < 0) { + if (cnt == -1) + status_line_bold("Write error: "STRERROR_FMT STRERROR_ERRNO); + } else { + modified_count = 0; + last_modified_count = -1; + status_line("'%s' %dL, %dC", + current_filename, + count_lines(text, end - 1), cnt + ); + if (p[0] == 'x' + || p[1] == 'q' || p[1] == 'n' + || p[1] == 'Q' || p[1] == 'N' + ) { + editing = 0; + } + } + return; + } + if (strncmp(p, "file", cnt) == 0) { + last_status_cksum = 0; // force status update + return; + } + if (sscanf(p, "%d", &cnt) > 0) { + dot = find_line(cnt); + dot_skip_over_ws(); + return; + } + not_implemented(p); +#else + + char c, *buf1, *q, *r; + char *fn, cmd[MAX_INPUT_LEN], args[MAX_INPUT_LEN]; + int i, l, li, b, e; + int useforce; +# if ENABLE_FEATURE_VI_SEARCH || ENABLE_FEATURE_ALLOW_EXEC + char *orig_buf; +# endif + + // :3154 // if (-e line 3154) goto it else stay put + // :4,33w! foo // write a portion of buffer to file "foo" + // :w // write all of buffer to current file + // :q // quit + // :q! // quit- dont care about modified file + // :'a,'z!sort -u // filter block through sort + // :'f // goto mark "f" + // :'fl // list literal the mark "f" line + // :.r bar // read file "bar" into buffer before dot + // :/123/,/abc/d // delete lines from "123" line to "abc" line + // :/xyz/ // goto the "xyz" line + // :s/find/replace/ // substitute pattern "find" with "replace" + // :! // run then return + // + + if (!buf[0]) + goto ret; + if (*buf == ':') + buf++; // move past the ':' + + li = i = 0; + b = e = -1; + q = text; // assume 1,$ for the range + r = end - 1; + li = count_lines(text, end - 1); + fn = current_filename; + + // look for optional address(es) :. :1 :1,9 :'q,'a :% + buf = get_address(buf, &b, &e); + +# if ENABLE_FEATURE_VI_SEARCH || ENABLE_FEATURE_ALLOW_EXEC + // remember orig command line + orig_buf = buf; +# endif + + // get the COMMAND into cmd[] + buf1 = cmd; + while (*buf != '\0') { + if (isspace(*buf)) + break; + *buf1++ = *buf++; + } + *buf1 = '\0'; + // get any ARGuments + while (isblank(*buf)) + buf++; + strcpy(args, buf); + useforce = FALSE; + buf1 = last_char_is(cmd, '!'); + if (buf1) { + useforce = TRUE; + *buf1 = '\0'; // get rid of ! + } + if (b >= 0) { + // if there is only one addr, then the addr + // is the line number of the single line the + // user wants. So, reset the end + // pointer to point at end of the "b" line + q = find_line(b); // what line is #b + r = end_line(q); + li = 1; + } + if (e >= 0) { + // we were given two addrs. change the + // end pointer to the addr given by user. + r = find_line(e); // what line is #e + r = end_line(r); + li = e - b + 1; + } + // ------------ now look for the command ------------ + i = strlen(cmd); + if (i == 0) { // :123CR goto line #123 + if (b >= 0) { + dot = find_line(b); // what line is #b + dot_skip_over_ws(); + } + } +# if ENABLE_FEATURE_ALLOW_EXEC + else if (cmd[0] == '!') { // run a cmd + int retcode; + // :!ls run the + go_bottom_and_clear_to_eol(); + cookmode(); + retcode = system(orig_buf + 1); // run the cmd + if (retcode) + printf("\nshell returned %i\n\n", retcode); + rawmode(); + Hit_Return(); // let user see results + } +# endif + else if (cmd[0] == '=' && !cmd[1]) { // where is the address + if (b < 0) { // no addr given- use defaults + b = e = count_lines(text, dot); + } + status_line("%d", b); + } else if (strncmp(cmd, "delete", i) == 0) { // delete lines + if (b < 0) { // no addr given- use defaults + q = begin_line(dot); // assume .,. for the range + r = end_line(dot); + } + dot = yank_delete(q, r, 1, YANKDEL, ALLOW_UNDO); // save, then delete lines + dot_skip_over_ws(); + } else if (strncmp(cmd, "edit", i) == 0) { // Edit a file + int size; + + // don't edit, if the current file has been modified + if (modified_count && !useforce) { + status_line_bold("No write since last change (:%s! overrides)", cmd); + goto ret; + } + if (args[0]) { + // the user supplied a file name + fn = args; + } else if (current_filename && current_filename[0]) { + // no user supplied name- use the current filename + // fn = current_filename; was set by default + } else { + // no user file name, no current name- punt + status_line_bold("No current filename"); + goto ret; + } + + size = init_text_buffer(fn); + +# if ENABLE_FEATURE_VI_YANKMARK + if (Ureg >= 0 && Ureg < 28) { + free(reg[Ureg]); // free orig line reg- for 'U' + reg[Ureg] = NULL; + } + if (YDreg >= 0 && YDreg < 28) { + free(reg[YDreg]); // free default yank/delete register + reg[YDreg] = NULL; + } +# endif + // how many lines in text[]? + li = count_lines(text, end - 1); + status_line("'%s'%s" + IF_FEATURE_VI_READONLY("%s") + " %dL, %dC", + current_filename, + (size < 0 ? " [New file]" : ""), + IF_FEATURE_VI_READONLY( + ((readonly_mode) ? " [Readonly]" : ""), + ) + li, (int)(end - text) + ); + } else if (strncmp(cmd, "file", i) == 0) { // what File is this + if (b != -1 || e != -1) { + status_line_bold("No address allowed on this command"); + goto ret; + } + if (args[0]) { + // user wants a new filename + free(current_filename); + current_filename = xstrdup(args); + } else { + // user wants file status info + last_status_cksum = 0; // force status update + } + } else if (strncmp(cmd, "features", i) == 0) { // what features are available + // print out values of all features + go_bottom_and_clear_to_eol(); + cookmode(); + show_help(); + rawmode(); + Hit_Return(); + } else if (strncmp(cmd, "list", i) == 0) { // literal print line + if (b < 0) { // no addr given- use defaults + q = begin_line(dot); // assume .,. for the range + r = end_line(dot); + } + go_bottom_and_clear_to_eol(); + puts("\r"); + for (; q <= r; q++) { + int c_is_no_print; + + c = *q; + c_is_no_print = (c & 0x80) && !Isprint(c); + if (c_is_no_print) { + c = '.'; + standout_start(); + } + if (c == '\n') { + write1("$\r"); + } else if (c < ' ' || c == 127) { + bb_putchar('^'); + if (c == 127) + c = '?'; + else + c += '@'; + } + bb_putchar(c); + if (c_is_no_print) + standout_end(); + } + Hit_Return(); + } else if (strncmp(cmd, "quit", i) == 0 // quit + || strncmp(cmd, "next", i) == 0 // edit next file + || strncmp(cmd, "prev", i) == 0 // edit previous file + ) { + int n; + if (useforce) { + if (*cmd == 'q') { + // force end of argv list + optind = save_argc; + } + editing = 0; + goto ret; + } + // don't exit if the file been modified + if (modified_count) { + status_line_bold("No write since last change (:%s! overrides)", cmd); + goto ret; + } + // are there other file to edit + n = save_argc - optind - 1; + if (*cmd == 'q' && n > 0) { + status_line_bold("%d more file(s) to edit", n); + goto ret; + } + if (*cmd == 'n' && n <= 0) { + status_line_bold("No more files to edit"); + goto ret; + } + if (*cmd == 'p') { + // are there previous files to edit + if (optind < 1) { + status_line_bold("No previous files to edit"); + goto ret; + } + optind -= 2; + } + editing = 0; + } else if (strncmp(cmd, "read", i) == 0) { // read file into text[] + int size; + + fn = args; + if (!fn[0]) { + status_line_bold("No filename given"); + goto ret; + } + if (b < 0) { // no addr given- use defaults + q = begin_line(dot); // assume "dot" + } + // read after current line- unless user said ":0r foo" + if (b != 0) { + q = next_line(q); + // read after last line + if (q == end-1) + ++q; + } + { // dance around potentially-reallocated text[] + uintptr_t ofs = q - text; + size = file_insert(fn, q, 0); + q = text + ofs; + } + if (size < 0) + goto ret; // nothing was inserted + // how many lines in text[]? + li = count_lines(q, q + size - 1); + status_line("'%s'" + IF_FEATURE_VI_READONLY("%s") + " %dL, %dC", + fn, + IF_FEATURE_VI_READONLY((readonly_mode ? " [Readonly]" : ""),) + li, size + ); + if (size > 0) { + // if the insert is before "dot" then we need to update + if (q <= dot) + dot += size; + } + } else if (strncmp(cmd, "rewind", i) == 0) { // rewind cmd line args + if (modified_count && !useforce) { + status_line_bold("No write since last change (:%s! overrides)", cmd); + } else { + // reset the filenames to edit + optind = -1; // start from 0th file + editing = 0; + } +# if ENABLE_FEATURE_VI_SET + } else if (strncmp(cmd, "set", i) == 0) { // set or clear features +# if ENABLE_FEATURE_VI_SETOPTS + char *argp; +# endif + i = 0; // offset into args + // only blank is regarded as args delimiter. What about tab '\t'? + if (!args[0] || strcasecmp(args, "all") == 0) { + // print out values of all options +# if ENABLE_FEATURE_VI_SETOPTS + status_line_bold( + "%sautoindent " + "%sflash " + "%signorecase " + "%sshowmatch " + "tabstop=%u", + autoindent ? "" : "no", + err_method ? "" : "no", + ignorecase ? "" : "no", + showmatch ? "" : "no", + tabstop + ); +# endif + goto ret; + } +# if ENABLE_FEATURE_VI_SETOPTS + argp = args; + while (*argp) { + if (strncmp(argp, "no", 2) == 0) + i = 2; // ":set noautoindent" + setops(argp, "autoindent ", i, "ai", VI_AUTOINDENT); + setops(argp, "flash " , i, "fl", VI_ERR_METHOD); + setops(argp, "ignorecase ", i, "ic", VI_IGNORECASE); + setops(argp, "showmatch " , i, "sm", VI_SHOWMATCH ); + if (strncmp(argp + i, "tabstop=", 8) == 0) { + int t = 0; + sscanf(argp + i+8, "%u", &t); + if (t > 0 && t <= MAX_TABSTOP) + tabstop = t; } - have_status_msg = 0; + argp = skip_non_whitespace(argp); + argp = skip_whitespace(argp); } - place_cursor(crow, ccol); // put cursor back in correct place - } - fflush_all(); -} - -//----- format the status buffer, the bottom line of screen ------ -// format status buffer, with STANDOUT mode -static void status_line_bold(const char *format, ...) -{ - va_list args; - - va_start(args, format); - strcpy(status_buffer, ESC_BOLD_TEXT); - vsprintf(status_buffer + sizeof(ESC_BOLD_TEXT)-1, format, args); - strcat(status_buffer, ESC_NORM_TEXT); - va_end(args); - - have_status_msg = 1 + sizeof(ESC_BOLD_TEXT) + sizeof(ESC_NORM_TEXT) - 2; -} - -static void status_line_bold_errno(const char *fn) -{ - status_line_bold("'%s' "STRERROR_FMT, fn STRERROR_ERRNO); -} - -// format status buffer -static void status_line(const char *format, ...) -{ - va_list args; - - va_start(args, format); - vsprintf(status_buffer, format, args); - va_end(args); +# endif /* FEATURE_VI_SETOPTS */ +# endif /* FEATURE_VI_SET */ - have_status_msg = 1; -} +# if ENABLE_FEATURE_VI_SEARCH + } else if (cmd[0] == 's') { // substitute a pattern with a replacement pattern + char *F, *R, *flags; + size_t len_F, len_R; + int gflag; // global replace flag +# if ENABLE_FEATURE_VI_UNDO + int dont_chain_first_item = ALLOW_UNDO; +# endif -// copy s to buf, convert unprintable -static void print_literal(char *buf, const char *s) -{ - char *d; - unsigned char c; + // F points to the "find" pattern + // R points to the "replace" pattern + // replace the cmd line delimiters "/" with NULs + c = orig_buf[1]; // what is the delimiter + F = orig_buf + 2; // start of "find" + R = strchr(F, c); // middle delimiter + if (!R) + goto colon_s_fail; + len_F = R - F; + *R++ = '\0'; // terminate "find" + flags = strchr(R, c); + if (!flags) + goto colon_s_fail; + len_R = flags - R; + *flags++ = '\0'; // terminate "replace" + gflag = *flags; - buf[0] = '\0'; - if (!s[0]) - s = "(NULL)"; + q = begin_line(q); + if (b < 0) { // maybe :s/foo/bar/ + q = begin_line(dot); // start with cur line + b = count_lines(text, q); // cur line number + } + if (e < 0) + e = b; // maybe :.s/foo/bar/ - d = buf; - for (; *s; s++) { - int c_is_no_print; + for (i = b; i <= e; i++) { // so, :20,23 s \0 find \0 replace \0 + char *ls = q; // orig line start + char *found; + vc4: + found = char_search(q, F, (FORWARD << 1) | LIMITED); // search cur line only for "find" + if (found) { + uintptr_t bias; + // we found the "find" pattern - delete it + // For undo support, the first item should not be chained + text_hole_delete(found, found + len_F - 1, dont_chain_first_item); +# if ENABLE_FEATURE_VI_UNDO + dont_chain_first_item = ALLOW_UNDO_CHAIN; +# endif + // insert the "replace" patern + bias = string_insert(found, R, ALLOW_UNDO_CHAIN); + found += bias; + ls += bias; + /*q += bias; - recalculated anyway */ + // check for "global" :s/foo/bar/g + if (gflag == 'g') { + if ((found + len_R) < end_line(ls)) { + q = found + len_R; + goto vc4; // don't let q move past cur line + } + } + } + q = next_line(ls); + } +# endif /* FEATURE_VI_SEARCH */ + } else if (strncmp(cmd, "version", i) == 0) { // show software version + status_line(BB_VER); + } else if (strncmp(cmd, "write", i) == 0 // write text to file + || strncmp(cmd, "wq", i) == 0 + || strncmp(cmd, "wn", i) == 0 + || (cmd[0] == 'x' && !cmd[1]) + ) { + int size; + //int forced = FALSE; - c = *s; - c_is_no_print = (c & 0x80) && !Isprint(c); - if (c_is_no_print) { - strcpy(d, ESC_NORM_TEXT); - d += sizeof(ESC_NORM_TEXT)-1; - c = '.'; + // is there a file name to write to? + if (args[0]) { + fn = args; } - if (c < ' ' || c == 0x7f) { - *d++ = '^'; - c |= '@'; // 0x40 - if (c == 0x7f) - c = '?'; +# if ENABLE_FEATURE_VI_READONLY + if (readonly_mode && !useforce) { + status_line_bold("'%s' is read only", fn); + goto ret; } - *d++ = c; - *d = '\0'; - if (c_is_no_print) { - strcpy(d, ESC_BOLD_TEXT); - d += sizeof(ESC_BOLD_TEXT)-1; +# endif + //if (useforce) { + // if "fn" is not write-able, chmod u+w + // sprintf(syscmd, "chmod u+w %s", fn); + // system(syscmd); + // forced = TRUE; + //} + if (modified_count != 0 || cmd[0] != 'x') { + size = r - q + 1; + l = file_write(fn, q, r); + } else { + size = 0; + l = 0; } - if (*s == '\n') { - *d++ = '$'; - *d = '\0'; + //if (useforce && forced) { + // chmod u-w + // sprintf(syscmd, "chmod u-w %s", fn); + // system(syscmd); + // forced = FALSE; + //} + if (l < 0) { + if (l == -1) + status_line_bold_errno(fn); + } else { + // how many lines written + li = count_lines(q, q + l - 1); + status_line("'%s' %dL, %dC", fn, li, l); + if (l == size) { + if (q == text && q + l == end) { + modified_count = 0; + last_modified_count = -1; + } + if (cmd[0] == 'x' + || cmd[1] == 'q' || cmd[1] == 'n' + || cmd[1] == 'Q' || cmd[1] == 'N' + ) { + editing = 0; + } + } } - if (d - buf > MAX_INPUT_LEN - 10) // paranoia - break; - } -} - -static void not_implemented(const char *s) -{ - char buf[MAX_INPUT_LEN]; - - print_literal(buf, s); - status_line_bold("\'%s\' is not implemented", buf); -} - -// show file status on status line -static int format_edit_status(void) -{ - static const char cmd_mode_indicator[] ALIGN1 = "-IR-"; - -#define tot format_edit_status__tot - - int cur, percent, ret, trunc_at; - - // modified_count is now a counter rather than a flag. this - // helps reduce the amount of line counting we need to do. - // (this will cause a mis-reporting of modified status - // once every MAXINT editing operations.) - - // it would be nice to do a similar optimization here -- if - // we haven't done a motion that could have changed which line - // we're on, then we shouldn't have to do this count_lines() - cur = count_lines(text, dot); - - // count_lines() is expensive. - // Call it only if something was changed since last time - // we were here: - if (modified_count != last_modified_count) { - tot = cur + count_lines(dot, end - 1) - 1; - last_modified_count = modified_count; - } - - // current line percent - // ------------- ~~ ---------- - // total lines 100 - if (tot > 0) { - percent = (100 * cur) / tot; +# if ENABLE_FEATURE_VI_YANKMARK + } else if (strncmp(cmd, "yank", i) == 0) { // yank lines + if (b < 0) { // no addr given- use defaults + q = begin_line(dot); // assume .,. for the range + r = end_line(dot); + } + text_yank(q, r, YDreg); + li = count_lines(q, r); + status_line("Yank %d lines (%d chars) into [%c]", + li, strlen(reg[YDreg]), what_reg()); +# endif } else { - cur = tot = 0; - percent = 100; + // cmd unknown + not_implemented(cmd); } - - trunc_at = columns < STATUS_BUFFER_LEN-1 ? - columns : STATUS_BUFFER_LEN-1; - - ret = snprintf(status_buffer, trunc_at+1, -#if ENABLE_FEATURE_VI_READONLY - "%c %s%s%s %d/%d %d%%", -#else - "%c %s%s %d/%d %d%%", -#endif - cmd_mode_indicator[cmd_mode & 3], - (current_filename != NULL ? current_filename : "No file"), -#if ENABLE_FEATURE_VI_READONLY - (readonly_mode ? " [Readonly]" : ""), -#endif - (modified_count ? " [Modified]" : ""), - cur, tot, percent); - - if (ret >= 0 && ret < trunc_at) - return ret; // it all fit - - return trunc_at; // had to truncate -#undef tot + ret: + dot = bound_dot(dot); // make sure "dot" is valid + return; +# if ENABLE_FEATURE_VI_SEARCH + colon_s_fail: + status_line(":s expression missing delimiters"); +# endif +#endif /* FEATURE_VI_COLON */ } -//----- Force refresh of all Lines ----------------------------- -static void redraw(int full_screen) -{ - // cursor to top,left; clear to the end of screen - write1(ESC_SET_CURSOR_TOPLEFT ESC_CLEAR2EOS); - screen_erase(); // erase the internal screen buffer - last_status_cksum = 0; // force status update - refresh(full_screen); // this will redraw the entire display - show_status_line(); -} +//----- Helper Utility Routines -------------------------------- -//----- Format a text[] line into a buffer --------------------- -static char* format_line(char *src /*, int li*/) +//---------------------------------------------------------------- +//----- Char Routines -------------------------------------------- +/* Chars that are part of a word- + * 0123456789_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz + * Chars that are Not part of a word (stoppers) + * !"#$%&'()*+,-./:;<=>?@[\]^`{|}~ + * Chars that are WhiteSpace + * TAB NEWLINE VT FF RETURN SPACE + * DO NOT COUNT NEWLINE AS WHITESPACE + */ + +static char *new_screen(int ro, int co) { - unsigned char c; - int co; - int ofs = offset; - char *dest = scr_out_buf; // [MAX_SCR_COLS + MAX_TABSTOP * 2] + int li; - c = '~'; // char in col 0 in non-existent lines is '~' - co = 0; - while (co < columns + tabstop) { - // have we gone past the end? - if (src < end) { - c = *src++; - if (c == '\n') - break; - if ((c & 0x80) && !Isprint(c)) { - c = '.'; - } - if (c < ' ' || c == 0x7f) { - if (c == '\t') { - c = ' '; - // co % 8 != 7 - while ((co % tabstop) != (tabstop - 1)) { - dest[co++] = c; - } - } else { - dest[co++] = '^'; - if (c == 0x7f) - c = '?'; - else - c += '@'; // Ctrl-X -> 'X' - } - } - } - dest[co++] = c; - // discard scrolled-off-to-the-left portion, - // in tabstop-sized pieces - if (ofs >= tabstop && co >= tabstop) { - memmove(dest, dest + tabstop, co); - co -= tabstop; - ofs -= tabstop; - } - if (src >= end) - break; + free(screen); + screensize = ro * co + 8; + screen = xmalloc(screensize); + // initialize the new screen. assume this will be a empty file. + screen_erase(); + // non-existent text[] lines start with a tilde (~). + for (li = 1; li < ro - 1; li++) { + screen[(li * co) + 0] = '~'; } - // check "short line, gigantic offset" case - if (co < ofs) - ofs = co; - // discard last scrolled off part - co -= ofs; - dest += ofs; - // fill the rest with spaces - if (co < columns) - memset(&dest[co], ' ', columns - co); - return dest; + return screen; } -//----- Refresh the changed screen lines ----------------------- -// Copy the source line from text[] into the buffer and note -// if the current screenline is different from the new buffer. -// If they differ then that line needs redrawing on the terminal. -// -static void refresh(int full_screen) +static int st_test(char *p, int type, int dir, char *tested) { -#define old_offset refresh__old_offset + char c, c0, ci; + int test, inc; - int li, changed; - char *tp, *sp; // pointer into text[] and screen[] + inc = dir; + c = c0 = p[0]; + ci = p[inc]; + test = 0; - if (ENABLE_FEATURE_VI_WIN_RESIZE IF_FEATURE_VI_ASK_TERMINAL(&& !G.get_rowcol_error) ) { - unsigned c = columns, r = rows; - query_screen_dimensions(); -#if ENABLE_FEATURE_VI_USE_SIGNALS - full_screen |= (c - columns) | (r - rows); -#else - if (c != columns || r != rows) { - full_screen = TRUE; - // update screen memory since SIGWINCH won't have done it - new_screen(rows, columns); - } -#endif + if (type == S_BEFORE_WS) { + c = ci; + test = (!isspace(c) || c == '\n'); } - sync_cursor(dot, &crow, &ccol); // where cursor will be (on "dot") - tp = screenbegin; // index into text[] of top line - - // compare text[] to screen[] and mark screen[] lines that need updating - for (li = 0; li < rows - 1; li++) { - int cs, ce; // column start & end - char *out_buf; - // format current text line - out_buf = format_line(tp /*, li*/); - - // skip to the end of the current text[] line - if (tp < end) { - char *t = memchr(tp, '\n', end - tp); - if (!t) t = end - 1; - tp = t + 1; - } - - // see if there are any changes between virtual screen and out_buf - changed = FALSE; // assume no change - cs = 0; - ce = columns - 1; - sp = &screen[li * columns]; // start of screen line - if (full_screen) { - // force re-draw of every single column from 0 - columns-1 - goto re0; - } - // compare newly formatted buffer with virtual screen - // look forward for first difference between buf and screen - for (; cs <= ce; cs++) { - if (out_buf[cs] != sp[cs]) { - changed = TRUE; // mark for redraw - break; - } - } - - // look backward for last difference between out_buf and screen - for (; ce >= cs; ce--) { - if (out_buf[ce] != sp[ce]) { - changed = TRUE; // mark for redraw - break; - } - } - // now, cs is index of first diff, and ce is index of last diff - - // if horz offset has changed, force a redraw - if (offset != old_offset) { - re0: - changed = TRUE; - } - - // make a sanity check of columns indexes - if (cs < 0) cs = 0; - if (ce > columns - 1) ce = columns - 1; - if (cs > ce) { cs = 0; ce = columns - 1; } - // is there a change between virtual screen and out_buf - if (changed) { - // copy changed part of buffer to virtual screen - memcpy(sp+cs, out_buf+cs, ce-cs+1); - place_cursor(li, cs); - // write line out to terminal - fwrite(&sp[cs], ce - cs + 1, 1, stdout); - } + if (type == S_TO_WS) { + c = c0; + test = (!isspace(c) || c == '\n'); } + if (type == S_OVER_WS) { + c = c0; + test = isspace(c); + } + if (type == S_END_PUNCT) { + c = ci; + test = ispunct(c); + } + if (type == S_END_ALNUM) { + c = ci; + test = (isalnum(c) || c == '_'); + } + *tested = c; + return test; +} - place_cursor(crow, ccol); +static char *skip_thing(char *p, int linecnt, int dir, int type) +{ + char c; - old_offset = offset; -#undef old_offset + while (st_test(p, type, dir, &c)) { + // make sure we limit search to correct number of lines + if (c == '\n' && --linecnt < 1) + break; + if (dir >= 0 && p >= end - 1) + break; + if (dir < 0 && p <= text) + break; + p += dir; // move to next char + } + return p; } #if ENABLE_FEATURE_VI_USE_SIGNALS -- cgit v1.2.3-55-g6feb From 6ce60b9cca55c908de3747f1224b2e8aabb557bf Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Mon, 1 Apr 2019 15:41:05 +0200 Subject: vi: use vsnprintf to format status line This is the last use of "vsprintf" in busybox: function old new delta status_line_bold 72 77 +5 status_line 40 45 +5 vsprintf 23 - -23 ------------------------------------------------------------------------------ (add/remove: 0/2 grow/shrink: 2/0 up/down: 10/-23) Total: -13 bytes Signed-off-by: Denys Vlasenko --- editors/vi.c | 49 ++++++++++++++++++++++--------------------------- 1 file changed, 22 insertions(+), 27 deletions(-) (limited to 'editors/vi.c') diff --git a/editors/vi.c b/editors/vi.c index a0a2b7a82..5c585a390 100644 --- a/editors/vi.c +++ b/editors/vi.c @@ -482,16 +482,13 @@ struct globals { IF_FEATURE_VI_SEARCH(last_search_pattern = xzalloc(2);) \ } while (0) - -static void show_status_line(void); // put a message on the bottom line -static void status_line_bold(const char *, ...); - #if ENABLE_FEATURE_VI_CRASHME -static void crash_dummy(); -static void crash_test(); static int crashme = 0; #endif +static void show_status_line(void); // put a message on the bottom line +static void status_line_bold(const char *, ...); + static void show_help(void) { puts("These features are available:" @@ -1218,35 +1215,34 @@ static void show_status_line(void) } //----- format the status buffer, the bottom line of screen ------ -// format status buffer, with STANDOUT mode -static void status_line_bold(const char *format, ...) +static void status_line(const char *format, ...) { va_list args; va_start(args, format); - strcpy(status_buffer, ESC_BOLD_TEXT); - vsprintf(status_buffer + sizeof(ESC_BOLD_TEXT)-1, format, args); - strcat(status_buffer, ESC_NORM_TEXT); + vsnprintf(status_buffer, STATUS_BUFFER_LEN, format, args); va_end(args); - have_status_msg = 1 + sizeof(ESC_BOLD_TEXT) + sizeof(ESC_NORM_TEXT) - 2; -} - -static void status_line_bold_errno(const char *fn) -{ - status_line_bold("'%s' "STRERROR_FMT, fn STRERROR_ERRNO); + have_status_msg = 1; } - -// format status buffer -static void status_line(const char *format, ...) +static void status_line_bold(const char *format, ...) { va_list args; va_start(args, format); - vsprintf(status_buffer, format, args); + strcpy(status_buffer, ESC_BOLD_TEXT); + vsnprintf(status_buffer + (sizeof(ESC_BOLD_TEXT)-1), + STATUS_BUFFER_LEN - sizeof(ESC_BOLD_TEXT) - sizeof(ESC_NORM_TEXT), + format, args + ); + strcat(status_buffer, ESC_NORM_TEXT); va_end(args); - have_status_msg = 1; + have_status_msg = 1 + (sizeof(ESC_BOLD_TEXT)-1) + (sizeof(ESC_NORM_TEXT)-1); +} +static void status_line_bold_errno(const char *fn) +{ + status_line_bold("'%s' "STRERROR_FMT, fn STRERROR_ERRNO); } // copy s to buf, convert unprintable @@ -1290,15 +1286,14 @@ static void print_literal(char *buf, const char *s) break; } } - static void not_implemented(const char *s) { char buf[MAX_INPUT_LEN]; - print_literal(buf, s); - status_line_bold("\'%s\' is not implemented", buf); + status_line_bold("'%s' is not implemented", buf); } +//----- Block insert/delete, undo ops -------------------------- #if ENABLE_FEATURE_VI_YANKMARK static char *text_yank(char *p, char *q, int dest) // copy text into a register { @@ -4318,10 +4313,10 @@ int vi_main(int argc, char **argv) #if ENABLE_FEATURE_VI_UNDO /* undo_stack_tail = NULL; - already is */ -#if ENABLE_FEATURE_VI_UNDO_QUEUE +# if ENABLE_FEATURE_VI_UNDO_QUEUE undo_queue_state = UNDO_EMPTY; /* undo_q = 0; - already is */ -#endif +# endif #endif #if ENABLE_FEATURE_VI_CRASHME -- cgit v1.2.3-55-g6feb From 2a57608f673698ddbde6704ef1f01f2fd443710b Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Mon, 1 Apr 2019 16:15:51 +0200 Subject: vi: code shrink function old new delta get_one_char 108 103 -5 edit_file 651 644 -7 do_cmd 4696 4688 -8 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 0/3 up/down: 0/-20) Total: -20 bytes Signed-off-by: Denys Vlasenko --- editors/vi.c | 58 ++++++++++++++++++++++++++++------------------------------ 1 file changed, 28 insertions(+), 30 deletions(-) (limited to 'editors/vi.c') diff --git a/editors/vi.c b/editors/vi.c index 5c585a390..af23ae7d2 100644 --- a/editors/vi.c +++ b/editors/vi.c @@ -1029,43 +1029,41 @@ static int readit(void) // read (maybe cursor) key from stdin return c; } +#if ENABLE_FEATURE_VI_DOT_CMD static int get_one_char(void) { int c; -#if ENABLE_FEATURE_VI_DOT_CMD if (!adding2q) { // we are not adding to the q. - // but, we may be reading from a q - if (ioq == 0) { - // there is no current q, read from STDIN - c = readit(); // get the users input - } else { - // there is a queue to get chars from first + // but, we may be reading from a saved q. + // (checking "ioq" for NULL is wrong, it's not reset to NULL + // when done - "ioq_start" is reset instead). + if (ioq_start != NULL) { + // there is a queue to get chars from. // careful with correct sign expansion! c = (unsigned char)*ioq++; - if (c == '\0') { - // the end of the q, read from STDIN - free(ioq_start); - ioq_start = ioq = 0; - c = readit(); // get the users input - } + if (c != '\0') + return c; + // the end of the q + free(ioq_start); + ioq_start = NULL; + // read from STDIN: } + return readit(); + } + // we are adding STDIN chars to q. + c = readit(); + if (lmc_len >= MAX_INPUT_LEN - 1) { + status_line_bold("last_modifying_cmd overrun"); } else { - // adding STDIN chars to q - c = readit(); // get the users input - if (lmc_len >= MAX_INPUT_LEN - 1) { - status_line_bold("last_modifying_cmd overrun"); - } else { - // add new char to q - last_modifying_cmd[lmc_len++] = c; - } + last_modifying_cmd[lmc_len++] = c; } -#else - c = readit(); // get the users input -#endif /* FEATURE_VI_DOT_CMD */ return c; } +#else +# define get_one_char() readit() +#endif // Get input line (uses "status line" area) static char *get_input_line(const char *prompt) @@ -1781,7 +1779,7 @@ static void start_new_cmd_q(char c) // get buffer for new cmd // if there is a current cmd count put it in the buffer first if (cmdcnt > 0) { - lmc_len = sprintf(last_modifying_cmd, "%d%c", cmdcnt, c); + lmc_len = sprintf(last_modifying_cmd, "%u%c", cmdcnt, c); } else { // just save char c onto queue last_modifying_cmd[0] = c; lmc_len = 1; @@ -3415,9 +3413,8 @@ static void do_cmd(int c) case '.': // .- repeat the last modifying command // Stuff the last_modifying_cmd back into stdin // and let it be re-executed. - if (lmc_len > 0) { - last_modifying_cmd[lmc_len] = 0; - ioq = ioq_start = xstrdup(last_modifying_cmd); + if (lmc_len != 0) { + ioq = ioq_start = xstrndup(last_modifying_cmd, lmc_len); } break; #endif @@ -4221,7 +4218,7 @@ static void edit_file(char *fn) c = '\0'; #if ENABLE_FEATURE_VI_DOT_CMD free(ioq_start); - ioq = ioq_start = NULL; + ioq_start = NULL; lmc_len = 0; adding2q = 0; #endif @@ -4273,7 +4270,8 @@ static void edit_file(char *fn) #if ENABLE_FEATURE_VI_DOT_CMD // These are commands that change text[]. // Remember the input for the "." command - if (!adding2q && ioq_start == NULL + if (!adding2q + && ioq_start == NULL && cmd_mode == 0 // command mode && c > '\0' // exclude NUL and non-ASCII chars && c < 0x7f // (Unicode and such) -- cgit v1.2.3-55-g6feb From 26f5e9d21ccf10ff447c68e4a28be2e723055356 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Mon, 1 Apr 2019 16:38:06 +0200 Subject: vi: convert more /**/ comments to // Signed-off-by: Denys Vlasenko --- editors/vi.c | 118 ++++++++++++++++++++++++++++------------------------------- 1 file changed, 56 insertions(+), 62 deletions(-) (limited to 'editors/vi.c') diff --git a/editors/vi.c b/editors/vi.c index af23ae7d2..fe907c841 100644 --- a/editors/vi.c +++ b/editors/vi.c @@ -5,19 +5,19 @@ * * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ -/* - * Things To Do: - * EXINIT - * $HOME/.exrc and ./.exrc - * add magic to search /foo.*bar - * add :help command - * :map macros - * if mark[] values were line numbers rather than pointers - * it would be easier to change the mark when add/delete lines - * More intelligence in refresh() - * ":r !cmd" and "!cmd" to filter text through an external command - * An "ex" line oriented mode- maybe using "cmdedit" - */ +// +//Things To Do: +// EXINIT +// $HOME/.exrc and ./.exrc +// add magic to search /foo.*bar +// add :help command +// :map macros +// if mark[] values were line numbers rather than pointers +// it would be easier to change the mark when add/delete lines +// More intelligence in refresh() +// ":r !cmd" and "!cmd" to filter text through an external command +// An "ex" line oriented mode- maybe using "cmdedit" + //config:config VI //config: bool "vi (23 kb)" //config: default y @@ -178,12 +178,12 @@ //usage: "\n -H List available features" #include "libbb.h" -/* Should be after libbb.h: on some systems regex.h needs sys/types.h: */ +// Should be after libbb.h: on some systems regex.h needs sys/types.h: #if ENABLE_FEATURE_VI_REGEX_SEARCH # include #endif -/* the CRASHME code is unmaintained, and doesn't currently build */ +// the CRASHME code is unmaintained, and doesn't currently build #define ENABLE_FEATURE_VI_CRASHME 0 @@ -198,7 +198,7 @@ #else -/* 0x9b is Meta-ESC */ +// 0x9b is Meta-ESC #if ENABLE_FEATURE_VI_8BIT # define Isprint(c) ((unsigned char)(c) >= ' ' && (c) != 0x7f && (unsigned char)(c) != 0x9b) #else @@ -218,29 +218,27 @@ enum { MAX_SCR_ROWS = CONFIG_FEATURE_VI_MAX_LEN, }; -/* VT102 ESC sequences. - * See "Xterm Control Sequences" - * http://invisible-island.net/xterm/ctlseqs/ctlseqs.html - */ +// VT102 ESC sequences. +// See "Xterm Control Sequences" +// http://invisible-island.net/xterm/ctlseqs/ctlseqs.html #define ESC "\033" -/* Inverse/Normal text */ +// Inverse/Normal text #define ESC_BOLD_TEXT ESC"[7m" #define ESC_NORM_TEXT ESC"[m" -/* Bell */ +// Bell #define ESC_BELL "\007" -/* Clear-to-end-of-line */ +// Clear-to-end-of-line #define ESC_CLEAR2EOL ESC"[K" -/* Clear-to-end-of-screen. - * (We use default param here. - * Full sequence is "ESC [ J", - * is 0/1/2 = "erase below/above/all".) - */ +// Clear-to-end-of-screen. +// (We use default param here. +// Full sequence is "ESC [ J", +// is 0/1/2 = "erase below/above/all".) #define ESC_CLEAR2EOS ESC"[J" -/* Cursor to given coordinate (1,1: top left) */ +// Cursor to given coordinate (1,1: top left) #define ESC_SET_CURSOR_POS ESC"[%u;%uH" #define ESC_SET_CURSOR_TOPLEFT ESC"[H" //UNUSED -///* Cursor up and down */ +//// Cursor up and down //#define ESC_CURSOR_UP ESC"[A" //#define ESC_CURSOR_DOWN "\n" @@ -267,17 +265,17 @@ enum { }; -/* vi.c expects chars to be unsigned. */ -/* busybox build system provides that, but it's better */ -/* to audit and fix the source */ +// vi.c expects chars to be unsigned. +// busybox build system provides that, but it's better +// to audit and fix the source struct globals { - /* many references - keep near the top of globals */ + // many references - keep near the top of globals char *text, *end; // pointers to the user data in memory char *dot; // where all the action takes place int text_size; // size of the allocated buffer - /* the rest */ + // the rest smallint vi_setops; #define VI_AUTOINDENT 1 #define VI_SHOWMATCH 2 @@ -286,7 +284,7 @@ struct globals { #define autoindent (vi_setops & VI_AUTOINDENT) #define showmatch (vi_setops & VI_SHOWMATCH ) #define ignorecase (vi_setops & VI_IGNORECASE) -/* indicate error with beep or flash */ +// indicate error with beep or flash #define err_method (vi_setops & VI_ERR_METHOD) #if ENABLE_FEATURE_VI_READONLY @@ -334,14 +332,14 @@ struct globals { char *last_search_pattern; // last pattern from a '/' or '?' search #endif - /* former statics */ + // former statics #if ENABLE_FEATURE_VI_YANKMARK char *edit_file__cur_line; #endif int refresh__old_offset; int format_edit_status__tot; - /* a few references only */ + // a few references only #if ENABLE_FEATURE_VI_YANKMARK smalluint YDreg;//,Ureg;// default delete register and orig line for "U" #define Ureg 27 @@ -368,9 +366,10 @@ struct globals { #if ENABLE_FEATURE_VI_DOT_CMD char last_modifying_cmd[MAX_INPUT_LEN]; // last modifying cmd for "." #endif - char get_input_line__buf[MAX_INPUT_LEN]; /* former static */ + char get_input_line__buf[MAX_INPUT_LEN]; // former static char scr_out_buf[MAX_SCR_COLS + MAX_TABSTOP * 2]; + #if ENABLE_FEATURE_VI_UNDO // undo_push() operations #define UNDO_INS 0 @@ -397,7 +396,6 @@ struct globals { // If undo queuing disabled, don't invoke the missing queue logic #define ALLOW_UNDO_QUEUED 1 # endif - struct undo_object { struct undo_object *prev; // Linking back avoids list traversal (LIFO) int start; // Offset where the data should be restored/deleted @@ -1969,7 +1967,7 @@ static char *char_insert(char *p, char c, int undo) // insert the char c at 'p' undo_push_insert(p, 1, undo); #else modified_count++; -#endif /* ENABLE_FEATURE_VI_UNDO */ +#endif p++; } else if (c == 27) { // Is this an ESC? cmd_mode = 0; @@ -1997,7 +1995,7 @@ static char *char_insert(char *p, char c, int undo) // insert the char c at 'p' undo_push_insert(p, 1, undo); #else modified_count++; -#endif /* ENABLE_FEATURE_VI_UNDO */ +#endif p += 1 + stupid_insert(p, c); // insert the char #if ENABLE_FEATURE_VI_SETOPTS if (showmatch && strchr(")]}", c) != NULL) { @@ -2777,7 +2775,7 @@ static void colon(char *buf) bias = string_insert(found, R, ALLOW_UNDO_CHAIN); found += bias; ls += bias; - /*q += bias; - recalculated anyway */ + //q += bias; - recalculated anyway // check for "global" :s/foo/bar/g if (gflag == 'g') { if ((found + len_R) < end_line(ls)) { @@ -2873,18 +2871,14 @@ static void colon(char *buf) #endif /* FEATURE_VI_COLON */ } -//----- Helper Utility Routines -------------------------------- - -//---------------------------------------------------------------- //----- Char Routines -------------------------------------------- -/* Chars that are part of a word- - * 0123456789_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz - * Chars that are Not part of a word (stoppers) - * !"#$%&'()*+,-./:;<=>?@[\]^`{|}~ - * Chars that are WhiteSpace - * TAB NEWLINE VT FF RETURN SPACE - * DO NOT COUNT NEWLINE AS WHITESPACE - */ +// Chars that are part of a word- +// 0123456789_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz +// Chars that are Not part of a word (stoppers) +// !"#$%&'()*+,-./:;<=>?@[\]^`{|}~ +// Chars that are WhiteSpace +// TAB NEWLINE VT FF RETURN SPACE +// DO NOT COUNT NEWLINE AS WHITESPACE static char *new_screen(int ro, int co) { @@ -3242,7 +3236,7 @@ static void do_cmd(int c) dot_skip_over_ws(); } while (--cmdcnt > 0); break; - case 21: // ctrl-U scroll up half screen + case 21: // ctrl-U scroll up half screen dot_scroll((rows - 2) / 2, -1); break; case 25: // ctrl-Y scroll up one line @@ -3251,7 +3245,7 @@ static void do_cmd(int c) case 27: // esc if (cmd_mode == 0) indicate_error(); - cmd_mode = 0; // stop insrting + cmd_mode = 0; // stop inserting undo_queue_commit(); end_cmd_q(); last_status_cksum = 0; // force status update @@ -3948,7 +3942,7 @@ static void do_cmd(int c) dot--; } -/* NB! the CRASHME code is unmaintained, and doesn't currently build */ +// NB! the CRASHME code is unmaintained, and doesn't currently build #if ENABLE_FEATURE_VI_CRASHME static int totalcmds = 0; static int Mp = 85; // Movement command Probability @@ -4253,7 +4247,7 @@ static void edit_file(char *fn) crash_dummy(); // generate a random command } else { crashme = 0; - string_insert(text, "\n\n##### Ran out of text to work on. #####\n\n", NO_UNDO); // insert the string + string_insert(text, "\n\n##### Ran out of text to work on. #####\n\n", NO_UNDO); dot = text; refresh(FALSE); } @@ -4268,8 +4262,8 @@ static void edit_file(char *fn) } #endif #if ENABLE_FEATURE_VI_DOT_CMD - // These are commands that change text[]. - // Remember the input for the "." command + // If c is a command that changes text[], + // (re)start remembering the input for the "." command. if (!adding2q && ioq_start == NULL && cmd_mode == 0 // command mode @@ -4310,10 +4304,10 @@ int vi_main(int argc, char **argv) INIT_G(); #if ENABLE_FEATURE_VI_UNDO - /* undo_stack_tail = NULL; - already is */ + //undo_stack_tail = NULL; - already is # if ENABLE_FEATURE_VI_UNDO_QUEUE undo_queue_state = UNDO_EMPTY; - /* undo_q = 0; - already is */ + //undo_q = 0; - already is # endif #endif -- cgit v1.2.3-55-g6feb From b29dce4bc293d6800e94569ac7d0df54bd1f8a94 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Mon, 1 Apr 2019 17:17:02 +0200 Subject: vi: code shrink function old new delta get_input_line 172 175 +3 char_insert 444 447 +3 rawmode 36 24 -12 edit_file 644 626 -18 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 2/2 up/down: 6/-30) Total: -24 bytes Signed-off-by: Denys Vlasenko --- editors/vi.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) (limited to 'editors/vi.c') diff --git a/editors/vi.c b/editors/vi.c index fe907c841..993630d6f 100644 --- a/editors/vi.c +++ b/editors/vi.c @@ -320,8 +320,9 @@ struct globals { int screensize; // and its size int tabstop; int last_forward_char; // last char searched for with 'f' (int because of Unicode) - char erase_char; // the users erase character +#if ENABLE_FEATURE_VI_CRASHME char last_input_char; // last char read from user +#endif #if ENABLE_FEATURE_VI_DOT_CMD smallint adding2q; // are we currently adding user input to q @@ -433,8 +434,9 @@ struct globals { #define screenbegin (G.screenbegin ) #define tabstop (G.tabstop ) #define last_forward_char (G.last_forward_char ) -#define erase_char (G.erase_char ) +#if ENABLE_FEATURE_VI_CRASHME #define last_input_char (G.last_input_char ) +#endif #if ENABLE_FEATURE_VI_READONLY #define readonly_mode (G.readonly_mode ) #else @@ -560,7 +562,6 @@ static void rawmode(void) { // no TERMIOS_CLEAR_ISIG: leave ISIG on - allow signals set_termios_to_raw(STDIN_FILENO, &term_orig, TERMIOS_RAW_CRNL); - erase_char = term_orig.c_cc[VERASE]; } static void cookmode(void) @@ -1082,7 +1083,7 @@ static char *get_input_line(const char *prompt) c = get_one_char(); if (c == '\n' || c == '\r' || c == 27) break; // this is end of input - if (c == erase_char || c == 8 || c == 127) { + if (c == term_orig.c_cc[VERASE] || c == 8 || c == 127) { // user wants to erase prev char buf[--i] = '\0'; write1("\b \b"); // erase char on screen @@ -1978,7 +1979,7 @@ static char *char_insert(char *p, char c, int undo) // insert the char c at 'p' if ((p[-1] != '\n') && (dot > text)) { p--; } - } else if (c == erase_char || c == 8 || c == 127) { // Is this a BS + } else if (c == term_orig.c_cc[VERASE] || c == 8 || c == 127) { // Is this a BS if (p > text) { p--; p = text_hole_delete(p, p, ALLOW_UNDO_QUEUED); // shrink buffer 1 char @@ -4189,7 +4190,10 @@ static void edit_file(char *fn) mark[26] = mark[27] = text; // init "previous context" #endif - last_forward_char = last_input_char = '\0'; + last_forward_char = '\0'; +#if ENABLE_FEATURE_VI_CRASHME + last_input_char = '\0'; +#endif crow = 0; ccol = 0; @@ -4253,7 +4257,10 @@ static void edit_file(char *fn) } } #endif - last_input_char = c = get_one_char(); // get a cmd from user + c = get_one_char(); // get a cmd from user +#if ENABLE_FEATURE_VI_CRASHME + last_input_char = c; +#endif #if ENABLE_FEATURE_VI_YANKMARK // save a copy of the current line- for the 'U" command if (begin_line(dot) != cur_line) { -- cgit v1.2.3-55-g6feb From bbacd03ccc48734fb75fdac90e0bdd6c52c22cd1 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Tue, 2 Apr 2019 11:50:25 +0200 Subject: vi: restore capability to remember insertion cmds for "." function old new delta modifying_cmds 17 22 +5 get_one_char 103 98 -5 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 1/1 up/down: 5/-5) Total: 0 bytes text data bss dec hex filename 982121 485 7296 989902 f1ace busybox_old 982094 485 7296 989875 f1ab3 busybox_unstripped Signed-off-by: Denys Vlasenko --- editors/vi.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'editors/vi.c') diff --git a/editors/vi.c b/editors/vi.c index 993630d6f..9d0fc23cf 100644 --- a/editors/vi.c +++ b/editors/vi.c @@ -244,9 +244,7 @@ enum { #if ENABLE_FEATURE_VI_DOT_CMD || ENABLE_FEATURE_VI_YANKMARK // cmds modifying text[] -// vda: removed "aAiIs" as they switch us into insert mode -// and remembering input for replay after them makes no sense -static const char modifying_cmds[] ALIGN1 = "cCdDJoOpPrRxX<>~"; +static const char modifying_cmds[] ALIGN1 = "aAcCdDiIJoOpPrRs""xX<>~"; #endif enum { @@ -1053,8 +1051,11 @@ static int get_one_char(void) } // we are adding STDIN chars to q. c = readit(); - if (lmc_len >= MAX_INPUT_LEN - 1) { - status_line_bold("last_modifying_cmd overrun"); + if (lmc_len >= ARRAY_SIZE(last_modifying_cmd) - 1) { + // last_modifying_cmd[] is too small, can't remeber the cmd + // - drop it + adding2q = 0; + lmc_len = 0; } else { last_modifying_cmd[lmc_len++] = c; } -- cgit v1.2.3-55-g6feb From 8939359180ad0d6bfaaca694c4f14cd15cde4788 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Tue, 2 Apr 2019 12:45:30 +0200 Subject: vi: rename save_argc -> cmdline_filecnt function old new delta vi_main 272 273 +1 colon 2852 2853 +1 Signed-off-by: Denys Vlasenko --- editors/vi.c | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) (limited to 'editors/vi.c') diff --git a/editors/vi.c b/editors/vi.c index 9d0fc23cf..b41cf451c 100644 --- a/editors/vi.c +++ b/editors/vi.c @@ -301,7 +301,7 @@ struct globals { smallint cmd_mode; // 0=command 1=insert 2=replace int modified_count; // buffer contents changed if !0 int last_modified_count; // = -1; - int save_argc; // how many file names on cmd line + int cmdline_filecnt; // how many file names on cmd line int cmdcnt; // repetition count unsigned rows, columns; // the terminal screen is this size #if ENABLE_FEATURE_VI_ASK_TERMINAL @@ -416,7 +416,7 @@ struct globals { #define cmd_mode (G.cmd_mode ) #define modified_count (G.modified_count ) #define last_modified_count (G.last_modified_count) -#define save_argc (G.save_argc ) +#define cmdline_filecnt (G.cmdline_filecnt ) #define cmdcnt (G.cmdcnt ) #define rows (G.rows ) #define columns (G.columns ) @@ -2367,7 +2367,7 @@ static void colon(char *buf) } else { modified_count = 0; last_modified_count = -1; - status_line("'%s' %dL, %dC", + status_line("'%s' %uL, %uC", current_filename, count_lines(text, end - 1), cnt ); @@ -2538,7 +2538,7 @@ static void colon(char *buf) li = count_lines(text, end - 1); status_line("'%s'%s" IF_FEATURE_VI_READONLY("%s") - " %dL, %dC", + " %uL, %uC", current_filename, (size < 0 ? " [New file]" : ""), IF_FEATURE_VI_READONLY( @@ -2604,7 +2604,7 @@ static void colon(char *buf) if (useforce) { if (*cmd == 'q') { // force end of argv list - optind = save_argc; + optind = cmdline_filecnt - 1; } editing = 0; goto ret; @@ -2615,9 +2615,9 @@ static void colon(char *buf) goto ret; } // are there other file to edit - n = save_argc - optind - 1; + n = cmdline_filecnt - optind - 1; if (*cmd == 'q' && n > 0) { - status_line_bold("%d more file(s) to edit", n); + status_line_bold("%u more file(s) to edit", n); goto ret; } if (*cmd == 'n' && n <= 0) { @@ -2662,7 +2662,7 @@ static void colon(char *buf) li = count_lines(q, q + size - 1); status_line("'%s'" IF_FEATURE_VI_READONLY("%s") - " %dL, %dC", + " %uL, %uC", fn, IF_FEATURE_VI_READONLY((readonly_mode ? " [Readonly]" : ""),) li, size @@ -2834,7 +2834,7 @@ static void colon(char *buf) } else { // how many lines written li = count_lines(q, q + l - 1); - status_line("'%s' %dL, %dC", fn, li, l); + status_line("'%s' %uL, %uC", fn, li, l); if (l == size) { if (q == text && q + l == end) { modified_count = 0; @@ -4368,23 +4368,22 @@ int vi_main(int argc, char **argv) } } - // The argv array can be used by the ":next" and ":rewind" commands argv += optind; - argc -= optind; + cmdline_filecnt = argc - optind; - //----- This is the main file handling loop -------------- - save_argc = argc; - optind = 0; // "Save cursor, use alternate screen buffer, clear screen" write1(ESC"[?1049h"); + // This is the main file handling loop + optind = 0; while (1) { - edit_file(argv[optind]); // param might be NULL - if (++optind >= argc) + edit_file(argv[optind]); // might be NULL on 1st iteration + // NB: optind can be changed by ":next" and ":rewind" commands + optind++; + if (!argv[optind]) break; } // "Use normal screen buffer, restore cursor" write1(ESC"[?1049l"); - //----------------------------------------------------------- return 0; } -- cgit v1.2.3-55-g6feb From 3e61b59ef326cdb800736f502e0240b109271076 Mon Sep 17 00:00:00 2001 From: Ron Yorston Date: Wed, 3 Apr 2019 08:56:30 +0100 Subject: vi: avoid build failure in non-default case If vi is built with FEATURE_VI_USE_SIGNALS disabled and FEATURE_VI_WIN_RESIZE enabled new_screen() is used without a declaration. Move the function to avoid this. Signed-off-by: Ron Yorston Signed-off-by: Denys Vlasenko --- editors/vi.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'editors/vi.c') diff --git a/editors/vi.c b/editors/vi.c index b41cf451c..ce261feca 100644 --- a/editors/vi.c +++ b/editors/vi.c @@ -722,6 +722,22 @@ static void screen_erase(void) memset(screen, ' ', screensize); // clear new screen } +static char *new_screen(int ro, int co) +{ + int li; + + free(screen); + screensize = ro * co + 8; + screen = xmalloc(screensize); + // initialize the new screen. assume this will be a empty file. + screen_erase(); + // non-existent text[] lines start with a tilde (~). + for (li = 1; li < ro - 1; li++) { + screen[(li * co) + 0] = '~'; + } + return screen; +} + //----- Synchronize the cursor to Dot -------------------------- static NOINLINE void sync_cursor(char *d, int *row, int *col) { @@ -2882,22 +2898,6 @@ static void colon(char *buf) // TAB NEWLINE VT FF RETURN SPACE // DO NOT COUNT NEWLINE AS WHITESPACE -static char *new_screen(int ro, int co) -{ - int li; - - free(screen); - screensize = ro * co + 8; - screen = xmalloc(screensize); - // initialize the new screen. assume this will be a empty file. - screen_erase(); - // non-existent text[] lines start with a tilde (~). - for (li = 1; li < ro - 1; li++) { - screen[(li * co) + 0] = '~'; - } - return screen; -} - static int st_test(char *p, int type, int dir, char *tested) { char c, c0, ci; -- cgit v1.2.3-55-g6feb From e1a1b64f433661188d9e5591f2137860dab0c18a Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Wed, 3 Apr 2019 16:30:50 +0200 Subject: vi: code shrink function old new delta new_screen 84 75 -9 Signed-off-by: Denys Vlasenko --- editors/vi.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) (limited to 'editors/vi.c') diff --git a/editors/vi.c b/editors/vi.c index ce261feca..38177dec4 100644 --- a/editors/vi.c +++ b/editors/vi.c @@ -722,20 +722,25 @@ static void screen_erase(void) memset(screen, ' ', screensize); // clear new screen } -static char *new_screen(int ro, int co) +static void new_screen(int ro, int co) { - int li; + char *s; free(screen); screensize = ro * co + 8; - screen = xmalloc(screensize); + s = screen = xmalloc(screensize); // initialize the new screen. assume this will be a empty file. screen_erase(); - // non-existent text[] lines start with a tilde (~). - for (li = 1; li < ro - 1; li++) { - screen[(li * co) + 0] = '~'; + // non-existent text[] lines start with a tilde (~). + //screen[(1 * co) + 0] = '~'; + //screen[(2 * co) + 0] = '~'; + //.. + //screen[((ro-2) * co) + 0] = '~'; + ro -= 2; + while (--ro >= 0) { + s += co; + *s = '~'; } - return screen; } //----- Synchronize the cursor to Dot -------------------------- -- cgit v1.2.3-55-g6feb From a3ce161363380899ae45716c70714cfcc93a7755 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Wed, 3 Apr 2019 16:35:23 +0200 Subject: vi: revert change in how "end of file list" is deteced - fixes 'q' in bare "vi" 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 --- editors/vi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'editors/vi.c') diff --git a/editors/vi.c b/editors/vi.c index 38177dec4..c4360f8d3 100644 --- a/editors/vi.c +++ b/editors/vi.c @@ -2625,7 +2625,7 @@ static void colon(char *buf) if (useforce) { if (*cmd == 'q') { // force end of argv list - optind = cmdline_filecnt - 1; + optind = cmdline_filecnt; } editing = 0; goto ret; @@ -4384,7 +4384,7 @@ int vi_main(int argc, char **argv) edit_file(argv[optind]); // might be NULL on 1st iteration // NB: optind can be changed by ":next" and ":rewind" commands optind++; - if (!argv[optind]) + if (optind >= cmdline_filecnt) break; } // "Use normal screen buffer, restore cursor" -- cgit v1.2.3-55-g6feb