mirror of
https://github.com/vim/vim.git
synced 2025-09-24 03:44:06 -04:00
patch 8.0.0550: cannot parse some etags format tags file
Problem: Some etags format tags file use 0x01, breaking the parsing. Solution: Use 0x02 for TAG_SEP. (James McCoy, closes #1614)
This commit is contained in:
13
src/tag.c
13
src/tag.c
@@ -2355,18 +2355,19 @@ parse_line:
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
#define TAG_SEP 0x01
|
#define TAG_SEP 0x02
|
||||||
size_t tag_fname_len = STRLEN(tag_fname);
|
size_t tag_fname_len = STRLEN(tag_fname);
|
||||||
#ifdef FEAT_EMACS_TAGS
|
#ifdef FEAT_EMACS_TAGS
|
||||||
size_t ebuf_len = 0;
|
size_t ebuf_len = 0;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* Save the tag in a buffer.
|
/* Save the tag in a buffer.
|
||||||
* Use 0x01 to separate fields (Can't use NUL, because the
|
* Use 0x02 to separate fields (Can't use NUL because the
|
||||||
* hash key is terminated by NUL).
|
* hash key is terminated by NUL, or Ctrl_A because that is
|
||||||
* Emacs tag: <mtt><tag_fname><0x01><ebuf><0x01><lbuf><NUL>
|
* part of some Emacs tag files -- see parse_tag_line).
|
||||||
* other tag: <mtt><tag_fname><0x01><0x01><lbuf><NUL>
|
* Emacs tag: <mtt><tag_fname><0x02><ebuf><0x02><lbuf><NUL>
|
||||||
* without Emacs tags: <mtt><tag_fname><0x01><lbuf><NUL>
|
* other tag: <mtt><tag_fname><0x02><0x02><lbuf><NUL>
|
||||||
|
* without Emacs tags: <mtt><tag_fname><0x02><lbuf><NUL>
|
||||||
* Here <mtt> is the "mtt" value plus 1 to avoid NUL.
|
* Here <mtt> is the "mtt" value plus 1 to avoid NUL.
|
||||||
*/
|
*/
|
||||||
len = (int)tag_fname_len + (int)STRLEN(lbuf) + 3;
|
len = (int)tag_fname_len + (int)STRLEN(lbuf) + 3;
|
||||||
|
@@ -19,3 +19,40 @@ func Test_taglist()
|
|||||||
bwipe
|
bwipe
|
||||||
endfunc
|
endfunc
|
||||||
|
|
||||||
|
func Test_taglist_native_etags()
|
||||||
|
if !has('emacs_tags')
|
||||||
|
return
|
||||||
|
endif
|
||||||
|
call writefile([
|
||||||
|
\ "\x0c",
|
||||||
|
\ "src/os_unix.c,13491",
|
||||||
|
\ "set_signals(\x7f1335,32699",
|
||||||
|
\ "reset_signals(\x7f1407,34136",
|
||||||
|
\ ], 'Xtags')
|
||||||
|
|
||||||
|
set tags=Xtags
|
||||||
|
|
||||||
|
call assert_equal([['set_signals', '1335,32699'], ['reset_signals', '1407,34136']],
|
||||||
|
\ map(taglist('set_signals'), {i, v -> [v.name, v.cmd]}))
|
||||||
|
|
||||||
|
call delete('Xtags')
|
||||||
|
endfunc
|
||||||
|
|
||||||
|
func Test_taglist_ctags_etags()
|
||||||
|
if !has('emacs_tags')
|
||||||
|
return
|
||||||
|
endif
|
||||||
|
call writefile([
|
||||||
|
\ "\x0c",
|
||||||
|
\ "src/os_unix.c,13491",
|
||||||
|
\ "set_signals(void)\x7fset_signals\x011335,32699",
|
||||||
|
\ "reset_signals(void)\x7freset_signals\x011407,34136",
|
||||||
|
\ ], 'Xtags')
|
||||||
|
|
||||||
|
set tags=Xtags
|
||||||
|
|
||||||
|
call assert_equal([['set_signals', '1335,32699'], ['reset_signals', '1407,34136']],
|
||||||
|
\ map(taglist('set_signals'), {i, v -> [v.name, v.cmd]}))
|
||||||
|
|
||||||
|
call delete('Xtags')
|
||||||
|
endfunc
|
||||||
|
@@ -764,6 +764,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 */
|
||||||
|
/**/
|
||||||
|
550,
|
||||||
/**/
|
/**/
|
||||||
549,
|
549,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user