diff options
| author | Douglas Schneider <ds3@ualberta.ca> | 2014-05-26 16:52:34 -0600 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2014-06-13 18:08:21 -0400 |
| commit | 260c327fb5c6e1f64a30925bc96b1f6827513c89 (patch) | |
| tree | e9db5b41ad046dba64b2ea22abbb754a361c3758 | |
| parent | 4e2cbddaaae37ed9309e2332a2f5cb9adca5bd33 (diff) | |
| download | rneovim-260c327fb5c6e1f64a30925bc96b1f6827513c89.tar.gz rneovim-260c327fb5c6e1f64a30925bc96b1f6827513c89.tar.bz2 rneovim-260c327fb5c6e1f64a30925bc96b1f6827513c89.zip | |
Replace vim_strncpy calls: memline.c
| -rw-r--r-- | src/nvim/memline.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/nvim/memline.c b/src/nvim/memline.c index 1bb968b5d0..b3a8df598b 100644 --- a/src/nvim/memline.c +++ b/src/nvim/memline.c @@ -677,8 +677,7 @@ static void set_b0_fname(ZERO_BL *b0p, buf_T *buf) size_t ulen = STRLEN(uname); size_t flen = STRLEN(b0p->b0_fname); if (retval == FAIL || ulen + flen > B0_FNAME_SIZE_CRYPT - 1) { - vim_strncpy(b0p->b0_fname, buf->b_ffname, - B0_FNAME_SIZE_CRYPT - 1); + STRLCPY(b0p->b0_fname, buf->b_ffname, B0_FNAME_SIZE_CRYPT); } else { memmove(b0p->b0_fname + ulen + 1, b0p->b0_fname + 1, flen); memmove(b0p->b0_fname + 1, uname, ulen); @@ -951,7 +950,7 @@ void ml_recover(void) smsg((char_u *)_("Using swap file \"%s\""), NameBuff); if (buf_spname(curbuf) != NULL) - vim_strncpy(NameBuff, buf_spname(curbuf), MAXPATHL - 1); + STRLCPY(NameBuff, buf_spname(curbuf), MAXPATHL); else home_replace(NULL, curbuf->b_ffname, NameBuff, MAXPATHL, TRUE); smsg((char_u *)_("Original file \"%s\""), NameBuff); @@ -3021,7 +3020,7 @@ int resolve_symlink(char_u *fname, char_u *buf) return FAIL; /* Put the result so far in tmp[], starting with the original name. */ - vim_strncpy(tmp, fname, MAXPATHL - 1); + STRLCPY(tmp, fname, MAXPATHL); for (;; ) { /* Limit symlink depth to 100, catch recursive loops. */ |