diff options
| author | Nir Lichtman <nir@lichtman.org> | 2022-11-12 17:00:31 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-11-12 17:00:31 +0000 |
| commit | b3052aa1b555ab5a81b1459a4972290381b0e7e4 (patch) | |
| tree | 93bf7597b5c636a2824a9020602fe25c6b664206 /src/arglist.c | |
| parent | 6600447c7b0a1be3a64d07a318bacdfaae0cac4b (diff) | |
patch 9.0.0865: duplicate arguments are not always detectedv9.0.0865
Problem: Duplicate arguments are not always detected.
Solution: Expand to full path before comparing arguments. (Nir Lichtman,
closes #11505, closes #9402)
Diffstat (limited to 'src/arglist.c')
| -rw-r--r-- | src/arglist.c | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/src/arglist.c b/src/arglist.c index bc51cded1f..b35cdfe7ab 100644 --- a/src/arglist.c +++ b/src/arglist.c @@ -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); + } } /* |