0
0
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -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:
Bram Moolenaar
2017-04-07 20:30:29 +02:00
parent 395b6bab33
commit 9585a1655b
3 changed files with 46 additions and 6 deletions

View File

@@ -2355,18 +2355,19 @@ parse_line:
}
else
{
#define TAG_SEP 0x01
#define TAG_SEP 0x02
size_t tag_fname_len = STRLEN(tag_fname);
#ifdef FEAT_EMACS_TAGS
size_t ebuf_len = 0;
#endif
/* Save the tag in a buffer.
* Use 0x01 to separate fields (Can't use NUL, because the
* hash key is terminated by NUL).
* Emacs tag: <mtt><tag_fname><0x01><ebuf><0x01><lbuf><NUL>
* other tag: <mtt><tag_fname><0x01><0x01><lbuf><NUL>
* without Emacs tags: <mtt><tag_fname><0x01><lbuf><NUL>
* Use 0x02 to separate fields (Can't use NUL because the
* hash key is terminated by NUL, or Ctrl_A because that is
* part of some Emacs tag files -- see parse_tag_line).
* Emacs tag: <mtt><tag_fname><0x02><ebuf><0x02><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.
*/
len = (int)tag_fname_len + (int)STRLEN(lbuf) + 3;