aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 9.1.0052: Patch 9.1.0041 causes regressions for users

Browse Source 
Problem:  Patch 9.1.0041 causes regressions for users
          (Gleb Fotengauer-Malinovskiy)
Solution: Revert 9.1.0041 and restore old behaviour

Revert "patch 9.1.0041: xxd -i may generate incorrect C statements"

This reverts commit 7062be13129985fe297b9a8e59c57b8f0db61b8f.

Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
Christian Brabandt 2024-01-25 20:50:49 +01:00
parent f6ebaa7ae6
commit fa8c971558
No known key found for this signature in database
GPG Key ID: F3F92DA383FDDE09
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/testdir/test_xxd.vim
View File

@ -103,7 +103,7 @@ func Test_xxd()
unsigned char XXDfile[] = { unsigned char XXDfile[] = {
0x54, 0x45, 0x53, 0x54, 0x61, 0x62, 0x63, 0x64, 0x30, 0x39, 0x0a 0x54, 0x45, 0x53, 0x54, 0x61, 0x62, 0x63, 0x64, 0x30, 0x39, 0x0a
}; };
size_t XXDfile_len = 11; unsigned int XXDfile_len = 11;
[CODE] [CODE]
call assert_equal(expected, getline(1,'$'), s:Mess(s:test)) call assert_equal(expected, getline(1,'$'), s:Mess(s:test))
@ -119,7 +119,7 @@ func Test_xxd()
unsigned char XXDFILE[] = { unsigned char XXDFILE[] = {
0x54, 0x45, 0x53, 0x54, 0x61, 0x62, 0x63, 0x64, 0x30, 0x39, 0x0a 0x54, 0x45, 0x53, 0x54, 0x61, 0x62, 0x63, 0x64, 0x30, 0x39, 0x0a
}; };
size_t XXDFILE_LEN = 11; unsigned int XXDFILE_LEN = 11;
[CODE] [CODE]
call assert_equal(expected, getline(1,'$'), s:Mess(s:test)) call assert_equal(expected, getline(1,'$'), s:Mess(s:test))
endfor endfor
@ -233,7 +233,7 @@ func Test_xxd()
unsigned char varName[] = { unsigned char varName[] = {
0x54, 0x45, 0x53, 0x54, 0x61, 0x62, 0x63, 0x64, 0x30, 0x39, 0x0a 0x54, 0x45, 0x53, 0x54, 0x61, 0x62, 0x63, 0x64, 0x30, 0x39, 0x0a
}; };
size_t varName_len = 11; unsigned int varName_len = 11;
[CODE] [CODE]
call assert_equal(expected, getline(1,'$'), s:Mess(s:test)) call assert_equal(expected, getline(1,'$'), s:Mess(s:test))
@ -247,7 +247,7 @@ func Test_xxd()
unsigned char StdIn[] = { unsigned char StdIn[] = {
0x54, 0x45, 0x53, 0x54, 0x61, 0x62, 0x63, 0x64, 0x30, 0x39, 0x0a 0x54, 0x45, 0x53, 0x54, 0x61, 0x62, 0x63, 0x64, 0x30, 0x39, 0x0a
}; };
size_t StdIn_len = 11; unsigned int StdIn_len = 11;
[CODE] [CODE]
call assert_equal(expected, getline(1,'$'), s:Mess(s:test)) call assert_equal(expected, getline(1,'$'), s:Mess(s:test))
@ -263,7 +263,7 @@ func Test_xxd()
unsigned char VARNAME[] = { unsigned char VARNAME[] = {
0x54, 0x45, 0x53, 0x54, 0x61, 0x62, 0x63, 0x64, 0x30, 0x39, 0x0a 0x54, 0x45, 0x53, 0x54, 0x61, 0x62, 0x63, 0x64, 0x30, 0x39, 0x0a
}; };
size_t VARNAME_LEN = 11; unsigned int VARNAME_LEN = 11;
[CODE] [CODE]
call assert_equal(expected, getline(1,'$'), s:Mess(s:test)) call assert_equal(expected, getline(1,'$'), s:Mess(s:test))
endfor endfor

2
src/version.c
View File

@ -704,6 +704,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
52,
/**/ /**/
51, 51,
/**/ /**/

5
src/xxd/xxd.c
View File

@ -60,6 +60,7 @@
* 06.10.2023 enable -r -b to reverse bit dumps * 06.10.2023 enable -r -b to reverse bit dumps
* 12.01.2024 disable auto-conversion for z/OS (MVS) * 12.01.2024 disable auto-conversion for z/OS (MVS)
* 17.01.2024 use size_t instead of usigned int for code-generation (-i), #13876 * 17.01.2024 use size_t instead of usigned int for code-generation (-i), #13876
* 25.01.2024 revert the previous patch (size_t instead of unsigned int)
* *
* (c) 1990-1998 by Juergen Weigert (jnweiger@gmail.com) * (c) 1990-1998 by Juergen Weigert (jnweiger@gmail.com)
* *
@ -140,7 +141,7 @@ extern void perror __P((char *));
# endif # endif
#endif #endif
char version[] = "xxd 2024-01-17 by Juergen Weigert et al."; char version[] = "xxd 2024-01-25 by Juergen Weigert et al.";
#ifdef WIN32 #ifdef WIN32
char osver[] = " (Win32)"; char osver[] = " (Win32)";
#else #else
@ -978,7 +979,7 @@ main(int argc, char *argv[])
if (varname != NULL) if (varname != NULL)
{ {
fputs_or_die("};\n", fpo); fputs_or_die("};\n", fpo);
FPRINTF_OR_DIE((fpo, "size_t %s", isdigit((unsigned char)varname[0]) ? "__" : "")); FPRINTF_OR_DIE((fpo, "unsigned int %s", isdigit((unsigned char)varname[0]) ? "__" : ""));
for (e = 0; (c = varname[e]) != 0; e++) for (e = 0; (c = varname[e]) != 0; e++)
putc_or_die(isalnum((unsigned char)c) ? CONDITIONAL_CAPITALIZE(c) : '_', fpo); putc_or_die(isalnum((unsigned char)c) ? CONDITIONAL_CAPITALIZE(c) : '_', fpo);
FPRINTF_OR_DIE((fpo, "_%s = %d;\n", capitalize ? "LEN" : "len", p)); FPRINTF_OR_DIE((fpo, "_%s = %d;\n", capitalize ? "LEN" : "len", p));