Bash-4.2 patch 45

[thirdparty/bash.git] / alias.c

diff --git a/alias.c b/alias.c
index 1aa9cb11b395c92b68c756e6cba8c28e2d8d419b..6c953760f1036e2fb4820b4bcfb53bce37407a34 100644 (file)
--- a/alias.c
+++ b/alias.c
@@ -1,23 +1,23 @@
 /* alias.c -- Not a full alias, but just the kind that we use in the
    shell.  Csh style alias is somewhere else (`over there, in a box'). */
 
-/* Copyright (C) 1987-2002 Free Software Foundation, Inc.
+/* Copyright (C) 1987-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. */
+   along with Bash.  If not, see <http://www.gnu.org/licenses/>.
+*/
 
 #include "config.h"
 
@@ -67,7 +67,7 @@ HASH_TABLE *aliases = (HASH_TABLE *)NULL;
 void
 initialize_aliases ()
 {
-  if (!aliases)
+  if (aliases == 0)
     aliases = hash_create (ALIAS_HASH_BUCKETS);
 }
 
@@ -319,6 +319,8 @@ skipquotes (string, start)
       if (string[i] == '\\')
        {
          i++;          /* skip backslash-quoted quote characters, too */
+         if (string[i] == 0)
+           break;
          continue;
        }
 
@@ -364,6 +366,8 @@ skipws (string, start)
       if (string[i] == '\\')
        {
          peekc = string[i+1];
+         if (peekc == 0)
+           break;
          if (ISLETTER (peekc))
            backslash_quoted_word++;    /* this is a backslash-quoted word */
          else
@@ -429,6 +433,8 @@ rd_token (string, start)
       if (string[i] == '\\')
        {
          i++;  /* skip backslash-escaped character */
+         if (string[i] == 0)
+           break;
          continue;
        }
 
@@ -526,7 +532,7 @@ alias_expand (string)
       /* If there is a backslash-escaped character quoted in TOKEN,
         then we don't do alias expansion.  This should check for all
         other quoting characters, too. */
-      if (xstrchr (token, '\\'))
+      if (mbschr (token, '\\'))
        expand_this_token = 0;
 
       /* If we should be expanding here, if we are expanding all words, or if