#include "libbb.h"
+/* the CRASHME code is unmaintained, and doesn't currently build */
#define ENABLE_FEATURE_VI_CRASHME 0
+
#if ENABLE_LOCALE_SUPPORT
-#define Isprint(c) isprint((c))
+
+#if ENABLE_FEATURE_VI_8BIT
+#define Isprint(c) isprint(c)
+#else
+#define Isprint(c) (isprint(c) && (unsigned char)(c) < 0x7f)
+#endif
+
#else
+
/* 0x9b is Meta-ESC */
+#if ENABLE_FEATURE_VI_8BIT
#define Isprint(c) ((unsigned char)(c) >= ' ' && (c) != 0x7f && (unsigned char)(c) != 0x9b)
+#else
+#define Isprint(c) ((unsigned char)(c) >= ' ' && (unsigned char)(c) < 0x7f)
+#endif
+
#endif
+
enum {
MAX_TABSTOP = 32, // sanity limit
// User input len. Need not be extra big.
S_END_ALNUM = 5, // used in skip_thing() for moving "dot"
};
+
/* vi.c expects chars to be unsigned. */
/* busybox build system provides that, but it's better */
/* to audit and fix the source */
-static smallint vi_setops;
+struct 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 */
+ smallint vi_setops;
#define VI_AUTOINDENT 1
#define VI_SHOWMATCH 2
#define VI_IGNORECASE 4
/* indicate error with beep or flash */
#define err_method (vi_setops & VI_ERR_METHOD)
-
-static smallint editing; // >0 while we are editing a file
- // [code audit says "can be 0 or 1 only"]
-static smallint cmd_mode; // 0=command 1=insert 2=replace
-static smallint file_modified; // buffer contents changed
-static smallint last_file_modified = -1;
-static int fn_start; // index of first cmd line file name
-static int save_argc; // how many file names on cmd line
-static int cmdcnt; // repetition count
-static int rows, columns; // the terminal screen is this size
-static int crow, ccol; // cursor is on Crow x Ccol
-static int offset; // chars scrolled off the screen to the left
-static char *status_buffer; // mesages to the user
-#define STATUS_BUFFER_LEN 200
-static int have_status_msg; // is default edit status needed?
- // [don't make smallint!]
-static int last_status_cksum; // hash of current status line
-static char *current_filename; // current file name
-//static char *text, *end; // pointers to the user data in memory
-static char *screen; // pointer to the virtual screen buffer
-static int screensize; // and its size
-static char *screenbegin; // index into text[], of top line on the screen
-//static char *dot; // where all the action takes place
-static int tabstop;
-static char erase_char; // the users erase character
-static char last_input_char; // last char read from user
-static char last_forward_char; // last char searched for with 'f'
-
#if ENABLE_FEATURE_VI_READONLY
-//static smallint vi_readonly, readonly;
-static smallint readonly_mode = 0;
+ smallint readonly_mode;
#define SET_READONLY_FILE(flags) ((flags) |= 0x01)
#define SET_READONLY_MODE(flags) ((flags) |= 0x02)
#define UNSET_READONLY_FILE(flags) ((flags) &= 0xfe)
#else
-#define readonly_mode 0
-#define SET_READONLY_FILE(flags)
-#define SET_READONLY_MODE(flags)
-#define UNSET_READONLY_FILE(flags)
-#endif
+#define SET_READONLY_FILE(flags) ((void)0)
+#define SET_READONLY_MODE(flags) ((void)0)
+#define UNSET_READONLY_FILE(flags) ((void)0)
+#endif
+
+ smallint editing; // >0 while we are editing a file
+ // [code audit says "can be 0, 1 or 2 only"]
+ smallint cmd_mode; // 0=command 1=insert 2=replace
+ int file_modified; // buffer contents changed (counter, not flag!)
+ int last_file_modified; // = -1;
+ int fn_start; // index of first cmd line file name
+ int save_argc; // how many file names on cmd line
+ int cmdcnt; // repetition count
+ unsigned rows, columns; // the terminal screen is this size
+ int crow, ccol; // cursor is on Crow x Ccol
+ int offset; // chars scrolled off the screen to the left
+ int have_status_msg; // is default edit status needed?
+ // [don't make smallint!]
+ int last_status_cksum; // hash of current status line
+ char *current_filename;
+ char *screenbegin; // index into text[], of top line on the screen
+ char *screen; // pointer to the virtual screen buffer
+ int screensize; // and its size
+ int tabstop;
+ char erase_char; // the users erase character
+ char last_input_char; // last char read from user
+ char last_forward_char; // last char searched for with 'f'
#if ENABLE_FEATURE_VI_DOT_CMD
-static smallint adding2q; // are we currently adding user input to q
-static char *last_modifying_cmd; // [MAX_INPUT_LEN] last modifying cmd for "."
-static char *ioq, *ioq_start; // pointer to string for get_one_char to "read"
+ smallint adding2q; // are we currently adding user input to q
+ 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_OPTIMIZE_CURSOR
-static int last_row; // where the cursor was last moved to
+ int last_row; // where the cursor was last moved to
#endif
#if ENABLE_FEATURE_VI_USE_SIGNALS || ENABLE_FEATURE_VI_CRASHME
-static int my_pid;
+ int my_pid;
#endif
#if ENABLE_FEATURE_VI_DOT_CMD || ENABLE_FEATURE_VI_YANKMARK
-static char *modifying_cmds; // cmds that modify text[]
+ char *modifying_cmds; // cmds that modify text[]
#endif
#if ENABLE_FEATURE_VI_SEARCH
-static char *last_search_pattern; // last pattern from a '/' or '?' search
+ char *last_search_pattern; // last pattern from a '/' or '?' search
#endif
+ int chars_to_parse;
+ /* former statics */
+#if ENABLE_FEATURE_VI_YANKMARK
+ char *edit_file__cur_line;
+#endif
+ int refresh__old_offset;
+ int format_edit_status__tot;
-/* Moving biggest data to malloced space... */
-struct 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
+ /* a few references only */
#if ENABLE_FEATURE_VI_YANKMARK
int YDreg, Ureg; // default delete register and orig line for "U"
char *reg[28]; // named register a-z, "D", and "U" 0-25,26,27
char *mark[28]; // user marks points somewhere in text[]- a-z and previous context ''
char *context_start, *context_end;
#endif
- /* a few references only */
#if ENABLE_FEATURE_VI_USE_SIGNALS
- jmp_buf restart; // catch_sig()
+ sigjmp_buf restart; // catch_sig()
#endif
- struct termios term_orig, term_vi; // remember what the cooked mode was
+ struct termios term_orig, term_vi; // remember what the cooked mode was
#if ENABLE_FEATURE_VI_COLON
char *initial_cmds[3]; // currently 2 entries, NULL terminated
#endif
// Should be just enough to hold a key sequence,
- // but CRASME mode uses it as generated command buffer too
+ // but CRASHME mode uses it as generated command buffer too
#if ENABLE_FEATURE_VI_CRASHME
- char readbuffer[128];
+ char readbuffer[128];
#else
- char readbuffer[32];
+ char readbuffer[8];
#endif
+#define STATUS_BUFFER_LEN 200
+ char status_buffer[STATUS_BUFFER_LEN]; // messages to the user
+#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 scr_out_buf[MAX_SCR_COLS + MAX_TABSTOP * 2];
};
#define end (G.end )
#define dot (G.dot )
#define reg (G.reg )
+
+#define vi_setops (G.vi_setops )
+#define editing (G.editing )
+#define cmd_mode (G.cmd_mode )
+#define file_modified (G.file_modified )
+#define last_file_modified (G.last_file_modified )
+#define fn_start (G.fn_start )
+#define save_argc (G.save_argc )
+#define cmdcnt (G.cmdcnt )
+#define rows (G.rows )
+#define columns (G.columns )
+#define crow (G.crow )
+#define ccol (G.ccol )
+#define offset (G.offset )
+#define status_buffer (G.status_buffer )
+#define have_status_msg (G.have_status_msg )
+#define last_status_cksum (G.last_status_cksum )
+#define current_filename (G.current_filename )
+#define screen (G.screen )
+#define screensize (G.screensize )
+#define screenbegin (G.screenbegin )
+#define tabstop (G.tabstop )
+#define erase_char (G.erase_char )
+#define last_input_char (G.last_input_char )
+#define last_forward_char (G.last_forward_char )
+#if ENABLE_FEATURE_VI_READONLY
+#define readonly_mode (G.readonly_mode )
+#else
+#define readonly_mode 0
+#endif
+#define adding2q (G.adding2q )
+#define lmc_len (G.lmc_len )
+#define ioq (G.ioq )
+#define ioq_start (G.ioq_start )
+#define last_row (G.last_row )
+#define my_pid (G.my_pid )
+#define modifying_cmds (G.modifying_cmds )
+#define last_search_pattern (G.last_search_pattern)
+#define chars_to_parse (G.chars_to_parse )
+
+#define edit_file__cur_line (G.edit_file__cur_line)
+#define refresh__old_offset (G.refresh__old_offset)
+#define format_edit_status__tot (G.format_edit_status__tot)
+
#define YDreg (G.YDreg )
#define Ureg (G.Ureg )
#define mark (G.mark )
#define initial_cmds (G.initial_cmds )
#define readbuffer (G.readbuffer )
#define scr_out_buf (G.scr_out_buf )
+#define last_modifying_cmd (G.last_modifying_cmd )
+#define get_input_line__buf (G.get_input_line__buf)
+
#define INIT_G() do { \
- PTR_TO_GLOBALS = xzalloc(sizeof(G)); \
+ SET_PTR_TO_GLOBALS(xzalloc(sizeof(G))); \
+ last_file_modified = -1; \
} while (0)
+
static int init_text_buffer(char *); // init from file or create new
static void edit_file(char *); // edit one file
static void do_cmd(char); // execute a command
static char *new_screen(int, int); // malloc virtual screen memory
static char *char_insert(char *, char); // insert the char c at 'p'
static char *stupid_insert(char *, char); // stupidly insert the char c at 'p'
-static char find_range(char **, char **, char); // return pointers for an object
+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 () [] {}
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 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
int vi_main(int argc, char **argv)
{
int c;
- RESERVE_CONFIG_BUFFER(STATUS_BUFFER, STATUS_BUFFER_LEN);
+
+ INIT_G();
#if ENABLE_FEATURE_VI_USE_SIGNALS || ENABLE_FEATURE_VI_CRASHME
my_pid = getpid();
#endif
-
- INIT_G();
-
#if ENABLE_FEATURE_VI_CRASHME
srand((long) my_pid);
#endif
-
- status_buffer = STATUS_BUFFER;
- last_status_cksum = 0;
- text = NULL;
-
#ifdef NO_SUCH_APPLET_YET
/* If we aren't "vi", we are "view" */
if (ENABLE_FEATURE_VI_READONLY && applet_name[2]) {
#endif
vi_setops = VI_AUTOINDENT | VI_SHOWMATCH | VI_IGNORECASE;
-#if ENABLE_FEATURE_VI_YANKMARK
- memset(reg, 0, sizeof(reg)); // init the yank regs
-#endif
#if ENABLE_FEATURE_VI_DOT_CMD || ENABLE_FEATURE_VI_YANKMARK
modifying_cmds = (char *) "aAcCdDiIJoOpPrRsxX<>~"; // cmds modifying text[]
#endif
initial_cmds[0] = xstrndup(p, MAX_INPUT_LEN);
}
#endif
- while ((c = getopt(argc, argv, "hCR" USE_FEATURE_VI_COLON("c:"))) != -1) {
+ while ((c = getopt(argc, argv, "hCRH" USE_FEATURE_VI_COLON("c:"))) != -1) {
switch (c) {
#if ENABLE_FEATURE_VI_CRASHME
case 'C':
SET_READONLY_MODE(readonly_mode);
break;
#endif
- //case 'r': // recover flag- ignore- we don't use tmp file
- //case 'x': // encryption flag- ignore
- //case 'c': // execute command first
#if ENABLE_FEATURE_VI_COLON
case 'c': // cmd line vi command
if (*optarg)
initial_cmds[initial_cmds[0] != 0] = xstrndup(optarg, MAX_INPUT_LEN);
break;
- //case 'h': // help -- just use default
#endif
- default:
+ case 'H':
show_help();
+ /* fall through */
+ default:
+ bb_show_usage();
return 1;
}
}
/* allocate/reallocate text buffer */
free(text);
- text_size = size * 2;
- if (text_size < 10240)
- text_size = 10240; // have a minimum size for new files
+ text_size = size + 10240;
screenbegin = dot = end = text = xzalloc(text_size);
if (fn != current_filename) {
static void edit_file(char *fn)
{
+#if ENABLE_FEATURE_VI_YANKMARK
+#define cur_line edit_file__cur_line
+#endif
char c;
int size;
-
#if ENABLE_FEATURE_VI_USE_SIGNALS
int sig;
#endif
-#if ENABLE_FEATURE_VI_YANKMARK
- static char *cur_line;
-#endif
editing = 1; // 0 = exit, 1 = one file, 2 = multiple files
rawmode();
catch_sig(0);
signal(SIGWINCH, winch_sig);
signal(SIGTSTP, suspend_sig);
- sig = setjmp(restart);
+ sig = sigsetjmp(restart, 1);
if (sig != 0) {
screenbegin = dot = text;
}
offset = 0; // no horizontal offset
c = '\0';
#if ENABLE_FEATURE_VI_DOT_CMD
- free(last_modifying_cmd);
free(ioq_start);
- ioq = ioq_start = last_modifying_cmd = NULL;
+ ioq = ioq_start = NULL;
+ lmc_len = 0;
adding2q = 0;
#endif
- redraw(FALSE); // dont force every col re-draw
#if ENABLE_FEATURE_VI_COLON
{
}
}
#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
// These are commands that change text[].
// Remember the input for the "." command
if (!adding2q && ioq_start == NULL
- && strchr(modifying_cmds, c)
+ && c != '\0' && strchr(modifying_cmds, c)
) {
start_new_cmd_q(c);
}
}
//-------------------------------------------------------------------
- place_cursor(rows, 0, FALSE); // go to bottom of screen
- clear_to_eol(); // Erase to end of line
+ place_cursor(rows - 1, 0, FALSE); // go to bottom of screen
+ clear_to_eol(); // erase to end of line
cookmode();
+#undef cur_line
}
//----- The Colon commands -------------------------------------
else if (strncmp(cmd, "!", 1) == 0) { // run a cmd
int retcode;
// :!ls run the <cmd>
- alarm(0); // wait for input- no alarms
place_cursor(rows - 1, 0, FALSE); // go to Status line
clear_to_eol(); // clear the line
cookmode();
printf("\nshell returned %i\n\n", retcode);
rawmode();
Hit_Return(); // let user see results
- alarm(3); // done waiting for input
}
#endif
else if (strncmp(cmd, "=", i) == 0) { // where is the address
if (c_is_no_print) {
c = '.';
standout_start();
- }
+ }
if (c == '\n') {
write1("$\r");
} else if (c < ' ' || c == 127) {
}
#endif /* FEATURE_VI_SEARCH */
} else if (strncasecmp(cmd, "version", i) == 0) { // show software version
- status_line("%s", BB_VER " " BB_BT);
+ status_line(BB_VER " " BB_BT);
} else if (strncasecmp(cmd, "write", i) == 0 // write text to file
|| strncasecmp(cmd, "wq", i) == 0
|| strncasecmp(cmd, "wn", i) == 0
{
char c;
- standout_start(); // start reverse video
+ standout_start();
write1("[Hit return to continue]");
- standout_end(); // end reverse video
+ standout_end();
while ((c = get_one_char()) != '\n' && c != '\r')
continue;
redraw(TRUE); // force redraw all
}
//----- Synchronize the cursor to Dot --------------------------
-static void sync_cursor(char * d, int *row, int *col)
+static void sync_cursor(char *d, int *row, int *col)
{
char *beg_cur; // begin and end of "d" line
- char *end_scr; // begin and end of screen
char *tp;
int cnt, ro, co;
beg_cur = begin_line(d); // first char of cur line
- end_scr = end_screen(); // last char of screen
-
if (beg_cur < screenbegin) {
- // "d" is before top line on screen
+ // "d" is before top line on screen
// how many lines do we have to move
cnt = count_lines(beg_cur, screenbegin);
sc1:
screenbegin = prev_line(screenbegin);
}
}
- } else 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);
+ } 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
// find out what col "d" is on
co = 0;
- do { // drive "co" to correct column
+ while (tp < d) { // drive "co" to correct column
if (*tp == '\n') //vda || *tp == '\0')
break;
if (*tp == '\t') {
- if (d == tp && cmd_mode) { /* handle tabs like real vi */
+ // handle tabs like real vi
+ if (d == tp && cmd_mode) {
break;
- } else {
- co = next_tabstop(co);
}
- } else if (*tp < ' ' || *tp == 127) {
- co++; // display as ^X, use 2 columns
+ co = next_tabstop(co);
+ } else if ((unsigned char)*tp < ' ' || *tp == 0x7f) {
+ co++; // display as ^X, use 2 columns
}
- } while (tp++ < d && ++co);
+ co++;
+ tp++;
+ }
// "co" is the column where "dot" is.
// The screen has "columns" columns.
}
//----- Text Movement Routines ---------------------------------
-static char *begin_line(char * p) // return pointer to first char cur line
+static char *begin_line(char *p) // return pointer to first char cur line
{
- while (p > text && p[-1] != '\n')
- p--; // go to cur line B-o-l
+ 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 line
+static char *end_line(char *p) // return pointer to NL of cur line
{
- while (p < end - 1 && *p != '\n')
- p++; // go to cur line E-o-l
+ 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
+static char *dollar_line(char *p) // return pointer to just before NL line
{
- while (p < end - 1 && *p != '\n')
- p++; // go to cur line E-o-l
+ 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
+static char *prev_line(char *p) // return pointer first char prev line
{
p = begin_line(p); // goto begining of cur line
- if (p[-1] == '\n' && p > text)
+ if (p > text && p[-1] == '\n')
p--; // step to prev line
p = begin_line(p); // goto begining of prev line
return p;
}
-static char *next_line(char * p) // return pointer first char next line
+static char *next_line(char *p) // return pointer first char next line
{
p = end_line(p);
- if (*p == '\n' && p < end - 1)
+ if (p < end - 1 && *p == '\n')
p++; // step to next line
return p;
}
return q;
}
-static int count_lines(char * start, char * stop) // count line from start to stop
+// 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
+ if (stop < start) { // start and stop are backwards- reverse them
q = start;
start = stop;
stop = q;
}
cnt = 0;
- stop = end_line(stop); // get to end of this line
- for (q = start; q <= stop && q <= end - 1; q++) {
- if (*q == '\n')
+ stop = end_line(stop);
+ while (start <= stop && start <= end - 1) {
+ start = end_line(start);
+ if (*start == '\n')
cnt++;
+ start++;
}
return cnt;
}
p = begin_line(p);
co = 0;
- do {
+ 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++; // display as ^X, use 2 columns
}
- } while (++co <= l && p++ < end);
+ co++;
+ p++;
+ }
return p;
}
for (; cnt > 0; cnt--) {
if (dir < 0) {
// scroll Backwards
- // ctrl-Y scroll up one line
+ // ctrl-Y scroll up one line
screenbegin = prev_line(screenbegin);
} else {
// scroll Forwards
- // ctrl-E scroll down one line
+ // ctrl-E scroll down one line
screenbegin = next_line(screenbegin);
}
}
text_hole_delete(dot, dot);
}
-static char *bound_dot(char * p) // make sure text[0] <= P < "end"
+static char *bound_dot(char *p) // make sure text[0] <= P < "end"
{
if (p >= end && end > text) {
p = end - 1;
}
#if ENABLE_FEATURE_VI_SEARCH
-static int mycmp(const char * s1, const char * s2, int len)
+static int mycmp(const char *s1, const char *s2, int len)
{
int i;
}
// search for pattern starting at p
-static char *char_search(char * p, const char * pat, int dir, int range)
+static char *char_search(char *p, const char *pat, int dir, int range)
{
#ifndef REGEX_SEARCH
char *start, *stop;
}
#endif /* FEATURE_VI_SEARCH */
-static char *char_insert(char * p, char c) // insert the char c at 'p'
+static char *char_insert(char *p, char c) // insert the char c at 'p'
{
if (c == 22) { // Is this an ctrl-V?
p = stupid_insert(p, '^'); // use ^ to indicate literal next
c = get_one_char();
*p = c;
p++;
- file_modified++; // has the file been modified
+ file_modified++;
} else if (c == 27) { // Is this an ESC?
cmd_mode = 0;
cmdcnt = 0;
return p;
}
-static char *stupid_insert(char * p, char c) // stupidly insert the char c at 'p'
+static char *stupid_insert(char *p, char c) // stupidly insert the char c at 'p'
{
p = text_hole_make(p, 1);
- if (p != 0) {
- *p = c;
- file_modified++; // has the file been modified
- p++;
- }
- return p;
+ *p = c;
+ //file_modified++; - done by text_hole_make()
+ return p + 1;
}
-static char find_range(char ** start, char ** stop, char c)
+static int find_range(char **start, char **stop, char c)
{
- char *save_dot, *p, *q;
- int cnt;
+ char *save_dot, *p, *q, *t;
+ int cnt, multiline = 0;
save_dot = dot;
p = q = dot;
q = next_line(q);
}
q = end_line(q);
- } else if (strchr("^%$0bBeEft", c)) {
+ } else if (strchr("^%$0bBeEfth\b\177", c)) {
// These cmds operate on char positions
do_cmd(c); // execute movement cmd
q = dot;
dot_end(); // find NL
q = dot;
} else {
- c = 27; // error- return an ESC char
- //break;
+ // 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.
+ //
}
- *start = p;
- *stop = q;
if (q < p) {
- *start = q;
- *stop = 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 c;
+ return multiline;
}
-static int st_test(char * p, int type, int dir, char * tested)
+static int st_test(char *p, int type, int dir, char *tested)
{
char c, c0, ci;
int test, inc;
return test;
}
-static char *skip_thing(char * p, int linecnt, int dir, int type)
+static char *skip_thing(char *p, int linecnt, int dir, int type)
{
char c;
}
// find matching char of pair () [] {}
-static char *find_pair(char * p, const char c)
+static char *find_pair(char *p, const char c)
{
char match, *q;
int dir, level;
level = 1;
dir = 1; // assume forward
switch (c) {
- case '(':
- match = ')';
- break;
- case '[':
- match = ']';
- break;
- case '{':
- match = '}';
- break;
- case ')':
- match = '(';
- dir = -1;
- break;
- case ']':
- match = '[';
- dir = -1;
- break;
- case '}':
- match = '{';
- dir = -1;
- break;
+ case '(': match = ')'; break;
+ case '[': match = ']'; break;
+ case '{': match = '}'; break;
+ case ')': match = '('; dir = -1; break;
+ case ']': match = '['; dir = -1; break;
+ case '}': match = '{'; dir = -1; break;
}
for (q = p + dir; text <= q && q < end; q += dir) {
// look for match, count levels of pairs (( ))
#if ENABLE_FEATURE_VI_SETOPTS
// show the matching char of a pair, () [] {}
-static void showmatching(char * p)
+static void showmatching(char *p)
{
char *q, *save_dot;
#endif /* FEATURE_VI_SETOPTS */
// open a hole in text[]
-static char *text_hole_make(char * p, int size) // at "p", make a 'size' byte hole
+static char *text_hole_make(char *p, int size) // at "p", make a 'size' byte hole
{
- char *src, *dest;
- int cnt;
-
if (size <= 0)
- goto thm0;
- src = p;
- dest = p + size;
- cnt = end - src; // the rest of buffer
- if ( ((end + size) >= (text + text_size)) // TODO: realloc here
- || memmove(dest, src, cnt) != dest) {
- status_line_bold("can't create room for new characters");
- p = NULL;
- goto thm0;
- }
- memset(p, ' ', size); // clear new hole
+ return p;
end += size; // adjust the new END
- file_modified++; // has the file been modified
- thm0:
+ if (end >= (text + text_size)) {
+ char *new_text;
+ text_size += end - (text + text_size) + 10240;
+ new_text = xrealloc(text, text_size);
+ screenbegin = new_text + (screenbegin - text);
+ dot = new_text + (dot - text);
+ end = new_text + (end - text);
+ p = new_text + (p - text);
+ text = new_text;
+ }
+ memmove(p + size, p, end - size - p);
+ memset(p, ' ', size); // clear new hole
+ file_modified++;
return p;
}
// close a hole in text[]
-static char *text_hole_delete(char * p, char * q) // delete "p" thru "q", inclusive
+static char *text_hole_delete(char *p, char *q) // delete "p" through "q", inclusive
{
char *src, *dest;
int cnt, hole_size;
goto thd0;
if (src >= end)
goto thd_atend; // just delete the end of the buffer
- if (memmove(dest, src, cnt) != dest) {
- status_line_bold("can't delete the character");
- }
+ 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
- file_modified++; // has the file been modified
+ file_modified++;
thd0:
return dest;
}
// copy text into register, then delete text.
// if dist <= 0, do not include, or go past, a NewLine
//
-static char *yank_delete(char * start, char * stop, int dist, int yf)
+static char *yank_delete(char *start, char *stop, int dist, int yf)
{
char *p;
static void start_new_cmd_q(char c)
{
// get buffer for new cmd
- if (!last_modifying_cmd)
- last_modifying_cmd = xzalloc(MAX_INPUT_LEN);
// if there is a current cmd count put it in the buffer first
- if (cmdcnt > 0)
- sprintf(last_modifying_cmd, "%d%c", cmdcnt, c);
- else { // just save char c onto queue
+ 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;
- last_modifying_cmd[1] = '\0';
+ lmc_len = 1;
}
adding2q = 1;
}
#if ENABLE_FEATURE_VI_YANKMARK \
|| (ENABLE_FEATURE_VI_COLON && ENABLE_FEATURE_VI_SEARCH) \
|| ENABLE_FEATURE_VI_CRASHME
-static char *string_insert(char * p, char * s) // insert the string at 'p'
+static char *string_insert(char *p, char *s) // insert the string at 'p'
{
int cnt, i;
i = strlen(s);
- if (text_hole_make(p, i)) {
- strncpy(p, s, i);
- for (cnt = 0; *s != '\0'; s++) {
- if (*s == '\n')
- cnt++;
- }
+ text_hole_make(p, i);
+ strncpy(p, s, i);
+ for (cnt = 0; *s != '\0'; s++) {
+ if (*s == '\n')
+ cnt++;
+ }
#if ENABLE_FEATURE_VI_YANKMARK
- status_line("Put %d lines (%d chars) from [%c]", cnt, i, what_reg());
+ status_line("Put %d lines (%d chars) from [%c]", cnt, i, what_reg());
#endif
- }
return p;
}
#endif
#if ENABLE_FEATURE_VI_YANKMARK
-static char *text_yank(char * p, char * q, int dest) // copy text into a register
+static char *text_yank(char *p, char *q, int dest) // copy text into a register
{
char *t;
int cnt;
}
}
-static char *swap_context(char * p) // goto new context for '' command make this the current context
+static char *swap_context(char *p) // goto new context for '' command make this the current context
{
char *tmp;
//----- Come here when we get a window resize signal ---------
#if ENABLE_FEATURE_VI_USE_SIGNALS
-static void winch_sig(int sig ATTRIBUTE_UNUSED)
+static void winch_sig(int sig UNUSED_PARAM)
{
+ // FIXME: do it in main loop!!!
signal(SIGWINCH, winch_sig);
if (ENABLE_FEATURE_VI_WIN_RESIZE) {
get_terminal_width_height(0, &columns, &rows);
}
//----- Come here when we get a continue signal -------------------
-static void cont_sig(int sig ATTRIBUTE_UNUSED)
+static void cont_sig(int sig UNUSED_PARAM)
{
- rawmode(); // terminal to "raw"
- last_status_cksum = 0; // force status update
- redraw(TRUE); // re-draw the screen
+ rawmode(); // terminal to "raw"
+ last_status_cksum = 0; // force status update
+ redraw(TRUE); // re-draw the screen
signal(SIGTSTP, suspend_sig);
signal(SIGCONT, SIG_DFL);
- kill(my_pid, SIGCONT);
+ kill(my_pid, SIGCONT); // huh? why? we are already "continued"...
}
//----- Come here when we get a Suspend signal -------------------
-static void suspend_sig(int sig ATTRIBUTE_UNUSED)
+static void suspend_sig(int sig UNUSED_PARAM)
{
- place_cursor(rows - 1, 0, FALSE); // go to bottom of screen
- clear_to_eol(); // Erase to end of line
- cookmode(); // terminal to "cooked"
+ place_cursor(rows - 1, 0, FALSE); // go to bottom of screen
+ clear_to_eol(); // erase to end of line
+ cookmode(); // terminal to "cooked"
signal(SIGCONT, cont_sig);
signal(SIGTSTP, SIG_DFL);
{
signal(SIGINT, catch_sig);
if (sig)
- longjmp(restart, sig);
+ siglongjmp(restart, sig);
}
#endif /* FEATURE_VI_USE_SIGNALS */
return safe_poll(pfd, 1, hund*10) > 0;
}
-static int chars_to_parse;
-
//----- IO Routines --------------------------------------------
static char readit(void) // read (maybe cursor) key from stdin
{
char c;
int n;
- struct esc_cmds {
+
+ // Known escape sequences for cursor and function keys.
+ static const struct esc_cmds {
const char seq[4];
char val;
- };
-
- static const struct esc_cmds esccmds[] = {
+ } esccmds[] = {
{"OA" , VI_K_UP }, // cursor key Up
{"OB" , VI_K_DOWN }, // cursor key Down
{"OC" , VI_K_RIGHT }, // Cursor Key Right
{"OD" , VI_K_LEFT }, // cursor key Left
{"OH" , VI_K_HOME }, // Cursor Key Home
{"OF" , VI_K_END }, // Cursor Key End
+ {"OP" , VI_K_FUN1 }, // Function Key F1
+ {"OQ" , VI_K_FUN2 }, // Function Key F2
+ {"OR" , VI_K_FUN3 }, // Function Key F3
+ {"OS" , VI_K_FUN4 }, // Function Key F4
+
{"[A" , VI_K_UP }, // cursor key Up
{"[B" , VI_K_DOWN }, // cursor key Down
{"[C" , VI_K_RIGHT }, // Cursor Key Right
{"[4~" , VI_K_END }, // Cursor Key End
{"[5~" , VI_K_PAGEUP }, // Cursor Key Page Up
{"[6~" , VI_K_PAGEDOWN}, // Cursor Key Page Down
- {"OP" , VI_K_FUN1 }, // Function Key F1
- {"OQ" , VI_K_FUN2 }, // Function Key F2
- {"OR" , VI_K_FUN3 }, // Function Key F3
- {"OS" , VI_K_FUN4 }, // Function Key F4
// careful: these have no terminating NUL!
{"[11~", VI_K_FUN1 }, // Function Key F1
{"[12~", VI_K_FUN2 }, // Function Key F2
{"[23~", VI_K_FUN11 }, // Function Key F11
{"[24~", VI_K_FUN12 }, // Function Key F12
};
- enum { ESCCMDS_COUNT = ARRAY_SIZE(esccmds) };
- alarm(0); // turn alarm OFF while we wait for input
fflush(stdout);
+
n = chars_to_parse;
- // get input from User- are there already input chars in Q?
- if (n <= 0) {
- // the Q is empty, wait for a typed char
- n = safe_read(0, readbuffer, sizeof(readbuffer));
- if (n < 0) {
- if (errno == EBADF || errno == EFAULT || errno == EINVAL
- || errno == EIO)
- editing = 0; // want to exit
- errno = 0;
- }
- if (n <= 0)
- return 0; // error
- if (readbuffer[0] == 27) {
- // This is an ESC char. Is this Esc sequence?
- // Could be bare Esc key. See if there are any
- // more chars to read after the ESC. This would
- // be a Function or Cursor Key sequence.
- struct pollfd pfd[1];
- pfd[0].fd = 0;
- pfd[0].events = POLLIN;
- // keep reading while there are input chars, and room in buffer
- // for a complete ESC sequence (assuming 8 chars is enough)
- while (safe_poll(pfd, 1, 0) > 0 && n <= (sizeof(readbuffer) - 8)) {
- // read the rest of the ESC string
- int r = safe_read(0, readbuffer + n, sizeof(readbuffer) - n);
- if (r > 0)
- n += r;
- }
+ if (n == 0) {
+ // If no data, block waiting for input.
+ n = safe_read(0, readbuffer, 1);
+ if (n <= 0) {
+ error:
+ place_cursor(rows - 1, 0, FALSE); // go to bottom of screen
+ clear_to_eol(); // erase to end of line
+ cookmode(); // terminal to "cooked"
+ bb_error_msg_and_die("can't read user input");
}
- chars_to_parse = n;
}
+
+ // Grab character to return from buffer
c = readbuffer[0];
- if (c == 27 && n > 1) {
- // Maybe cursor or function key?
+ // Returning NUL from this routine would be bad.
+ if (c == '\0')
+ c = ' ';
+ n--;
+ if (n) memmove(readbuffer, readbuffer + 1, n);
+
+ // If it's an escape sequence, loop through known matches.
+ if (c == 27) {
const struct esc_cmds *eindex;
- for (eindex = esccmds; eindex < &esccmds[ESCCMDS_COUNT]; eindex++) {
+ for (eindex = esccmds; eindex < esccmds + ARRAY_SIZE(esccmds); eindex++) {
+ // n - position in seq to read
+ int i = 0; // position in seq to compare
int cnt = strnlen(eindex->seq, 4);
- if (n <= cnt)
- continue;
- if (strncmp(eindex->seq, readbuffer + 1, cnt) != 0)
- continue;
- c = eindex->val; // magic char value
- n = cnt + 1; // squeeze out the ESC sequence
- goto found;
- }
- // defined ESC sequence not found
- }
- n = 1;
- found:
- // remove key sequence from Q
- chars_to_parse -= n;
- memmove(readbuffer, readbuffer + n, sizeof(readbuffer) - n);
- alarm(3); // we are done waiting for input, turn alarm ON
+
+ // Loop through chars in this sequence.
+ for (;;) {
+ // We've matched this escape sequence up to [i-1]
+ if (n <= i) {
+ // Need more chars, read another one if it wouldn't block.
+ // (Note that escape sequences come in as a unit,
+ // so if we would block it's not really an escape sequence.)
+ struct pollfd pfd;
+ pfd.fd = 0;
+ pfd.events = POLLIN;
+ // Rob needed 300ms timeout on qemu
+ if (safe_poll(&pfd, 1, /*timeout:*/ 300)) {
+ if (safe_read(0, readbuffer + n, 1) <= 0)
+ goto error;
+ n++;
+ } else {
+ // No more data!
+ // Array is sorted from shortest to longest,
+ // we can't match anything later in array,
+ // break out of both loops.
+ goto loop_out;
+ }
+ }
+ if (readbuffer[i] != eindex->seq[i])
+ break; // try next seq
+ if (++i == cnt) { // entire seq matched
+ c = eindex->val;
+ n = 0;
+ goto loop_out;
+ }
+ }
+ }
+ // We did not find matching sequence, it was a bare ESC.
+ // We possibly read and stored more input in readbuffer by now.
+ }
+loop_out:
+
+ chars_to_parse = n;
return c;
}
char c;
#if ENABLE_FEATURE_VI_DOT_CMD
- // ! adding2q && ioq == 0 read()
- // ! adding2q && ioq != 0 *ioq
- // adding2q *last_modifying_cmd= read()
if (!adding2q) {
// we are not adding to the q.
// but, we may be reading from a q
} else {
// adding STDIN chars to q
c = readit(); // get the users input
- if (last_modifying_cmd != NULL) {
- int len = strlen(last_modifying_cmd);
- if (len >= MAX_INPUT_LEN - 1) {
- status_line_bold("last_modifying_cmd overrun");
- } else {
- // add new char to q
- last_modifying_cmd[len] = c;
- }
+ 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
// Get input line (uses "status line" area)
static char *get_input_line(const char *prompt)
{
- static char *buf; // [MAX_INPUT_LEN]
+ // char [MAX_INPUT_LEN]
+#define buf get_input_line__buf
char c;
int i;
- if (!buf) buf = xmalloc(MAX_INPUT_LEN);
-
strcpy(buf, prompt);
last_status_cksum = 0; // force status update
place_cursor(rows - 1, 0, FALSE); // go to Status line, bottom of screen
}
refresh(FALSE);
return buf;
+#undef buf
}
static int file_size(const char *fn) // what is the byte size of "fn"
return cnt;
}
-static int file_insert(const char * fn, char *p
+static int file_insert(const char *fn, char *p
USE_FEATURE_VI_READONLY(, int update_ro_status))
{
int cnt = -1;
status_line_bold("\"%s\" %s", fn, strerror(errno));
goto fi0;
}
- if ((statbuf.st_mode & S_IFREG) == 0) {
+ if (!S_ISREG(statbuf.st_mode)) {
// This is not a regular file
status_line_bold("\"%s\" Not a regular file", fn);
goto fi0;
}
- /* // this check is done by open()
- if ((statbuf.st_mode & (S_IRUSR | S_IRGRP | S_IROTH)) == 0) {
- // dont have any read permissions
- status_line_bold("\"%s\" Not readable", fn);
- goto fi0;
- }
- */
if (p < text || p > end) {
status_line_bold("Trying to insert file outside of memory");
goto fi0;
}
size = statbuf.st_size;
p = text_hole_make(p, size);
- if (p == NULL)
- goto fi0;
cnt = safe_read(fd, p, size);
if (cnt < 0) {
status_line_bold("\"%s\" %s", fn, strerror(errno));
return cnt;
}
-
-static int file_write(char * fn, char * first, char * last)
+static int file_write(char *fn, char *first, char *last)
{
int fd, cnt, charcnt;
return -2;
}
charcnt = 0;
- fd = open(fn, (O_WRONLY | O_CREAT | O_TRUNC), 0666);
+ /* 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
- //file_modified = FALSE; // the file has not been modified
+ //file_modified = FALSE;
} else {
charcnt = 0;
}
static void place_cursor(int row, int col, int optimize)
{
char cm1[sizeof(CMrc) + sizeof(int)*3 * 2];
+#if ENABLE_FEATURE_VI_OPTIMIZE_CURSOR
+ enum {
+ SZ_UP = sizeof(CMup),
+ SZ_DN = sizeof(CMdown),
+ SEQ_SIZE = SZ_UP > SZ_DN ? SZ_UP : SZ_DN,
+ };
+ char cm2[SEQ_SIZE * 5 + 32]; // bigger than worst case size
+#endif
char *cm;
if (row < 0) row = 0;
#if ENABLE_FEATURE_VI_OPTIMIZE_CURSOR
if (optimize && col < 16) {
- enum {
- SZ_UP = sizeof(CMup),
- SZ_DN = sizeof(CMdown),
- SEQ_SIZE = SZ_UP > SZ_DN ? SZ_UP : SZ_DN,
- };
- char cm2[SEQ_SIZE * 5 + 32]; // bigger than worst case size
char *screenp;
int Rrow = last_row;
int diff = Rrow - row;
}
skip: ;
}
+ last_row = row;
#endif /* FEATURE_VI_OPTIMIZE_CURSOR */
write1(cm);
- last_row = row;
}
//----- Erase from cursor to end of line -----------------------
// show file status on status line
static int format_edit_status(void)
{
- static int tot;
static const char cmd_mode_indicator[] ALIGN1 = "-IR-";
+
+#define tot format_edit_status__tot
+
int cur, percent, ret, trunc_at;
// file_modified is now a counter rather than a flag. this
return ret; /* it all fit */
return trunc_at; /* had to truncate */
+#undef tot
}
//----- Force refresh of all Lines -----------------------------
static void redraw(int full_screen)
{
place_cursor(0, 0, FALSE); // put cursor in correct place
- clear_to_eos(); // tel terminal to erase display
+ clear_to_eos(); // tell terminal to erase display
screen_erase(); // erase the internal screen buffer
last_status_cksum = 0; // force status update
refresh(full_screen); // this will redraw the entire display
}
//----- Format a text[] line into a buffer ---------------------
-// Returns number of leading chars which should be ignored
-// (return value is always <= offset)
-static char* format_line(char *src, int li)
+static char* format_line(char *src /*, int li*/)
{
- char c;
+ unsigned char c;
int co;
int ofs = offset;
char *dest = scr_out_buf; // [MAX_SCR_COLS + MAX_TABSTOP * 2]
- memset(dest, ' ', MAX_SCR_COLS + MAX_TABSTOP * 2);
-
c = '~'; // char in col 0 in non-existent lines is '~'
- for (co = 0; co < MAX_SCR_COLS + MAX_TABSTOP; co++) {
- // are there chars in text[] and have we gone past the end
+ co = 0;
+ while (co < columns + tabstop) {
+ // have we gone past the end?
if (src < end) {
c = *src++;
if (c == '\n')
if ((c & 0x80) && !Isprint(c)) {
c = '.';
}
- if ((unsigned char)c < ' ' || c == 0x7f) {
+ if (c < ' ' || c == 0x7f) {
if (c == '\t') {
c = ' ';
// co % 8 != 7
}
}
}
- dest[co] = c;
+ dest[co++] = c;
// discard scrolled-off-to-the-left portion,
// in tabstop-sized pieces
if (ofs >= tabstop && co >= tabstop) {
- memmove(dest, dest + tabstop, co + 1);
+ memmove(dest, dest + tabstop, co);
co -= tabstop;
ofs -= tabstop;
}
}
// check "short line, gigantic offset" case
if (co < ofs)
- ofs = co + 1;
- dest[ofs + MAX_SCR_COLS] = '\0';
- return &dest[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;
}
//----- Refresh the changed screen lines -----------------------
//
static void refresh(int full_screen)
{
- static int old_offset;
+#define old_offset refresh__old_offset
int li, changed;
char *tp, *sp; // pointer into text[] and screen[]
if (ENABLE_FEATURE_VI_WIN_RESIZE) {
- int c = columns, r = rows;
+ unsigned c = columns, r = rows;
get_terminal_width_height(0, &columns, &rows);
if (rows > MAX_SCR_ROWS) rows = MAX_SCR_ROWS;
if (columns > MAX_SCR_COLS) columns = MAX_SCR_COLS;
// 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
- char *out_buf = format_line(tp, li);
+ out_buf = format_line(tp /*, li*/);
// skip to the end of the current text[] line
- while (tp < end && *tp++ != '\n')
- continue;
+ 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 vitual screen and out_buf
changed = FALSE; // assume no change
place_cursor(crow, ccol, TRUE);
old_offset = offset;
+#undef old_offset
}
//---------------------------------------------------------------------
//----- Execute a Vi Command -----------------------------------
static void do_cmd(char c)
{
- const char *msg;
+ const char *msg = msg; // for compiler
char c1, *p, *q, *save_dot;
char buf[12];
- int cnt, i, j, dir, yf;
+ int dir = dir; // for compiler
+ int cnt, i, j;
-// c1 = c; // quiet the compiler
-// cnt = yf = dir = 0; // quiet the compiler
-// msg = p = q = save_dot = buf; // quiet the compiler
+// c1 = c; // quiet the compiler
+// cnt = yf = 0; // quiet the compiler
+// msg = p = q = save_dot = buf; // quiet the compiler
memset(buf, '\0', 12);
show_status_line();
//case '(': // (-
//case ')': // )-
//case '*': // *-
- //case ',': // ,-
//case '=': // =-
//case '@': // @-
//case 'F': // F-
//case ']': // ]-
//case '_': // _-
//case '`': // `-
- //case 'g': // g-
//case 'u': // u- FIXME- there is no undo
//case 'v': // v-
default: // unrecognised command
case VI_K_PAGEUP: // Cursor Key Page Up
dot_scroll(rows - 2, -1);
break;
-#if ENABLE_FEATURE_VI_USE_SIGNALS
- case 0x03: // ctrl-C interrupt
- longjmp(restart, 1);
- break;
- case 26: // ctrl-Z suspend
- suspend_sig(SIGTSTP);
- break;
-#endif
case 4: // ctrl-D scroll down half screen
dot_scroll((rows - 2) / 2, 1);
break;
//
// dont separate these two commands. 'f' depends on ';'
//
- //**** fall thru to ... ';'
+ //**** fall through to ... ';'
case ';': // ;- look at rest of line for last forward char
if (cmdcnt-- > 1) {
do_cmd(';');
if (*q == last_forward_char)
dot = q;
break;
+ case ',': // repeat latest 'f' in opposite direction
+ if (cmdcnt-- > 1) {
+ do_cmd(',');
+ } // repeat cnt
+ if (last_forward_char == 0)
+ break;
+ q = dot - 1;
+ while (q >= text && *q != '\n' && *q != last_forward_char) {
+ q--;
+ }
+ if (q >= text && *q == last_forward_char)
+ dot = q;
+ break;
+
case '-': // -- goto prev line
if (cmdcnt-- > 1) {
do_cmd(c);
case '.': // .- repeat the last modifying command
// Stuff the last_modifying_cmd back into stdin
// and let it be re-executed.
- if (last_modifying_cmd != NULL) {
+ if (lmc_len > 0) {
+ last_modifying_cmd[lmc_len] = 0;
ioq = ioq_start = xstrdup(last_modifying_cmd);
}
break;
buf[0] = c;
buf[1] = '\0';
q = get_input_line(buf); // get input line- use "status line"
- if (q[0] && !q[1])
+ if (q[0] && !q[1]) {
+ if (last_search_pattern[0])
+ last_search_pattern[0] = c;
goto dc3; // if no pat re-use old pat
+ }
if (q[0]) { // strlen(q) > 1: new pat- save it and find
// there is a new pat
free(last_search_pattern);
break;
case 'A': // A- append at e-o-l
dot_end(); // go to e-o-l
- //**** fall thru to ... 'a'
+ //**** fall through to ... 'a'
case 'a': // a- append after current char
if (*dot != '\n')
dot++;
end_cmd_q(); // stop adding to q
#endif
break;
+ case 'g': // 'gg' goto a line number (from vim)
+ // (default to first line in file)
+ c1 = get_one_char();
+ if (c1 != 'g') {
+ buf[0] = 'g';
+ buf[1] = c1;
+ buf[2] = '\0';
+ not_implemented(buf);
+ break;
+ }
+ if (cmdcnt == 0)
+ cmdcnt = 1;
+ /* fall through */
case 'G': // G- goto to a line number (default= E-O-F)
dot = end - 1; // assume E-O-F
if (cmdcnt > 0) {
case 'I': // I- insert before first non-blank
dot_begin(); // 0
dot_skip_over_ws();
- //**** fall thru to ... 'i'
+ //**** fall through to ... 'i'
case 'i': // i- insert before current char
case VI_K_INSERT: // Cursor Key Insert
dc_i:
case 'y': // y- yank something
case 'Y': // Y- Yank a line
#endif
+ {
+ int yf, ml, whole = 0;
yf = YANKDEL; // assume either "c" or "d"
#if ENABLE_FEATURE_VI_YANKMARK
if (c == 'y' || c == 'Y')
c1 = 'y';
if (c != 'Y')
c1 = get_one_char(); // get the type of thing to delete
- find_range(&p, &q, c1);
+ // determine range, and whether it spans lines
+ ml = find_range(&p, &q, c1);
if (c1 == 27) { // ESC- user changed mind and wants out
c = c1 = 27; // Escape- do nothing
} else if (strchr("wW", c1)) {
q--;
}
}
- dot = yank_delete(p, q, 0, yf); // delete word
- } else if (strchr("^0bBeEft$", c1)) {
- // single line copy text into a register and delete
- dot = yank_delete(p, q, 0, yf); // delete word
- } else if (strchr("cdykjHL%+-{}\r\n", c1)) {
- // multiple line copy text into a register and delete
- dot = yank_delete(p, q, 1, yf); // delete lines
+ dot = yank_delete(p, q, ml, yf); // delete word
+ } else if (strchr("^0bBeEft%$ lh\b\177", c1)) {
+ // partial line copy text into a register and delete
+ dot = yank_delete(p, q, ml, yf); // delete word
+ } else if (strchr("cdykjHL+-{}\r\n", c1)) {
+ // whole line copy text into a register and delete
+ dot = yank_delete(p, q, ml, yf); // delete lines
+ whole = 1;
+ } else {
+ // could not recognize object
+ c = c1 = 27; // error-
+ ml = 0;
+ indicate_error(c);
+ }
+ if (ml && whole) {
if (c == 'c') {
dot = char_insert(dot, '\n');
// on the last line of file don't move to prev line
- if (dot != (end-1)) {
+ if (whole && dot != (end-1)) {
dot_prev();
}
} else if (c == 'd') {
dot_begin();
dot_skip_over_ws();
}
- } else {
- // could not recognize object
- c = c1 = 27; // error-
- indicate_error(c);
}
if (c1 != 27) {
// if CHANGING, not deleting, start inserting after the delete
#endif
end_cmd_q(); // stop adding to q
}
+ }
break;
case 'k': // k- goto prev line, same col
case VI_K_UP: // cursor key Up
c1 = get_one_char(); // get the replacement char
if (*dot != '\n') {
*dot = c1;
- file_modified++; // has the file been modified
+ file_modified++;
}
end_cmd_q(); // stop adding to q
break;
} // repeat cnt
if (islower(*dot)) {
*dot = toupper(*dot);
- file_modified++; // has the file been modified
+ file_modified++;
} else if (isupper(*dot)) {
*dot = tolower(*dot);
- file_modified++; // has the file been modified
+ file_modified++;
}
dot_right();
end_cmd_q(); // stop adding to q
dot--;
}
+/* 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
}
if (msg[0]) {
- alarm(0);
printf("\n\n%d: \'%c\' %s\n\n\n%s[Hit return to continue]%s",
totalcmds, last_input_char, msg, SOs, SOn);
fflush(stdout);
- while (safe_read(0, d, 1) > 0) {
+ while (safe_read(STDIN_FILENO, d, 1) > 0) {
if (d[0] == '\n' || d[0] == '\r')
break;
}
- alarm(3);
}
tim = time(NULL);
if (tim >= (oldtim + 3)) {
projects / oweals / busybox.git / blobdiff