summaryrefslogtreecommitdiff
path: root/editors
diff options
context:
space:
mode:
authorDenis Vlasenko2008-11-24 07:34:42 +0000
committerDenis Vlasenko2008-11-24 07:34:42 +0000
commit00d8417631b1ae378d708e885dce74bafb02be96 (patch)
treee0537629e52b86a992f5e3abc45362bc07e620bb /editors
parent4b5709496bb00301f4df6a8e3c0ced23b4d36603 (diff)
downloadbusybox-00d8417631b1ae378d708e885dce74bafb02be96.zip
busybox-00d8417631b1ae378d708e885dce74bafb02be96.tar.gz
vi: speedup and code shrink (Walter Harms)
networking/interface.c: silence warning (Vladimir) wget: more robust EINTR detection
Diffstat (limited to 'editors')
-rw-r--r--editors/vi.c38
1 files changed, 17 insertions, 21 deletions
diff --git a/editors/vi.c b/editors/vi.c
index 7f1d27f..7f5f2dc 100644
--- a/editors/vi.c
+++ b/editors/vi.c
@@ -662,7 +662,7 @@ static char *get_one_address(char *p, int *addr) // get colon addr, if present
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);
}
}
}
@@ -1673,12 +1673,16 @@ static char *char_insert(char *p, char c) // insert the char c at 'p'
}
if (autoindent && c == '\n') { // auto indent the new line
char *q;
-
+ size_t len;
q = prev_line(p); // use prev line as template
- for (; isblank(*q); q++) {
- uintptr_t bias = stupid_insert(p, *q); // insert the char
- p += bias + 1;
+ len = strspn(q, " \t"); // space or tab
+ if (len) {
+ uintptr_t bias;
+ bias = text_hole_make(p, len);
+ p += bias;
q += bias;
+ memcpy(p, q, len);
+ p += len;
}
}
#endif
@@ -2042,7 +2046,7 @@ static uintptr_t string_insert(char *p, const char *s) // insert the string at '
i = strlen(s);
bias = text_hole_make(p, i);
p += bias;
- strncpy(p, s, i);
+ memcpy(p, s, i);
#if ENABLE_FEATURE_VI_YANKMARK
{
int cnt;
@@ -2060,21 +2064,13 @@ static uintptr_t string_insert(char *p, const char *s) // insert the string at '
#if ENABLE_FEATURE_VI_YANKMARK
static char *text_yank(char *p, char *q, int dest) // copy text into a register
{
- char *t;
- int cnt;
-
- if (q < p) { // they are backwards- reverse them
- t = q;
- q = p;
- p = t;
+ int cnt = q - p;
+ if (cnt < 0) { // they are backwards- reverse them
+ p = q;
+ cnt = -cnt;
}
- cnt = q - p + 1;
- t = reg[dest];
- 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;
+ free(reg[dest]); // if already a yank register, free it
+ reg[dest] = xstrndup(p, cnt + 1);
return p;
}
@@ -3115,7 +3111,7 @@ 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;
}