commit bash-20040107 snapshot

3 files changed, 210 insertions, 0 deletions

diff --git a/include/gettext.h b/include/gettext.h
new file mode 100644
index 00000000..8b262f4c
--- /dev/null
+++ b/include/gettext.h
@@ -0,0 +1,69 @@
+/* Convenience header for conditional use of GNU <libintl.h>.
+   Copyright (C) 1995-1998, 2000-2002 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program 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
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   USA.  */
+
+#ifndef _LIBGETTEXT_H
+#define _LIBGETTEXT_H 1
+
+/* NLS can be disabled through the configure --disable-nls option.  */
+#if ENABLE_NLS
+
+/* Get declarations of GNU message catalog functions.  */
+# include <libintl.h>
+
+#else
+
+/* Solaris /usr/include/locale.h includes /usr/include/libintl.h, which
+   chokes if dcgettext is defined as a macro.  So include it now, to make
+   later inclusions of <locale.h> a NOP.  We don't include <libintl.h>
+   as well because people using "gettext.h" will not include <libintl.h>,
+   and also including <libintl.h> would fail on SunOS 4, whereas <locale.h>
+   is OK.  */
+#if defined(__sun)
+# include <locale.h>
+#endif
+
+/* Disabled NLS.
+   The casts to 'const char *' serve the purpose of producing warnings
+   for invalid uses of the value returned from these functions.
+   On pre-ANSI systems without 'const', the config.h file is supposed to
+   contain "#define const".  */
+# define gettext(Msgid) ((const char *) (Msgid))
+# define dgettext(Domainname, Msgid) ((const char *) (Msgid))
+# define dcgettext(Domainname, Msgid, Category) ((const char *) (Msgid))
+# define ngettext(Msgid1, Msgid2, N) \
+    ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2))
+# define dngettext(Domainname, Msgid1, Msgid2, N) \
+    ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2))
+# define dcngettext(Domainname, Msgid1, Msgid2, N, Category) \
+    ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2))
+# define textdomain(Domainname) ((const char *) (Domainname))
+# define bindtextdomain(Domainname, Dirname) ((const char *) (Dirname))
+# define bind_textdomain_codeset(Domainname, Codeset) ((const char *) (Codeset))
+
+#endif
+
+/* A pseudo function call that serves as a marker for the automated
+   extraction of messages, but does not call gettext().  The run-time
+   translation is done at a different place in the code.
+   The argument, String, should be a literal string.  Concatenated strings
+   and other string expressions won't work.
+   The macro's expansion is not parenthesized, so that it is suitable as
+   initializer for static 'char[]' or 'const char[]' variables.  */
+#define gettext_noop(String) String
+
+#endif /* _LIBGETTEXT_H */
diff --git a/include/memalloc.h.save b/include/memalloc.h.save
new file mode 100644
index 00000000..a1a27069
--- /dev/null
+++ b/include/memalloc.h.save
@@ -0,0 +1,58 @@
+/* memalloc.h -- consolidate code for including alloca.h or malloc.h and
+   defining alloca. */
+
+/* Copyright (C) 1993 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 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. */
+
+#if !defined (_MEMALLOC_H_)
+#  define _MEMALLOC_H_
+
+#if defined (sparc) && defined (sun) && !defined (HAVE_ALLOCA_H)
+#  define HAVE_ALLOCA_H
+#endif
+
+#if defined (__GNUC__) && !defined (HAVE_ALLOCA)
+#  define HAVE_ALLOCA
+#endif
+
+#if defined (HAVE_ALLOCA_H) && !defined (HAVE_ALLOCA)
+#  define HAVE_ALLOCA
+#endif /* HAVE_ALLOCA_H && !HAVE_ALLOCA */
+
+#if defined (__GNUC__) && !defined (C_ALLOCA)
+#  undef alloca
+#  define alloca __builtin_alloca
+#else /* !__GNUC__ || C_ALLOCA */
+#  if defined (HAVE_ALLOCA_H) && !defined (C_ALLOCA)
+#    if defined (IBMESA)
+#      include <malloc.h>
+#    else /* !IBMESA */
+#      include <alloca.h>
+#    endif /* !IBMESA */
+#  else  /* !HAVE_ALLOCA_H || C_ALLOCA */
+#    if defined (__hpux) && defined (__STDC__) && !defined (alloca)
+extern void *alloca ();
+#    else
+#      if !defined (alloca)
+extern char *alloca ();
+#      endif /* !alloca */
+#    endif /* !__hpux || !__STDC__ && !alloca */
+#  endif /* !HAVE_ALLOCA_H || C_ALLOCA */
+#endif /* !__GNUC__ || C_ALLOCA */
+
+#endif /* _MEMALLOC_H_ */
diff --git a/include/shmbutil.h b/include/shmbutil.h
index b700504d..f6e39b21 100644
--- a/include/shmbutil.h
+++ b/include/shmbutil.h
@@ -172,6 +172,89 @@ extern char *xstrchr __P((const char *, int));
 #  define ADVANCE_CHAR_P(_str, _strsize)
 #endif  /* !HANDLE_MULTIBYTE */
 
