mirror of
https://github.com/neovim/neovim.git
synced 2025-02-25 18:55:25 -06:00
Update comments for expand_wildcards functions.
Be more specific in the description of mch_expand_wildcards(): This function will never free memory pointed to by its arguments. If OK is returned, *file will always point to allocated memory. *num_file is set to the number of pointers in *file. If FAIL is returned *file is set to NULL and *num_file to 0. If gen_expand_wildcards() returns FAIL, no memory allocation in this function needs to be undone. If expand_wildcards() returns FAIL, no memory allocation in this function needs to be undone. Helped-by: Eliseo Martínez <eliseomarmol@gmail.com> Helped-by: Michael Reed <m.reed@mykolab.com>
This commit is contained in:
parent
d3bb177f1e
commit
adb3ec2026
@ -3810,16 +3810,17 @@ void ExpandGeneric(
|
|||||||
reset_expand_highlight();
|
reset_expand_highlight();
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/// Complete a shell command.
|
||||||
* Complete a shell command.
|
///
|
||||||
*/
|
/// @param filepat is a pattern to match with command names.
|
||||||
static void
|
/// @param[out] num_file is pointer to number of matches.
|
||||||
expand_shellcmd (
|
/// @param[out] file is pointer to array of pointers to matches.
|
||||||
char_u *filepat, /* pattern to match with command names */
|
/// *file will either be set to NULL or point to
|
||||||
int *num_file, /* return: number of matches */
|
/// allocated memory.
|
||||||
char_u ***file, /* return: array with matches */
|
/// @param flagsarg is a combination of EW_* flags.
|
||||||
int flagsarg /* EW_ flags */
|
static void expand_shellcmd(char_u *filepat, int *num_file, char_u ***file,
|
||||||
)
|
int flagsarg)
|
||||||
|
FUNC_ATTR_NONNULL_ALL
|
||||||
{
|
{
|
||||||
char_u *pat;
|
char_u *pat;
|
||||||
int i;
|
int i;
|
||||||
|
@ -189,19 +189,6 @@ void mch_exit(int r)
|
|||||||
exit(r);
|
exit(r);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
|
||||||
* mch_expand_wildcards() - this code does wild-card pattern matching using
|
|
||||||
* the shell
|
|
||||||
*
|
|
||||||
* return OK for success, FAIL for error (you may lose some memory) and put
|
|
||||||
* an error message in *file.
|
|
||||||
*
|
|
||||||
* num_pat is number of input patterns
|
|
||||||
* pat is array of pointers to input patterns
|
|
||||||
* num_file is pointer to number of matched file names
|
|
||||||
* file is pointer to array of pointers to matched file names
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef SEEK_SET
|
#ifndef SEEK_SET
|
||||||
# define SEEK_SET 0
|
# define SEEK_SET 0
|
||||||
#endif
|
#endif
|
||||||
@ -211,10 +198,27 @@ void mch_exit(int r)
|
|||||||
|
|
||||||
#define SHELL_SPECIAL (char_u *)"\t \"&'$;<>()\\|"
|
#define SHELL_SPECIAL (char_u *)"\t \"&'$;<>()\\|"
|
||||||
|
|
||||||
|
/// Does wildcard pattern matching using the shell.
|
||||||
|
///
|
||||||
|
/// @param num_pat is the number of input patterns.
|
||||||
|
/// @param pat is an array of pointers to input patterns.
|
||||||
|
/// @param[out] num_file is pointer to number of matched file names.
|
||||||
|
/// Set to the number of pointers in *file.
|
||||||
|
/// @param[out] file is pointer to array of pointers to matched file names.
|
||||||
|
/// Memory pointed to by the initial value of *file will
|
||||||
|
/// not be freed.
|
||||||
|
/// Set to NULL if FAIL is returned. Otherwise points to
|
||||||
|
/// allocated memory.
|
||||||
|
/// @param flags is a combination of EW_* flags used in
|
||||||
|
/// expand_wildcards().
|
||||||
|
/// If matching fails but EW_NOTFOUND is set in flags or
|
||||||
|
/// there are no wildcards, the patterns from pat are
|
||||||
|
/// copied into *file.
|
||||||
|
///
|
||||||
|
/// @returns OK for success or FAIL for error.
|
||||||
int mch_expand_wildcards(int num_pat, char_u **pat, int *num_file,
|
int mch_expand_wildcards(int num_pat, char_u **pat, int *num_file,
|
||||||
char_u ***file,
|
char_u ***file, int flags) FUNC_ATTR_NONNULL_ARG(3)
|
||||||
int flags /* EW_* flags */
|
FUNC_ATTR_NONNULL_ARG(4)
|
||||||
)
|
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
size_t len;
|
size_t len;
|
||||||
|
@ -1029,25 +1029,26 @@ static int has_special_wildchar(char_u *p)
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/*
|
/// Generic wildcard expansion code.
|
||||||
* Generic wildcard expansion code.
|
///
|
||||||
*
|
/// Characters in pat that should not be expanded must be preceded with a
|
||||||
* Characters in "pat" that should not be expanded must be preceded with a
|
/// backslash. E.g., "/path\ with\ spaces/my\*star*".
|
||||||
* backslash. E.g., "/path\ with\ spaces/my\*star*"
|
///
|
||||||
*
|
/// @param num_pat is number of input patterns.
|
||||||
* Return FAIL when no single file was found. In this case "num_file" is not
|
/// @param pat is an array of pointers to input patterns.
|
||||||
* set, and "file" may contain an error message.
|
/// @param[out] num_file is pointer to number of matched file names.
|
||||||
* Return OK when some files found. "num_file" is set to the number of
|
/// @param[out] file is pointer to array of pointers to matched file names.
|
||||||
* matches, "file" to the array of matches. Call FreeWild() later.
|
/// @param flags is a combination of EW_* flags used in
|
||||||
*/
|
/// expand_wildcards().
|
||||||
int
|
///
|
||||||
gen_expand_wildcards (
|
/// @returns OK when some files were found. *num_file is set to the
|
||||||
int num_pat, /* number of input patterns */
|
/// number of matches, *file to the allocated array of
|
||||||
char_u **pat, /* array of input patterns */
|
/// matches. Call FreeWild() later.
|
||||||
int *num_file, /* resulting number of files */
|
/// If FAIL is returned, *num_file and *file are either
|
||||||
char_u ***file, /* array of resulting files */
|
/// unchanged or *num_file is set to 0 and *file is set
|
||||||
int flags /* EW_* flags */
|
/// to NULL or points to "".
|
||||||
)
|
int gen_expand_wildcards(int num_pat, char_u **pat, int *num_file,
|
||||||
|
char_u ***file, int flags)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
garray_T ga;
|
garray_T ga;
|
||||||
@ -1863,19 +1864,23 @@ int expand_wildcards_eval(char_u **pat, int *num_file, char_u ***file,
|
|||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/// Expand wildcards. Calls gen_expand_wildcards() and removes files matching
|
||||||
* Expand wildcards. Calls gen_expand_wildcards() and removes files matching
|
/// 'wildignore'.
|
||||||
* 'wildignore'.
|
///
|
||||||
* Returns OK or FAIL. When FAIL then "num_file" won't be set.
|
/// @param num_pat is number of input patterns.
|
||||||
*/
|
/// @param pat is an array of pointers to input patterns.
|
||||||
int
|
/// @param[out] num_file is pointer to number of matched file names.
|
||||||
expand_wildcards (
|
/// @param[out] file is pointer to array of pointers to matched file names.
|
||||||
int num_pat, /* number of input patterns */
|
/// @param flags is a combination of EW_* flags.
|
||||||
char_u **pat, /* array of input patterns */
|
///
|
||||||
int *num_file, /* resulting number of files */
|
/// @returns OK when some files were found. *num_file is set to the
|
||||||
char_u ***file, /* array of resulting files */
|
/// number of matches, *file to the allocated array of
|
||||||
int flags /* EW_DIR, etc. */
|
/// matches.
|
||||||
)
|
/// If FAIL is returned, *num_file and *file are either
|
||||||
|
/// unchanged or *num_file is set to 0 and *file is set to
|
||||||
|
/// NULL or points to "".
|
||||||
|
int expand_wildcards(int num_pat, char_u **pat, int *num_file, char_u ***file,
|
||||||
|
int flags)
|
||||||
{
|
{
|
||||||
int retval;
|
int retval;
|
||||||
int i, j;
|
int i, j;
|
||||||
|
Loading…
Reference in New Issue
Block a user