Bash-4.3 distribution sources and documentation

[platform/upstream/bash.git] / builtins / complete.def

diff --git a/builtins/complete.def b/builtins/complete.def
index b9f0a13..8499b7a 100644 (file)
--- a/builtins/complete.def
+++ b/builtins/complete.def
@@ -1,7 +1,7 @@
 This file is complete.def, from which is created complete.c.
 It implements the builtins "complete", "compgen", and "compopt" in Bash.
 
 This file is complete.def, from which is created complete.c.
 It implements the builtins "complete", "compgen", and "compopt" in Bash.
 

-Copyright (C) 1999-2010 Free Software Foundation, Inc.
+Copyright (C) 1999-2011 Free Software Foundation, Inc.

 
 This file is part of GNU Bash, the Bourne Again SHell.
 
 
 This file is part of GNU Bash, the Bourne Again SHell.
 


@@ -112,7 +112,7 @@ static const struct _compacts {
   { "export",    CA_EXPORT,    'e' },
   { "file",      CA_FILE,      'f' },
   { "function",  CA_FUNCTION,   0 },
   { "export",    CA_EXPORT,    'e' },
   { "file",      CA_FILE,      'f' },
   { "function",  CA_FUNCTION,   0 },

-  { "helptopic", CA_BUILTIN,  0 },     /* for now */
+  { "helptopic", CA_HELPTOPIC,  0 },

   { "hostname",  CA_HOSTNAME,   0 },
   { "group",     CA_GROUP,     'g' },
   { "job",       CA_JOB,       'j' },
   { "hostname",  CA_HOSTNAME,   0 },
   { "group",     CA_GROUP,     'g' },
   { "job",       CA_JOB,       'j' },


@@ -129,7 +129,7 @@ static const struct _compacts {
 };
 
 /* This should be a STRING_INT_ALIST */
 };
 
 /* This should be a STRING_INT_ALIST */

-const static struct _compopt {
+static const struct _compopt {

   const char * const optname;
   int optflag;
 } compopts[] = {
   const char * const optname;
   int optflag;
 } compopts[] = {


@@ -137,6 +137,7 @@ const static struct _compopt {
   { "default", COPT_DEFAULT },
   { "dirnames", COPT_DIRNAMES },
   { "filenames",COPT_FILENAMES},
   { "default", COPT_DEFAULT },
   { "dirnames", COPT_DIRNAMES },
   { "filenames",COPT_FILENAMES},

+  { "noquote", COPT_NOQUOTE },

   { "nospace", COPT_NOSPACE },
   { "plusdirs", COPT_PLUSDIRS },
   { (char *)NULL, 0 },
   { "nospace", COPT_NOSPACE },
   { "plusdirs", COPT_PLUSDIRS },
   { (char *)NULL, 0 },


@@ -728,6 +729,7 @@ compgen_builtin (list)
   if ((sl == 0 || sl->list_len == 0) && (copts & COPT_DEFAULT))
     {
       matches = rl_completion_matches (word, rl_filename_completion_function);
   if ((sl == 0 || sl->list_len == 0) && (copts & COPT_DEFAULT))
     {
       matches = rl_completion_matches (word, rl_filename_completion_function);

+      strlist_dispose (sl);

       sl = completions_to_stringlist (matches);
       strvec_dispose (matches);
     }
       sl = completions_to_stringlist (matches);
       strvec_dispose (matches);
     }