Patch 8.2.0799

4 views
Skip to first unread message

Bram Moolenaar

unread,
May 19, 2020, 3:44:23 PM5/19/20
to vim...@googlegroups.com

Patch 8.2.0799
Problem: Build fails if snprintf is not available.
Solution: Use vim_snprintf().
Files: src/libvterm/src/state.c


*** ../vim-8.2.0798/src/libvterm/src/state.c 2020-05-19 21:19:34.891367031 +0200
--- src/libvterm/src/state.c 2020-05-19 21:42:05.115447325 +0200
***************
*** 1674,1686 ****
size_t cur = 0;
int argi;

! cur += snprintf(vt->tmpbuffer + cur, vt->tmpbuffer_len - cur,
vt->mode.ctrl8bit ? "\x90" "1$r" : ESC_S "P" "1$r"); // DCS 1$r ...
if(cur >= vt->tmpbuffer_len)
return;

for(argi = 0; argi < argc; argi++) {
! cur += snprintf(vt->tmpbuffer + cur, vt->tmpbuffer_len - cur,
argi == argc - 1 ? "%ld" :
CSI_ARG_HAS_MORE(args[argi]) ? "%ld:" :
"%ld;",
--- 1674,1686 ----
size_t cur = 0;
int argi;

! cur += SNPRINTF(vt->tmpbuffer + cur, vt->tmpbuffer_len - cur,
vt->mode.ctrl8bit ? "\x90" "1$r" : ESC_S "P" "1$r"); // DCS 1$r ...
if(cur >= vt->tmpbuffer_len)
return;

for(argi = 0; argi < argc; argi++) {
! cur += SNPRINTF(vt->tmpbuffer + cur, vt->tmpbuffer_len - cur,
argi == argc - 1 ? "%ld" :
CSI_ARG_HAS_MORE(args[argi]) ? "%ld:" :
"%ld;",
***************
*** 1689,1695 ****
return;
}

! cur += snprintf(vt->tmpbuffer + cur, vt->tmpbuffer_len - cur,
vt->mode.ctrl8bit ? "m" "\x9C" : "m" ESC_S "\\"); // ... m ST
if(cur >= vt->tmpbuffer_len)
return;
--- 1689,1695 ----
return;
}

! cur += SNPRINTF(vt->tmpbuffer + cur, vt->tmpbuffer_len - cur,
vt->mode.ctrl8bit ? "m" "\x9C" : "m" ESC_S "\\"); // ... m ST
if(cur >= vt->tmpbuffer_len)
return;
*** ../vim-8.2.0798/src/version.c 2020-05-19 21:19:34.891367031 +0200
--- src/version.c 2020-05-19 21:43:21.567229840 +0200
***************
*** 748,749 ****
--- 748,751 ----
{ /* Add new patch number below this line */
+ /**/
+ 799,
/**/

--
hundred-and-one symptoms of being an internet addict:
138. You develop a liking for cold coffee.

/// Bram Moolenaar -- Br...@Moolenaar.net -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
Reply all
Reply to author
Forward
0 new messages