diff options
| author | vimboss <devnull@localhost> | 2007-08-06 20:28:43 +0000 |
|---|---|---|
| committer | vimboss <devnull@localhost> | 2007-08-06 20:28:43 +0000 |
| commit | b9de1df17e7bdb7a79344d733b61300d283975bf (patch) | |
| tree | df4982be8b6463081ae40810c4d1d2f1dc3996d9 | |
| parent | ae9b1f65cb2eb82a9c9c82d87dcf4ebc4fbaafb8 (diff) | |
| download | vim-b9de1df17e7bdb7a79344d733b61300d283975bf.tar.gz | |
| -rw-r--r-- | src/buffer.c | 2 | ||||
| -rw-r--r-- | src/charset.c | 2 | ||||
| -rw-r--r-- | src/eval.c | 2 | ||||
| -rw-r--r-- | src/ex_getln.c | 7 | ||||
| -rw-r--r-- | src/misc1.c | 4 | ||||
| -rw-r--r-- | src/regexp.c | 4 | ||||
| -rw-r--r-- | src/termlib.c | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
8 files changed, 14 insertions, 11 deletions
diff --git a/src/buffer.c b/src/buffer.c index 8bd3a355..6d44fa74 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -4860,7 +4860,7 @@ chk_modeline(lnum, flags) */ for (e = s; *e != ':' && *e != NUL; ++e) if (e[0] == '\\' && e[1] == ':') - STRCPY(e, e + 1); + mch_memmove(e, e + 1, STRLEN(e)); if (*e == NUL) end = TRUE; diff --git a/src/charset.c b/src/charset.c index 5436bb40..8f058bde 100644 --- a/src/charset.c +++ b/src/charset.c @@ -1898,7 +1898,7 @@ backslash_halve(p) { for ( ; *p; ++p) if (rem_backslash(p)) - STRCPY(p, p + 1); + mch_memmove(p, p + 1, STRLEN(p)); } /* @@ -13807,7 +13807,7 @@ f_resolve(argvars, rettv) } /* Shorten "remain". */ if (*q != NUL) - STRCPY(remain, q - 1); + mch_memmove(remain, q - 1, STRLEN(q - 1) + 1); else { vim_free(remain); diff --git a/src/ex_getln.c b/src/ex_getln.c index 206da806..3ddec296 100644 --- a/src/ex_getln.c +++ b/src/ex_getln.c @@ -4306,10 +4306,11 @@ ExpandFromContext(xp, pat, num_file, file, options) && pat[i + 1] == '\\' && pat[i + 2] == '\\' && pat[i + 3] == ' ') - STRCPY(pat + i, pat + i + 3); + mch_memmove(pat + i, pat + i + 3, + STRLEN(pat + i + 3) + 1); if (xp->xp_backslash == XP_BS_ONE && pat[i + 1] == ' ') - STRCPY(pat + i, pat + i + 1); + mch_memmove(pat + i, pat + i + 1, STRLEN(pat + i)); } } @@ -4552,7 +4553,7 @@ expand_shellcmd(filepat, num_file, file, flagsarg) pat = vim_strsave(filepat); for (i = 0; pat[i]; ++i) if (pat[i] == '\\' && pat[i + 1] == ' ') - STRCPY(pat + i, pat + i + 1); + mch_memmove(pat + i, pat + i + 1, STRLEN(pat + i)); flags |= EW_FILE | EW_EXEC; diff --git a/src/misc1.c b/src/misc1.c index 816c9471..be2c2444 100644 --- a/src/misc1.c +++ b/src/misc1.c @@ -8635,7 +8635,7 @@ dos_expandpath( for (p = buf + wildoff; p < s; ++p) if (rem_backslash(p)) { - STRCPY(p, p + 1); + mch_memmove(p, p + 1, STRLEN(p)); --e; --s; } @@ -8936,7 +8936,7 @@ unix_expandpath(gap, path, wildoff, flags, didstar) for (p = buf + wildoff; p < s; ++p) if (rem_backslash(p)) { - STRCPY(p, p + 1); + mch_memmove(p, p + 1, STRLEN(p)); --e; --s; } diff --git a/src/regexp.c b/src/regexp.c index 071663f6..6db91392 100644 --- a/src/regexp.c +++ b/src/regexp.c @@ -6637,9 +6637,9 @@ regtilde(source, magic) } } else if (magic) - STRCPY(p, p + 1); /* remove '~' */ + mch_memmove(p, p + 1, STRLEN(p)); /* remove '~' */ else - STRCPY(p, p + 2); /* remove '\~' */ + mch_memmove(p, p + 2, STRLEN(p) - 1); /* remove '\~' */ --p; } else diff --git a/src/termlib.c b/src/termlib.c index 2091115d..33f332a5 100644 --- a/src/termlib.c +++ b/src/termlib.c @@ -191,7 +191,7 @@ nextent(tbuf, termcap, buflen) /* Read 1 entry from TERMCAP file */ lbuf[0] == '\t' && lbuf[1] == ':') { - strcpy(lbuf, lbuf+2); + mch_memmove(lbuf, lbuf + 2, strlen(lbuf + 2) + 1); llen -= 2; } if (lbuf[llen-2] == '\\') /* and continuations */ diff --git a/src/version.c b/src/version.c index d486d60b..5be707f1 100644 --- a/src/version.c +++ b/src/version.c @@ -667,6 +667,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 55, +/**/ 54, /**/ 53, |