/[magellan-source]/trunk/mkinitrd-magellan/busybox/editors/vi.c

Diff of /trunk/mkinitrd-magellan/busybox/editors/vi.c

Parent Directory | Revision Log | View Patch Patch

-revision 983 by niro,
Fri Apr 24 18:33:46 2009 UTC
+revision 984 by niro,
Sun May 30 11:32:42 2010 UTC
 Line 30
  #if ENABLE_LOCALE_SUPPORT
  #if ENABLE_FEATURE_VI_8BIT
- #define Isprint(c) isprint(c)
+ //FIXME: this does not work properly for Unicode anyway
+ # define Isprint(c) (isprint)(c)
  #else
- #define Isprint(c) (isprint(c) && (unsigned char)(c) < 0x7f)
+ # define Isprint(c) isprint_asciionly(c)
  #endif
  #else
-Line 151 
 struct globals {
+Line 152 
 struct globals {
  	char erase_char;         // the users erase character
  	char last_input_char;    // last char read from user
- 	smalluint chars_to_parse;
  #if ENABLE_FEATURE_VI_DOT_CMD
  	smallint adding2q;	 // are we currently adding user input to q
  	int lmc_len;             // length of last_modifying_cmd
 Line 235 
 struct globals {
  #define last_forward_char       (G.last_forward_char  )
  #define erase_char              (G.erase_char         )
  #define last_input_char         (G.last_input_char    )
- #define chars_to_parse          (G.chars_to_parse     )
  #if ENABLE_FEATURE_VI_READONLY
  #define readonly_mode           (G.readonly_mode      )
  #else
-Line 271 
 struct globals {
+Line 270 
 struct globals {
  	SET_PTR_TO_GLOBALS(xzalloc(sizeof(G))); \
  	last_file_modified = -1; \
  	/* "" but has space for 2 chars: */ \
- 	USE_FEATURE_VI_SEARCH(last_search_pattern = xzalloc(2);) \
+ 	IF_FEATURE_VI_SEARCH(last_search_pattern = xzalloc(2);) \
  } while (0)
-Line 300 
 static void dot_delete(void);	// delete
+Line 299 
 static void dot_delete(void);	// delete
  static char *bound_dot(char *);	// make sure  text[0] <= P < "end"
  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'
+ // 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 ()  []  {}
  static char *text_hole_delete(char *, char *);	// at "p", delete a 'size' byte hole
- static char *text_hole_make(char *, int);	// at "p", make 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
  static char *yank_delete(char *, char *, 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
-Line 316 
 static int mysleep(int);
+Line 319 
 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
  static int file_size(const char *);   // what is the byte size of "fn"
- #if ENABLE_FEATURE_VI_READONLY
+ #if !ENABLE_FEATURE_VI_READONLY
- static int file_insert(const char *, char *, int);
+ #define file_insert(fn, p, update_ro_status) file_insert(fn, p)
- #else
- static int file_insert(const char *, char *);
  #endif
+ // file_insert might reallocate text[]!
+ static int file_insert(const char *, char *, int);
  static int file_write(char *, char *, char *);
  #if !ENABLE_FEATURE_VI_OPTIMIZE_CURSOR
  #define place_cursor(a, b, optimize) place_cursor(a, b)
-Line 370 
 static void end_cmd_q(void);	// stop sav
+Line 373 
 static void end_cmd_q(void);	// stop sav
  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
- static char *string_insert(char *, char *);	// insert the string at 'p'
+ // 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 *, const char *);	// 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
-Line 420 
 int vi_main(int argc, char **argv)
+Line 425 
 int vi_main(int argc, char **argv)
  			initial_cmds[0] = xstrndup(p, MAX_INPUT_LEN);
  	}
  #endif
- 	while ((c = getopt(argc, argv, "hCRH" USE_FEATURE_VI_COLON("c:"))) != -1) {
+ 	while ((c = getopt(argc, argv, "hCRH" IF_FEATURE_VI_COLON("c:"))) != -1) {
  		switch (c) {
  #if ENABLE_FEATURE_VI_CRASHME
  		case 'C':
-Line 486 
 static int init_text_buffer(char *fn)
+Line 491 
 static int init_text_buffer(char *fn)
  		char_insert(text, '\n');
  		rc = 0;
  	} else {
- 		rc = file_insert(fn, text
+ 		rc = file_insert(fn, text, 1);
- 			USE_FEATURE_VI_READONLY(, 1));
  	}
  	file_modified = 0;
  	last_file_modified = -1;
-Line 584 
 static void edit_file(char *fn)
+Line 588 
 static void edit_file(char *fn)
  				crash_dummy();	// generate a random command
  			} else {
  				crashme = 0;
- 				dot = string_insert(text, "\n\n#####  Ran out of text to work on.  #####\n\n"); // insert the string
+ 				string_insert(text, "\n\n#####  Ran out of text to work on.  #####\n\n"); // insert the string
+ 				dot = text;
  				refresh(FALSE);
  			}
  		}
-Line 614 
 static void edit_file(char *fn)
+Line 619 
 static void edit_file(char *fn)
  		// 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 (!chars_to_parse && mysleep(0) == 0) {
+ 		if (!readbuffer[0] && mysleep(0) == 0) {
  			// no input pending - so update output
  			refresh(FALSE);
  			show_status_line();
-Line 637 
 static char *get_one_address(char *p, in
+Line 642 
 static char *get_one_address(char *p, in
  {
  	int st;
  	char *q;
- 	USE_FEATURE_VI_YANKMARK(char c;)
+ 	IF_FEATURE_VI_YANKMARK(char c;)
- 	USE_FEATURE_VI_SEARCH(char *pat;)
+ 	IF_FEATURE_VI_SEARCH(char *pat;)
  	*addr = -1;			// assume no addr
  	if (*p == '.') {	// the current line
-Line 656 
 static char *get_one_address(char *p, in
+Line 661 
 static char *get_one_address(char *p, in
  			c = c - 'a';
  			q = mark[(unsigned char) c];
  			if (q != NULL) {	// is mark valid
- 				*addr = count_lines(text, q);	// count lines
+ 				*addr = count_lines(text, q);
  			}
  		}
  	}
-Line 683 
 static char *get_one_address(char *p, in
+Line 688 
 static char *get_one_address(char *p, in
  		sscanf(p, "%d%n", addr, &st);
  		p += st;
  	} else {
- 		// unrecognised address - assume -1
+ 		// unrecognized address - assume -1
  		*addr = -1;
  	}
  	return p;
-Line 724 
 static void setops(const char *args, con
+Line 729 
 static void setops(const char *args, con
  	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
  	) {
-Line 819 
 static void colon(char *buf)
+Line 825 
 static void colon(char *buf)
  		}
  	}
  #if ENABLE_FEATURE_ALLOW_EXEC
- 	else if (strncmp(cmd, "!", 1) == 0) {	// run a cmd
+ 	else if (cmd[0] == '!') {	// run a cmd
  		int retcode;
  		// :!ls   run the <cmd>
  		go_bottom_and_clear_to_eol();
-Line 831 
 static void colon(char *buf)
+Line 837 
 static void colon(char *buf)
  		Hit_Return();			// let user see results
  	}
  #endif
- 	else if (strncmp(cmd, "=", i) == 0) {	// where is the address
+ 	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 (strncasecmp(cmd, "delete", i) == 0) {	// delete lines
+ 	} 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);	// save, then delete lines
  		dot_skip_over_ws();
- 	} else if (strncasecmp(cmd, "edit", i) == 0) {	// Edit a file
+ 	} else if (strncmp(cmd, "edit", i) == 0) {	// Edit a file
  		// don't edit, if the current file has been modified
  		if (file_modified && !useforce) {
  			status_line_bold("No write since last change (:edit! overrides)");
-Line 877 
 static void colon(char *buf)
+Line 883 
 static void colon(char *buf)
  		// how many lines in text[]?
  		li = count_lines(text, end - 1);
  		status_line("\"%s\"%s"
- 			USE_FEATURE_VI_READONLY("%s")
+ 			IF_FEATURE_VI_READONLY("%s")
  			" %dL, %dC", current_filename,
  			(file_size(fn) < 0 ? " [New file]" : ""),
- 			USE_FEATURE_VI_READONLY(
+ 			IF_FEATURE_VI_READONLY(
  				((readonly_mode) ? " [Readonly]" : ""),
  			)
  			li, ch);
- 	} else if (strncasecmp(cmd, "file", i) == 0) {	// what File is this
+ 	} else if (strncmp(cmd, "file", i) == 0) {	// what File is this
  		if (b != -1 || e != -1) {
- 			not_implemented("No address allowed on this command");
+ 			status_line_bold("No address allowed on this command");
  			goto vc1;
  		}
  		if (args[0]) {
-Line 897 
 static void colon(char *buf)
+Line 903 
 static void colon(char *buf)
  			// user wants file status info
  			last_status_cksum = 0;	// force status update
  		}
- 	} else if (strncasecmp(cmd, "features", i) == 0) {	// what features are available
+ 	} 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 (strncasecmp(cmd, "list", i) == 0) {	// literal print line
+ 	} 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);
-Line 937 
 static void colon(char *buf)
+Line 943 
 static void colon(char *buf)
   vc2:
  #endif
  		Hit_Return();
- 	} else if (strncasecmp(cmd, "quit", i) == 0 // Quit
+ 	} else if (strncmp(cmd, "quit", i) == 0 // Quit
- 	        || strncasecmp(cmd, "next", i) == 0 // edit next file
+ 	        || strncmp(cmd, "next", i) == 0 // edit next file
  	) {
  		if (useforce) {
  			// force end of argv list
-Line 964 
 static void colon(char *buf)
+Line 970 
 static void colon(char *buf)
  			goto vc1;
  		}
  		editing = 0;
- 	} else if (strncasecmp(cmd, "read", i) == 0) {	// read file into text[]
+ 	} else if (strncmp(cmd, "read", i) == 0) {	// read file into text[]
  		fn = args;
  		if (!fn[0]) {
  			status_line_bold("No filename given");
-Line 976 
 static void colon(char *buf)
+Line 982 
 static void colon(char *buf)
  		// read after current line- unless user said ":0r foo"
  		if (b != 0)
  			q = next_line(q);
- 		ch = file_insert(fn, q  USE_FEATURE_VI_READONLY(, 0));
+ 		{ // dance around potentially-reallocated text[]
+ 			uintptr_t ofs = q - text;
+ 			ch = file_insert(fn, q, 0);
+ 			q = text + ofs;
+ 		}
  		if (ch < 0)
  			goto vc1;	// nothing was inserted
  		// how many lines in text[]?
  		li = count_lines(q, q + ch - 1);
  		status_line("\"%s\""
- 			USE_FEATURE_VI_READONLY("%s")
+ 			IF_FEATURE_VI_READONLY("%s")
  			" %dL, %dC", fn,
- 			USE_FEATURE_VI_READONLY((readonly_mode ? " [Readonly]" : ""),)
+ 			IF_FEATURE_VI_READONLY((readonly_mode ? " [Readonly]" : ""),)
  			li, ch);
  		if (ch > 0) {
  			// if the insert is before "dot" then we need to update
  			if (q <= dot)
  				dot += ch;
- 			file_modified++;
+ 			/*file_modified++; - done by file_insert */
  		}
- 	} else if (strncasecmp(cmd, "rewind", i) == 0) {	// rewind cmd line args
+ 	} else if (strncmp(cmd, "rewind", i) == 0) {	// rewind cmd line args
  		if (file_modified && !useforce) {
  			status_line_bold("No write since last change (:rewind! overrides)");
  		} else {
-Line 1001 
 static void colon(char *buf)
+Line 1011 
 static void colon(char *buf)
  			editing = 0;
  		}
  #if ENABLE_FEATURE_VI_SET
- 	} else if (strncasecmp(cmd, "set", i) == 0) {	// set or clear features
+ 	} else if (strncmp(cmd, "set", i) == 0) {	// set or clear features
  #if ENABLE_FEATURE_VI_SETOPTS
  		char *argp;
  #endif
-Line 1032 
 static void colon(char *buf)
+Line 1042 
 static void colon(char *buf)
  #if ENABLE_FEATURE_VI_SETOPTS
  		argp = args;
  		while (*argp) {
- 			if (strncasecmp(argp, "no", 2) == 0)
+ 			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, "ic", VI_SHOWMATCH);
  			/* tabstopXXXX */
- 			if (strncasecmp(argp + i, "tabstop=%d ", 7) == 0) {
+ 			if (strncmp(argp + i, "tabstop=%d ", 7) == 0) {
  				sscanf(strchr(argp + i, '='), "tabstop=%d" + 7, &ch);
  				if (ch > 0 && ch <= MAX_TABSTOP)
  					tabstop = ch;
-Line 1052 
 static void colon(char *buf)
+Line 1062 
 static void colon(char *buf)
  #endif /* FEATURE_VI_SETOPTS */
  #endif /* FEATURE_VI_SET */
  #if ENABLE_FEATURE_VI_SEARCH
- 	} else if (strncasecmp(cmd, "s", 1) == 0) {	// substitute a pattern with a replacement pattern
+ 	} else if (cmd[0] == 's') {	// substitute a pattern with a replacement pattern
  		char *ls, *F, *R;
  		int gflag;
-Line 1063 
 static void colon(char *buf)
+Line 1073 
 static void colon(char *buf)
  		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;
+ 		if (!R)
+ 			goto colon_s_fail;
  		*R++ = '\0';	// terminate "find"
  		buf1 = strchr(R, c);
- 		if (!buf1) goto colon_s_fail;
+ 		if (!buf1)
+ 			goto colon_s_fail;
  		*buf1++ = '\0';	// terminate "replace"
  		if (*buf1 == 'g') {	// :s/foo/bar/g
  			buf1++;
-Line 1084 
 static void colon(char *buf)
+Line 1096 
 static void colon(char *buf)
   vc4:
  			buf1 = char_search(q, F, FORWARD, LIMITED);	// search cur line only for "find"
  			if (buf1) {
+ 				uintptr_t bias;
  				// we found the "find" pattern - delete it
  				text_hole_delete(buf1, buf1 + strlen(F) - 1);
  				// inset the "replace" patern
- 				string_insert(buf1, R);	// insert the string
+ 				bias = string_insert(buf1, R);	// insert the string
+ 				buf1 += bias;
+ 				ls += bias;
+ 				/*q += bias; - recalculated anyway */
  				// check for "global"  :s/foo/bar/g
  				if (gflag == 1) {
  					if ((buf1 + strlen(R)) < end_line(ls)) {
-Line 1099 
 static void colon(char *buf)
+Line 1115 
 static void colon(char *buf)
  			q = next_line(ls);
  		}
  #endif /* FEATURE_VI_SEARCH */
- 	} else if (strncasecmp(cmd, "version", i) == 0) {  // show software version
+ 	} else if (strncmp(cmd, "version", i) == 0) {  // show software version
  		status_line(BB_VER " " BB_BT);
- 	} else if (strncasecmp(cmd, "write", i) == 0  // write text to file
+ 	} else if (strncmp(cmd, "write", i) == 0  // write text to file
- 	        || strncasecmp(cmd, "wq", i) == 0
+ 	        || strncmp(cmd, "wq", i) == 0
- 	        || strncasecmp(cmd, "wn", i) == 0
+ 	        || strncmp(cmd, "wn", i) == 0
- 	        || strncasecmp(cmd, "x", i) == 0
+ 	        || (cmd[0] == 'x' && !cmd[1])
  	) {
  		// is there a file name to write to?
  		if (args[0]) {
-Line 1152 
 static void colon(char *buf)
+Line 1168 
 static void colon(char *buf)
   vc3:;
  #endif
  #if ENABLE_FEATURE_VI_YANKMARK
- 	} else if (strncasecmp(cmd, "yank", i) == 0) {	// yank lines
+ 	} 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);
-Line 1195 
 static int next_tabstop(int col)
+Line 1211 
 static int next_tabstop(int col)
  }
  //----- Synchronize the cursor to Dot --------------------------
- static void sync_cursor(char *d, int *row, int *col)
+ static NOINLINE void sync_cursor(char *d, int *row, int *col)
  {
  	char *beg_cur;	// begin and end of "d" line
  	char *tp;
-Line 1517 
 static char *new_screen(int ro, int co)
+Line 1533 
 static char *new_screen(int ro, int co)
  #if ENABLE_FEATURE_VI_SEARCH
  static int mycmp(const char *s1, const char *s2, int len)
  {
- 	int i;
- 	i = strncmp(s1, s2, len);
  	if (ENABLE_FEATURE_VI_SETOPTS && ignorecase) {
- 		i = strncasecmp(s1, s2, len);
+ 		return strncasecmp(s1, s2, len);
  	}
- 	return i;
+ 	return strncmp(s1, s2, len);
  }
  // search for pattern starting at p
-Line 1623 
 static char *char_search(char *p, const
+Line 1636 
 static char *char_search(char *p, const
  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
+ 		p += stupid_insert(p, '^');	// use ^ to indicate literal next
- 		p--;			// backup onto ^
  		refresh(FALSE);	// show the ^
  		c = get_one_char();
  		*p = c;
-Line 1651 
 static char *char_insert(char *p, char c
+Line 1663 
 static char *char_insert(char *p, char c
  		if (c == 13)
  			c = '\n';	// translate \r to \n
  		sp = p;			// remember addr of insert
- 		p = stupid_insert(p, c);	// insert the char
+ 		p += 1 + stupid_insert(p, c);	// insert the char
  #if ENABLE_FEATURE_VI_SETOPTS
  		if (showmatch && strchr(")]}", *sp) != NULL) {
  			showmatching(sp);
  		}
  		if (autoindent && c == '\n') {	// auto indent the new line
  			char *q;
+ 			size_t len;
- 			q = prev_line(p);	// use prev line as templet
+ 			q = prev_line(p);	// use prev line as template
- 			for (; isblank(*q); q++) {
+ 			len = strspn(q, " \t"); // space or tab
- 				p = stupid_insert(p, *q);	// insert the char
+ 			if (len) {
+ 				uintptr_t bias;
+ 				bias = text_hole_make(p, len);
+ 				p += bias;
+ 				q += bias;
+ 				memcpy(p, q, len);
+ 				p += len;
  			}
  		}
  #endif
-Line 1669 
 static char *char_insert(char *p, char c
+Line 1687 
 static char *char_insert(char *p, char c
  	return p;
  }
- static char *stupid_insert(char *p, char c) // stupidly 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[]!
- 	p = text_hole_make(p, 1);
+ static uintptr_t stupid_insert(char *p, char c) // stupidly insert the char c at 'p'
+ {
+ 	uintptr_t bias;
+ 	bias = text_hole_make(p, 1);
+ 	p += bias;
  	*p = c;
  	//file_modified++; - done by text_hole_make()
- 	return p + 1;
+ 	return bias;
  }
  static int find_range(char **start, char **stop, char c)
-Line 1762 
 static int st_test(char *p, int type, in
+Line 1784 
 static int st_test(char *p, int type, in
  	if (type == S_BEFORE_WS) {
  		c = ci;
- 		test = ((!isspace(c)) || c == '\n');
+ 		test = (!isspace(c) || c == '\n');
  	}
  	if (type == S_TO_WS) {
  		c = c0;
- 		test = ((!isspace(c)) || c == '\n');
+ 		test = (!isspace(c) || c == '\n');
  	}
  	if (type == S_OVER_WS) {
  		c = c0;
- 		test = ((isspace(c)));
+ 		test = isspace(c);
  	}
  	if (type == S_END_PUNCT) {
  		c = ci;
- 		test = ((ispunct(c)));
+ 		test = ispunct(c);
  	}
  	if (type == S_END_ALNUM) {
  		c = ci;
- 		test = ((isalnum(c)) || c == '_');
+ 		test = (isalnum(c) || c == '_');
  	}
  	*tested = c;
  	return test;
-Line 1854 
 static void showmatching(char *p)
+Line 1876 
 static void showmatching(char *p)
  }
  #endif /* FEATURE_VI_SETOPTS */
- //  open a hole in text[]
+ // open a hole in text[]
- static char *text_hole_make(char *p, int size)	// at "p", make 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 *p, int size)	// at "p", make a 'size' byte hole
  {
+ 	uintptr_t bias = 0;
  	if (size <= 0)
- 		return p;
+ 		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);
- 		screenbegin = new_text + (screenbegin - text);
+ 		bias = (new_text - text);
- 		dot         = new_text + (dot         - text);
+ 		screenbegin += bias;
- 		end         = new_text + (end         - text);
+ 		dot         += bias;
- 		p           = new_text + (p           - text);
+ 		end         += bias;
+ 		p           += bias;
  		text = new_text;
  	}
  	memmove(p + size, p, end - size - p);
  	memset(p, ' ', size);	// clear new hole
  	file_modified++;
- 	return p;
+ 	return bias;
  }
  //  close a hole in text[]
-Line 2006 
 static void end_cmd_q(void)
+Line 2033 
 static void end_cmd_q(void)
  #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'
+ // 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) // insert the string at 'p'
  {
- 	int cnt, i;
+ 	uintptr_t bias;
+ 	int i;
  	i = strlen(s);
- 	text_hole_make(p, i);
+ 	bias = text_hole_make(p, i);
- 	strncpy(p, s, i);
+ 	p += bias;
- 	for (cnt = 0; *s != '\0'; s++) {
+ 	memcpy(p, s, i);
- 		if (*s == '\n')
- 			cnt++;
- 	}
  #if ENABLE_FEATURE_VI_YANKMARK
- 	status_line("Put %d lines (%d chars) from [%c]", cnt, i, what_reg());
+ 	{
+ 		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 p;
+ 	return bias;
  }
  #endif
  #if ENABLE_FEATURE_VI_YANKMARK
  static char *text_yank(char *p, char *q, int dest)	// copy text into a register
  {
- 	char *t;
+ 	int cnt = q - p;
- 	int cnt;
+ 	if (cnt < 0) {		// they are backwards- reverse them
+ 		p = q;
- 	if (q < p) {		// they are backwards- reverse them
+ 		cnt = -cnt;
- 		t = q;
- 		q = p;
- 		p = t;
  	}
- 	cnt = q - p + 1;
+ 	free(reg[dest]);	//  if already a yank register, free it
- 	t = reg[dest];
+ 	reg[dest] = xstrndup(p, cnt + 1);
- 	free(t);		//  if already a yank register, free it
- 	t = xmalloc(cnt + 1);	// get a new register
- 	memset(t, '\0', cnt + 1);	// clear new text[]
- 	strncpy(t, p, cnt);	// copy text[] into bufer
- 	reg[dest] = t;
  	return p;
  }
-Line 2111 
 static void rawmode(void)
+Line 2137 
 static void rawmode(void)
  static void cookmode(void)
  {
- 	fflush(stdout);
+ 	fflush_all();
  	tcsetattr_stdin_TCSANOW(&term_orig);
  }
-Line 2162 
 static void catch_sig(int sig)
+Line 2188 
 static void catch_sig(int sig)
  }
  #endif /* FEATURE_VI_USE_SIGNALS */
- static int mysleep(int hund)	// sleep for 'h' 1/100 seconds
+ static int mysleep(int hund)	// sleep for 'hund' 1/100 seconds or stdin ready
  {
  	struct pollfd pfd[1];
- 	pfd[0].fd = 0;
+ 	pfd[0].fd = STDIN_FILENO;
  	pfd[0].events = POLLIN;
  	return safe_poll(pfd, 1, hund*10) > 0;
  }
-Line 2176 
 static int readit(void) // read (maybe c
+Line 2202 
 static int readit(void) // read (maybe c
  {
  	int c;
- 	fflush(stdout);
+ 	fflush_all();
- 	c = read_key(STDIN_FILENO, &chars_to_parse, readbuffer);
+ 	c = read_key(STDIN_FILENO, readbuffer);
  	if (c == -1) { // EOF/error
  		go_bottom_and_clear_to_eol();
  		cookmode(); // terminal to "cooked"
-Line 2273 
 static int file_size(const char *fn) //
+Line 2299 
 static int file_size(const char *fn) //
  	return cnt;
  }
- static int file_insert(const char *fn, char *p
+ // might reallocate text[]!
- 		USE_FEATURE_VI_READONLY(, int update_ro_status))
+ static int file_insert(const char *fn, char *p, int update_ro_status)
  {
  	int cnt = -1;
  	int fd, size;
-Line 2302 
 static int file_insert(const char *fn, c
+Line 2328 
 static int file_insert(const char *fn, c
  		goto fi0;
  	}
  	size = statbuf.st_size;
- 	p = text_hole_make(p, size);
+ 	p += text_hole_make(p, size);
  	cnt = safe_read(fd, p, size);
  	if (cnt < 0) {
  		status_line_bold("\"%s\" %s", fn, strerror(errno));
-Line 2310 
 static int file_insert(const char *fn, c
+Line 2336 
 static int file_insert(const char *fn, c
  	} else if (cnt < size) {
  		// There was a partial read, shrink unused space text[]
  		p = text_hole_delete(p + cnt, p + (size - cnt) - 1);	// un-do buffer insert
- 		status_line_bold("cannot read all of file \"%s\"", fn);
+ 		status_line_bold("can't read all of file \"%s\"", fn);
  	}
  	if (cnt >= size)
  		file_modified++;
-Line 2530 
 static void show_status_line(void)
+Line 2556 
 static void show_status_line(void)
  		}
  		place_cursor(crow, ccol, FALSE);	// put cursor back in correct place
  	}
- 	fflush(stdout);
+ 	fflush_all();
  }
  //----- format the status buffer, the bottom line of screen ------
-Line 2563 
 static void status_line(const char *form
+Line 2589 
 static void status_line(const char *form
  // copy s to buf, convert unprintable
  static void print_literal(char *buf, const char *s)
  {
+ 	char *d;
  	unsigned char c;
- 	char b[2];
- 	b[1] = '\0';
  	buf[0] = '\0';
  	if (!s[0])
  		s = "(NULL)";
+ 	d = buf;
  	for (; *s; s++) {
  		int c_is_no_print;
  		c = *s;
  		c_is_no_print = (c & 0x80) && !Isprint(c);
  		if (c_is_no_print) {
- 			strcat(buf, SOn);
+ 			strcpy(d, SOn);
+ 			d += sizeof(SOn)-1;
  			c = '.';
  		}
- 		if (c < ' ' || c == 127) {
+ 		if (c < ' ' || c == 0x7f) {
- 			strcat(buf, "^");
+ 			*d++ = '^';
- 			if (c == 127)
+ 			c |= '@'; /* 0x40 */
+ 			if (c == 0x7f)
  				c = '?';
- 			else
- 				c += '@';
  		}
- 		b[0] = c;
+ 		*d++ = c;
- 		strcat(buf, b);
+ 		*d = '\0';
- 		if (c_is_no_print)
+ 		if (c_is_no_print) {
- 			strcat(buf, SOs);
+ 			strcpy(d, SOs);
- 		if (*s == '\n')
+ 			d += sizeof(SOs)-1;
- 			strcat(buf, "$");
+ 		}
- 		if (strlen(buf) > MAX_INPUT_LEN - 10) // paranoia
+ 		if (*s == '\n') {
+ 			*d++ = '$';
+ 			*d = '\0';
+ 		}
+ 		if (d - buf > MAX_INPUT_LEN - 10) // paranoia
  			break;
  	}
  }
-Line 2954 
 static void do_cmd(int c)
+Line 2985 
 static void do_cmd(int c)
  		//case '`':	// `-
  		//case 'u':	// u- FIXME- there is no undo
  		//case 'v':	// v-
- 	default:			// unrecognised command
+ 	default:			// unrecognized command
  		buf[0] = c;
  		buf[1] = '\0';
- 		if (c < ' ') {
- 			buf[0] = '^';
- 			buf[1] = c + '@';
- 			buf[2] = '\0';
- 		}
  		not_implemented(buf);
  		end_cmd_q();	// stop adding to q
  	case 0x00:			// nul- ignore
-Line 3082 
 static void do_cmd(int c)
+Line 3108 
 static void do_cmd(int c)
  	case 'P':			// P- Put register before
  	case 'p':			// p- put register after
  		p = reg[YDreg];
- 		if (p == 0) {
+ 		if (p == NULL) {
  			status_line_bold("Nothing in register %c", what_reg());
  			break;
  		}
-Line 3103 
 static void do_cmd(int c)
+Line 3129 
 static void do_cmd(int c)
  			if (c == 'p')
  				dot_right();	// move to right, can move to NL
  		}
- 		dot = string_insert(dot, p);	// insert the string
+ 		string_insert(dot, p);	// insert the string
  		end_cmd_q();	// stop adding to q
  		break;
  	case 'U':			// U- Undo; replace current line with original version
-Line 3111 
 static void do_cmd(int c)
+Line 3137 
 static void do_cmd(int c)
  			p = begin_line(dot);
  			q = end_line(dot);
  			p = text_hole_delete(p, q);	// delete cur line
- 			p = string_insert(p, reg[Ureg]);	// insert orig line
+ 			p += string_insert(p, reg[Ureg]);	// insert orig line
  			dot = p;
  			dot_skip_over_ws();
  		}
-Line 3299 
 static void do_cmd(int c)
+Line 3325 
 static void do_cmd(int c)
  		cnt = strlen(p);
  		if (cnt <= 0)
  			break;
- 		if (strncasecmp(p, "quit", cnt) == 0
+ 		if (strncmp(p, "quit", cnt) == 0
- 		 || strncasecmp(p, "q!", cnt) == 0   // delete lines
+ 		 || strncmp(p, "q!", cnt) == 0   // delete lines
  		) {
  			if (file_modified && p[1] != '!') {
  				status_line_bold("No write since last change (:quit! overrides)");
  			} else {
  				editing = 0;
  			}
- 		} else if (strncasecmp(p, "write", cnt) == 0
+ 		} else if (strncmp(p, "write", cnt) == 0
- 		        || strncasecmp(p, "wq", cnt) == 0
+ 		        || strncmp(p, "wq", cnt) == 0
- 		        || strncasecmp(p, "wn", cnt) == 0
+ 		        || strncmp(p, "wn", cnt) == 0
- 		        || strncasecmp(p, "x", cnt) == 0
+ 		        || (p[0] == 'x' && !p[1])
  		) {
  			cnt = file_write(current_filename, text, end - 1);
  			if (cnt < 0) {
-Line 3326 
 static void do_cmd(int c)
+Line 3352 
 static void do_cmd(int c)
  					editing = 0;
  				}
  			}
- 		} else if (strncasecmp(p, "file", cnt) == 0) {
+ 		} else if (strncmp(p, "file", cnt) == 0) {
  			last_status_cksum = 0;	// force status update
  		} else if (sscanf(p, "%d", &j) > 0) {
  			dot = find_line(j);		// go to line # j
  			dot_skip_over_ws();
- 		} else {		// unrecognised cmd
+ 		} else {		// unrecognized cmd
  			not_implemented(p);
  		}
  #endif /* !FEATURE_VI_COLON */
-Line 3822 
 static void crash_dummy()
+Line 3848 
 static void crash_dummy()
  	cmd1 = " \n\r\002\004\005\006\025\0310^$-+wWeEbBhjklHL";
  	// is there already a command running?
- 	if (chars_to_parse > 0)
+ 	if (readbuffer[0] > 0)
  		goto cd1;
   cd0:
- 	startrbi = rbi = 0;
+ 	readbuffer[0] = 'X';
+ 	startrbi = rbi = 1;
  	sleeptime = 0;          // how long to pause between commands
  	memset(readbuffer, '\0', sizeof(readbuffer));
  	// generate a command by percentages
-Line 3899 
 static void crash_dummy()
+Line 3926 
 static void crash_dummy()
  		}
  		strcat(readbuffer, "\033");
  	}
- 	chars_to_parse = strlen(readbuffer);
+ 	readbuffer[0] = strlen(readbuffer + 1);
   cd1:
  	totalcmds++;
  	if (sleeptime > 0)
-Line 3937 
 static void crash_test()
+Line 3964 
 static void crash_test()
  	if (msg[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);
+ 		fflush_all();
  		while (safe_read(STDIN_FILENO, d, 1) > 0) {
  			if (d[0] == '\n' || d[0] == '\r')
  				break;

 Legend:



Removed from v.983
 


changed lines


 
Added in v.984
 Legend:



Removed from v.983
 


changed lines


 
Added in v.984
-Removed from v.983
+Added in v.984