Merge #2240 'Fix problem with coverity/105568 fix'

Closes #2230

src/nvim/ex_getln.c

@@ -10,7 +10,6 @@
  * ex_getln.c: Functions for entering and editing an Ex command line.
  */
 
-#include <assert.h>
 #include <errno.h>
 #include <stdbool.h>
 #include <string.h>
@@ -3629,6 +3628,7 @@ ExpandFromContext (
   }
 
   if (xp->xp_context == EXPAND_SHELLCMD) {
+    *file = NULL;
     expand_shellcmd(pat, num_file, file, flags);
     return OK;
   }
@@ -3810,16 +3810,17 @@ void ExpandGeneric(
   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;
   int i;
@@ -3875,10 +3876,8 @@ expand_shellcmd (
     STRLCPY(buf + l, pat, MAXPATHL - l);
 
     /* Expand matches in one directory of $PATH. */
-    char_u **prev_file = *file;
     ret = expand_wildcards(1, &buf, num_file, file, flags);
     if (ret == OK) {
-      assert(*file != prev_file);
       ga_grow(&ga, *num_file);
       {
         for (i = 0; i < *num_file; ++i) {

src/nvim/os_unix.c

@@ -189,19 +189,6 @@ void mch_exit(int 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
 # define SEEK_SET 0
 #endif
@@ -211,10 +198,27 @@ void mch_exit(int r)
 
 #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,
-                         char_u ***file,
+                         char_u ***file, int flags) FUNC_ATTR_NONNULL_ARG(3)
-                         int flags /* EW_* flags */
+    FUNC_ATTR_NONNULL_ARG(4)
-                         )
 {
   int i;
   size_t len;

src/nvim/path.c

@@ -1029,25 +1029,26 @@ static int has_special_wildchar(char_u *p)
 }
 #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;
   garray_T ga;
@@ -1863,19 +1864,23 @@ int expand_wildcards_eval(char_u **pat, int *num_file, char_u ***file,
   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 i, j;