+/* Back up one (possibly multi-byte) character in string _STR of length
+   _STRSIZE, starting at index _I.  STATE must have already been declared. */
+#if defined (HANDLE_MULTIBYTE)
+#  define BACKUP_CHAR(_str, _strsize, _i) \
+    do \
+      { \
+	if (MB_CUR_MAX > 1) \
+	  { \
+	    mbstate_t state_bak; \
+	    size_t mblength; \
+	    int _x, _p; /* _x == temp index into string, _p == prev index */ \
+\
+	    _x = _p = 0; \
+	    while (_x < (_i)) \
+	      { \
+	        state_bak = state; \
+	        mblength = mbrlen ((_str) + (_x), (_strsize) - (_x), &state); \
+\
+		if (mblength == (size_t)-2 || mblength == (size_t)-1) \
+		  { \
+		    state = state_bak; \
+		    _x++; \
+		  } \
+		else if (mblength == 0) \
+		  _x++; \
+		else \
+		  { \
+		    _p = _x; /* _p == start of prev mbchar */ \
+		    _x += mblength; \
+		  } \
+	      } \
+	    (_i) = _p; \
+	  } \
+	else \
+	  (_i)--; \
+      } \
+    while (0)
+#else
+#  define BACKUP_CHAR(_str, _strsize, _i)	(_i)--
+#endif  /* !HANDLE_MULTIBYTE */
+
+/* Back up one (possibly multibyte) character in the string _BASE of length
+   _STRSIZE starting at _STR (_BASE <= _STR <= (_BASE + _STRSIZE) ).
+   SPECIAL: DO NOT assume that _STR will be decremented by 1 after this call. */
+#if defined (HANDLE_MULTIBYTE)
+#  define BACKUP_CHAR_P(_base, _strsize, _str) \
+    do \
+      { \
+	if (MB_CUR_MAX > 1) \
+	  { \
+	    mbstate_t state_bak; \
+	    size_t mblength; \
+	    char *_x, _p; /* _x == temp pointer into string, _p == prev pointer */ \
+\
+	    _x = _p = _base; \
+	    while (_x < (_str)) \
+	      { \
+	        state_bak = state; \
+	        mblength = mbrlen (_x, (_strsize) - _x, &state); \
+\
+		if (mblength == (size_t)-2 || mblength == (size_t)-1) \
+		  { \
+		    state = state_bak; \
+		    _x++; \
+		  } \
+		else if (mblength == 0) \
+		  _x++; \
+		else \
+		  { \
+		    _p = _x; /* _p == start of prev mbchar */ \
+		    _x += mblength; \
+		  } \
+	      } \
+	    (_str) = _p; \
+	  } \
+	else \
+	  (_str)--; \
+      } \
+    while (0)
+#else
+#  define BACKUP_CHAR_P(_base, _strsize, _str) (_str)--
+#endif  /* !HANDLE_MULTIBYTE */
+
 /* Copy a single character from the string _SRC to the string _DST.
    _SRCEND is a pointer to the end of _SRC. */
 #if defined (HANDLE_MULTIBYTE)