Fix bug in fcomplete when pattern does not match any file.

gwsw · Jul 27, 2017 · 0f6d609 · 0f6d609
1 parent 3b5f627
commit 0f6d609
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,6 +2,7 @@ obj/**
 release/**
 unicode/**
 *.cache
+*.old
 NEWS
 README
 configure

diff --git a/filename.c b/filename.c
@@ -397,6 +397,7 @@ fcomplete(s)
  char *s;
 {
  char *fpat;
+ char *qs;
 
  if (secure)
  return (NULL);
@@ -431,18 +432,19 @@ fcomplete(s)
  SNPRINTF1(fpat, len, "%s*", s);
  }
 #endif
- s = lglob(fpat);
+ qs = lglob(fpat);
+ s = shell_unquote(qs);
  if (strcmp(s,fpat) == 0)
  {
  /*
  * The filename didn't expand.
  */
- free(s);
- free(fpat);
- return (NULL);
+ free(qs);
+ qs = NULL;
  }
+ free(s);
  free(fpat);
- return (s);
+ return (qs);
 }
 #endif