Bash-4.2 patch 45

[thirdparty/bash.git] / bracecomp.c

diff --git a/bracecomp.c b/bracecomp.c
index 675e041d2d56c5f5df9ba89f50f846fd9a56f20b..cb218a2bf42d25c8799ea0e82754a2d0c317c3dc 100644 (file)
--- a/bracecomp.c
+++ b/bracecomp.c
@@ -4,25 +4,26 @@
 
 /* Original version by tromey@cns.caltech.edu,  Fri Feb  7 1992. */
 
-/* Copyright (C) 1993 Free Software Foundation, Inc.
+/* Copyright (C) 1993-2009 Free Software Foundation, Inc.
 
    This file is part of GNU Bash, the Bourne Again SHell.
 
-   Bash is free software; you can redistribute it and/or modify it under
-   the terms of the GNU General Public License as published by the Free
-   Software Foundation; either version 2, or (at your option) any later
-   version.
+   Bash is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
-   Bash is distributed in the hope that it will be useful, but WITHOUT ANY
-   WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
+   Bash is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
-   You should have received a copy of the GNU General Public License along
-   with Bash; see the file COPYING.  If not, write to the Free Software
-   Foundation, 59 Temple Place, Suite 330, Boston, MA 02111 USA. */
+   You should have received a copy of the GNU General Public License
+   along with Bash.  If not, see <http://www.gnu.org/licenses/>.
+*/
 
 #include "config.h"
+
 #if defined (BRACE_EXPANSION) && defined (READLINE)
 
 #include <stdio.h>
@@ -35,11 +36,12 @@
 #endif
 
 #include "bashansi.h"
+#include "shmbutil.h"
 
 #include "shell.h"
 #include <readline/readline.h>
 
-extern char *sh_backslash_quote ();
+static int _strcompare __P((char **, char **));
 
 /* Find greatest common prefix of two strings. */
 static int
@@ -78,7 +80,7 @@ really_munge_braces (array, real_start, real_end, gcd_zero)
       return x;
     }
 
-  result = xmalloc (result_size = 16);
+  result = (char *)xmalloc (result_size = 16);
   *result = '\0';
 
   for (start = real_start; start < real_end; start = end + 1)
@@ -102,7 +104,7 @@ really_munge_braces (array, real_start, real_end, gcd_zero)
          /* In this case, add in a leading '{', because we are at
             top level, and there isn't a consistent prefix. */
          result_size += 1;
-         result = xrealloc (result, result_size);
+         result = (char *)xrealloc (result, result_size);
          result[0] = '{'; result[1] = '\0';
          flag++;
        }
@@ -121,13 +123,13 @@ really_munge_braces (array, real_start, real_end, gcd_zero)
          /* If there is more than one element in the subarray,
             insert the (quoted) prefix and an opening brace. */
          tlen = gcd - gcd_zero;
-         x = xmalloc (tlen + 1);
+         x = (char *)xmalloc (tlen + 1);
          strncpy (x, array[start] + gcd_zero, tlen);
          x[tlen] = '\0';
          subterm = sh_backslash_quote (x);
          free (x);
          result_size += strlen (subterm) + 1;
-         result = xrealloc (result, result_size);
+         result = (char *)xrealloc (result, result_size);
          strcat (result, subterm);
          free (subterm);
          strcat (result, "{");
@@ -136,7 +138,7 @@ really_munge_braces (array, real_start, real_end, gcd_zero)
        }
 
       result_size += strlen (subterm) + 1;
-      result = xrealloc (result, result_size);
+      result = (char *)xrealloc (result, result_size);
       strcat (result, subterm);
       strcat (result, ",");
       free (subterm);
@@ -147,6 +149,19 @@ really_munge_braces (array, real_start, real_end, gcd_zero)
   return (result);
 }
 
+static int
+_strcompare (s1, s2)
+     char **s1, **s2;
+{
+  int result;
+
+  result = **s1 - **s2;
+  if (result == 0)
+    result = strcmp (*s1, *s2);
+
+  return result;
+}
+
 static int
 hack_braces_completion (names)
      char **names;
@@ -154,7 +169,11 @@ hack_braces_completion (names)
   register int i;
   char *temp;
 
-  temp = really_munge_braces (names, 1, array_len (names), 0);
+  i = strvec_len (names);
+  if (MB_CUR_MAX > 1 && i > 2)
+    qsort (names+1, i-1, sizeof (char *), (QSFUNC *)_strcompare);
+      
+  temp = really_munge_braces (names, 1, i, 0);
 
   for (i = 0; names[i]; ++i)
     {