bash-4.4 beta2 release

include/shmbchar.h

@@ -34,9 +34,8 @@
 
 
 /* is_basic(c) tests whether the single-byte character c is in the
-   ISO C "basic character set".
-   This is a convenience function, and is in this file only to share code
-   between mbiter_multi.h and mbfile_multi.h.  */
+   ISO C "basic character set". */
+
 #if (' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
     && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
     && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
@@ -79,6 +78,7 @@ is_basic (char c)
 {
   switch (c)
     {
+    case '\b': case '\r': case '\n':
     case '\t': case '\v': case '\f':
     case ' ': case '!': case '"': case '#': case '%':
     case '&': case '\'': case '(': case ')': case '*':

include/shmbutil.h

@@ -499,5 +499,34 @@ extern int locale_mb_cur_max;	/* XXX */
 \
 	    goto add_string
 
+#  define SADD_MBCHAR_BODY(_dst, _src, _si, _srcsize) \
+\
+	    int i; \
+	    mbstate_t state_bak; \
+	    size_t mblength; \
+\
+	    i = is_basic (*((_src) + (_si))); \
+	    if (i) \
+	      mblength = 1; \
+	    else \
+	      { \
+		state_bak = state; \
+		mblength = mbrlen ((_src) + (_si), (_srcsize) - (_si), &state); \
+	      } \
+	    if (mblength == (size_t)-1 || mblength == (size_t)-2) \
+	      { \
+		state = state_bak; \
+		mblength = 1; \
+	      } \
+	    if (mblength < 1) \
+	      mblength = 1; \
+\
+	    (_dst) = (char *)xmalloc (mblength + 1); \
+	    for (i = 0; i < mblength; i++) \
+	      (_dst)[i+1] = (_src)[(_si)++]; \
+	    (_dst)[mblength+1] = '\0'; \
+\
+	    goto add_string
+
 #endif /* HANDLE_MULTIBYTE */
 #endif /* _SH_MBUTIL_H_ */