mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-05 19:08:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:9.1.1570: Copilot suggested some improvements in cmdexpand.c (#35006)

Browse Source 
Problem:  Copilot suggested some improvements in cmdexpand.c
          (after v9.1.1556)
Solution: Use better variable names and comments
          (John Marriott).

closes: vim/vim#17795

88b735973c

Co-authored-by: John Marriott <basilisk@internode.on.net>
This commit is contained in:
zeertzjq
2025-07-20 21:29:35 +08:00
committed by GitHub
parent b91613f42c
commit 0f9b5dd0b4
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/nvim/cmdexpand.c
View File

@@ -3166,12 +3166,13 @@ void ExpandGeneric(const char *const pat, expand_T *xp, regmatch_T *regmatch, ch
/// Expand shell command matches in one directory of $PATH.
///
/// @param pathlen length of the path portion of pat.
static void expand_shellcmd_onedir(char *pat, size_t pathlen, char ***matches, int *numMatches,
int flags, hashtab_T *ht, garray_T *gap)
/// @param pathed_pattern fully pathed pattern
/// @param pathlen length of the path portion of pathed_pattern (0 if no path)
static void expand_shellcmd_onedir(char *pathed_pattern, size_t pathlen, char ***matches,
int *numMatches, int flags, hashtab_T *ht, garray_T *gap)
{
// Expand matches in one directory of $PATH.
if (expand_wildcards(1, &pat, numMatches, matches, flags) != OK) {
if (expand_wildcards(1, &pathed_pattern, numMatches, matches, flags) != OK) {
return;
}
@@ -3290,6 +3291,9 @@ static void expand_shellcmd(char *filepat, char ***matches, int *numMatches, int
seplen = !after_pathsep(s, e) ? STRLEN_LITERAL(PATHSEPSTR) : 0;
}
// Make sure that the pathed pattern (ie the path and pattern concatenated
// together) will fit inside the buffer. If not skip it and move on to the
// next path.
if (pathlen + seplen + patlen + 1 <= MAXPATHL) {
if (pathlen > 0) {
xmemcpyz(buf, s, pathlen);