aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00
Code Activity

patch 9.0.0865: duplicate arguments are not always detected

Browse Source 
Problem:    Duplicate arguments are not always detected.
Solution:   Expand to full path before comparing arguments. (Nir Lichtman,
            closes #11505, closes #9402)
This commit is contained in:
Nir Lichtman
2022-11-12 17:00:31 +00:00
committed by Bram Moolenaar
parent 6600447c7b
commit b3052aa1b5
3 changed files with 33 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/arglist.c
View File

@@ -784,9 +784,25 @@ ex_argdedupe(exarg_T *eap UNUSED)
int j;
for (i = 0; i < ARGCOUNT; ++i)
{
// Expand each argument to a full path to catch different paths leading
// to the same file.
char_u *firstFullname = FullName_save(ARGLIST[i].ae_fname, FALSE);
if (firstFullname == NULL)
return; // out of memory
for (j = i + 1; j < ARGCOUNT; ++j)
if (fnamecmp(ARGLIST[i].ae_fname, ARGLIST[j].ae_fname) == 0)
{
char_u *secondFullname = FullName_save(ARGLIST[j].ae_fname, FALSE);
if (secondFullname == NULL)
break; // out of memory
int areNamesDuplicate =
fnamecmp(firstFullname, secondFullname) == 0;
vim_free(secondFullname);
if (areNamesDuplicate)
{
// remove one duplicate argument
vim_free(ARGLIST[j].ae_fname);
mch_memmove(ARGLIST + j, ARGLIST + j + 1,
(ARGCOUNT - j - 1) * sizeof(aentry_T));
@@ -799,6 +815,10 @@ ex_argdedupe(exarg_T *eap UNUSED)
--j;
}
}
vim_free(firstFullname);
}
}
/*