updated for version 7.3.677
Problem: buf_spname() is used inconsistently.
Solution: Make the return type a char_u pointer. Check the size of the
returned string.
diff --git a/src/buffer.c b/src/buffer.c
index 5998523..05da286 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -2635,7 +2635,7 @@
continue;
msg_putchar('\n');
if (buf_spname(buf) != NULL)
- STRCPY(NameBuff, buf_spname(buf));
+ vim_strncpy(NameBuff, buf_spname(buf), MAXPATHL - 1);
else
home_replace(buf, buf->b_fname, NameBuff, MAXPATHL, TRUE);
@@ -3350,7 +3350,7 @@
else
{
if (buf_spname(curbuf) != NULL)
- i_name = (char_u *)buf_spname(curbuf);
+ i_name = buf_spname(curbuf);
else /* use file name only in icon */
i_name = gettail(curbuf->b_ffname);
*i_str = NUL;
@@ -3766,7 +3766,7 @@
case STL_FILENAME:
fillable = FALSE; /* don't change ' ' to fillchar */
if (buf_spname(wp->w_buffer) != NULL)
- STRCPY(NameBuff, buf_spname(wp->w_buffer));
+ vim_strncpy(NameBuff, buf_spname(wp->w_buffer), MAXPATHL - 1);
else
{
t = (opt == STL_FULLPATH) ? wp->w_buffer->b_ffname
@@ -5244,7 +5244,7 @@
* Return special buffer name.
* Returns NULL when the buffer has a normal file name.
*/
- char *
+ char_u *
buf_spname(buf)
buf_T *buf;
{
@@ -5263,9 +5263,9 @@
goto win_found;
win_found:
if (win != NULL && win->w_llist_ref != NULL)
- return _(msg_loclist);
+ return (char_u *)_(msg_loclist);
else
- return _(msg_qflist);
+ return (char_u *)_(msg_qflist);
}
#endif
#ifdef FEAT_QUICKFIX
@@ -5274,12 +5274,12 @@
if (bt_nofile(buf))
{
if (buf->b_sfname != NULL)
- return (char *)buf->b_sfname;
- return _("[Scratch]");
+ return buf->b_sfname;
+ return (char_u *)_("[Scratch]");
}
#endif
if (buf->b_fname == NULL)
- return _("[No Name]");
+ return (char_u *)_("[No Name]");
return NULL;
}
diff --git a/src/ex_cmds2.c b/src/ex_cmds2.c
index d3bf04f..de190e7 100644
--- a/src/ex_cmds2.c
+++ b/src/ex_cmds2.c
@@ -1688,8 +1688,7 @@
msg_didout = FALSE;
}
if (EMSG2(_("E162: No write since last change for buffer \"%s\""),
- buf_spname(buf) != NULL ? (char_u *)buf_spname(buf) :
- buf->b_fname))
+ buf_spname(buf) != NULL ? buf_spname(buf) : buf->b_fname))
{
save = no_wait_return;
no_wait_return = FALSE;
diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index ebc8b98..311f4f0 100644
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -7602,7 +7602,7 @@
msg_putchar(bufIsChanged(wp->w_buffer) ? '+' : ' ');
msg_putchar(' ');
if (buf_spname(wp->w_buffer) != NULL)
- STRCPY(IObuff, buf_spname(wp->w_buffer));
+ vim_strncpy(IObuff, buf_spname(wp->w_buffer), IOSIZE - 1);
else
home_replace(wp->w_buffer, wp->w_buffer->b_fname,
IObuff, IOSIZE, TRUE);
diff --git a/src/memline.c b/src/memline.c
index 2a2426d..fecd876 100644
--- a/src/memline.c
+++ b/src/memline.c
@@ -780,9 +780,7 @@
need_wait_return = TRUE; /* call wait_return later */
++no_wait_return;
(void)EMSG2(_("E303: Unable to open swap file for \"%s\", recovery impossible"),
- buf_spname(buf) != NULL
- ? (char_u *)buf_spname(buf)
- : buf->b_fname);
+ buf_spname(buf) != NULL ? buf_spname(buf) : buf->b_fname);
--no_wait_return;
}
@@ -1315,7 +1313,7 @@
smsg((char_u *)_("Using swap file \"%s\""), NameBuff);
if (buf_spname(curbuf) != NULL)
- STRCPY(NameBuff, buf_spname(curbuf));
+ vim_strncpy(NameBuff, buf_spname(curbuf), MAXPATHL - 1);
else
home_replace(NULL, curbuf->b_ffname, NameBuff, MAXPATHL, TRUE);
smsg((char_u *)_("Original file \"%s\""), NameBuff);
diff --git a/src/proto/buffer.pro b/src/proto/buffer.pro
index 411c5af..85aedda 100644
--- a/src/proto/buffer.pro
+++ b/src/proto/buffer.pro
@@ -51,7 +51,7 @@
void do_modelines __ARGS((int flags));
int read_viminfo_bufferlist __ARGS((vir_T *virp, int writing));
void write_viminfo_bufferlist __ARGS((FILE *fp));
-char *buf_spname __ARGS((buf_T *buf));
+char_u *buf_spname __ARGS((buf_T *buf));
void buf_addsign __ARGS((buf_T *buf, int id, linenr_T lnum, int typenr));
linenr_T buf_change_sign_type __ARGS((buf_T *buf, int markId, int typenr));
int buf_getsigntype __ARGS((buf_T *buf, linenr_T lnum, int type));
diff --git a/src/screen.c b/src/screen.c
index 92eb232..0e76d8c 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -9876,7 +9876,7 @@
buf_T *buf;
{
if (buf_spname(buf) != NULL)
- STRCPY(NameBuff, buf_spname(buf));
+ vim_strncpy(NameBuff, buf_spname(buf), MAXPATHL - 1);
else
home_replace(buf, buf->b_fname, NameBuff, MAXPATHL, TRUE);
trans_characters(NameBuff, MAXPATHL);
diff --git a/src/version.c b/src/version.c
index 38f1324..e0bff53 100644
--- a/src/version.c
+++ b/src/version.c
@@ -720,6 +720,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 677,
+/**/
676,
/**/
675,
