mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-10 13:28:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace vim_strncpy calls: buffer.c

Browse Source
This commit is contained in:
Douglas Schneider
2014-05-29 07:57:02 -06:00
committed by Justin M. Keyes
parent a81f2dbe6e
commit 1a1725765c
1 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/nvim/buffer.c
View File

@@ -2126,7 +2126,7 @@ void buflist_list(exarg_T *eap)
continue; continue;
msg_putchar('\n'); msg_putchar('\n');
if (buf_spname(buf) != NULL) if (buf_spname(buf) != NULL)
vim_strncpy(NameBuff, buf_spname(buf), MAXPATHL - 1); STRLCPY(NameBuff, buf_spname(buf), MAXPATHL);
else else
home_replace(buf, buf->b_fname, NameBuff, MAXPATHL, TRUE); home_replace(buf, buf->b_fname, NameBuff, MAXPATHL, TRUE);
@@ -2473,7 +2473,7 @@ fileinfo (
*p++ = '"'; *p++ = '"';
if (buf_spname(curbuf) != NULL) if (buf_spname(curbuf) != NULL)
vim_strncpy(p, buf_spname(curbuf), IOSIZE - (p - buffer) - 1); STRLCPY(p, buf_spname(curbuf), IOSIZE - (p - buffer));
else { else {
if (!fullname && curbuf->b_fname != NULL) if (!fullname && curbuf->b_fname != NULL)
name = curbuf->b_fname; name = curbuf->b_fname;
@@ -2619,10 +2619,10 @@ void maketitle(void)
#define SPACE_FOR_DIR (IOSIZE - 20) #define SPACE_FOR_DIR (IOSIZE - 20)
#define SPACE_FOR_ARGNR (IOSIZE - 10) /* at least room for " - VIM" */ #define SPACE_FOR_ARGNR (IOSIZE - 10) /* at least room for " - VIM" */
if (curbuf->b_fname == NULL) if (curbuf->b_fname == NULL)
vim_strncpy(buf, (char_u *)_("[No Name]"), SPACE_FOR_FNAME); STRLCPY(buf, _("[No Name]"), SPACE_FOR_FNAME + 1);
else { else {
p = transstr(path_tail(curbuf->b_fname)); p = transstr(path_tail(curbuf->b_fname));
vim_strncpy(buf, p, SPACE_FOR_FNAME); STRLCPY(buf, p, SPACE_FOR_FNAME + 1);
free(p); free(p);
} }
@@ -2654,8 +2654,7 @@ void maketitle(void)
p = path_tail_with_sep(buf + off); p = path_tail_with_sep(buf + off);
if (p == buf + off) if (p == buf + off)
/* must be a help buffer */ /* must be a help buffer */
vim_strncpy(buf + off, (char_u *)_("help"), STRLCPY(buf + off, _("help"), SPACE_FOR_DIR - off);
(size_t)(SPACE_FOR_DIR - off - 1));
else else
*p = NUL; *p = NUL;
@@ -2664,11 +2663,10 @@ void maketitle(void)
* file name) use (...). */ * file name) use (...). */
if (off < SPACE_FOR_DIR) { if (off < SPACE_FOR_DIR) {
p = transstr(buf + off); p = transstr(buf + off);
vim_strncpy(buf + off, p, (size_t)(SPACE_FOR_DIR - off)); STRLCPY(buf + off, p, SPACE_FOR_DIR - off + 1);
free(p); free(p);
} else { } else {
vim_strncpy(buf + off, (char_u *)"...", STRLCPY(buf + off, "...", SPACE_FOR_ARGNR - off + 1);
(size_t)(SPACE_FOR_ARGNR - off));
} }
STRCAT(buf, ")"); STRCAT(buf, ")");
} }
@@ -3071,7 +3069,7 @@ build_stl_str_hl (
case STL_FILENAME: case STL_FILENAME:
fillable = FALSE; /* don't change ' ' to fillchar */ fillable = FALSE; /* don't change ' ' to fillchar */
if (buf_spname(wp->w_buffer) != NULL) if (buf_spname(wp->w_buffer) != NULL)
vim_strncpy(NameBuff, buf_spname(wp->w_buffer), MAXPATHL - 1); STRLCPY(NameBuff, buf_spname(wp->w_buffer), MAXPATHL);
else { else {
t = (opt == STL_FULLPATH) ? wp->w_buffer->b_ffname t = (opt == STL_FULLPATH) ? wp->w_buffer->b_ffname
: wp->w_buffer->b_fname; : wp->w_buffer->b_fname;
@@ -3513,10 +3511,9 @@ void get_rel_pos(win_T *wp, char_u *buf, int buflen)
above += diff_check_fill(wp, wp->w_topline) - wp->w_topfill; above += diff_check_fill(wp, wp->w_topline) - wp->w_topfill;
below = wp->w_buffer->b_ml.ml_line_count - wp->w_botline + 1; below = wp->w_buffer->b_ml.ml_line_count - wp->w_botline + 1;
if (below <= 0) if (below <= 0)
vim_strncpy(buf, (char_u *)(above == 0 ? _("All") : _("Bot")), STRLCPY(buf, (above == 0 ? _("All") : _("Bot")), buflen);
(size_t)(buflen - 1));
else if (above <= 0) else if (above <= 0)
vim_strncpy(buf, (char_u *)_("Top"), (size_t)(buflen - 1)); STRLCPY(buf, _("Top"), buflen);
else else
vim_snprintf((char *)buf, (size_t)buflen, "%2d%%", above > 1000000L vim_snprintf((char *)buf, (size_t)buflen, "%2d%%", above > 1000000L
? (int)(above / ((above + below) / 100L)) ? (int)(above / ((above + below) / 100L))