diff options
| -rwxr-xr-x | bootstrap | 6 | ||||
| -rw-r--r-- | gl/lib/regcomp.c.diff | 28 | ||||
| m--------- | gnulib | 0 | ||||
| -rw-r--r-- | tests/init.sh | 5 |
4 files changed, 23 insertions, 16 deletions
@@ -1,6 +1,6 @@ #! /bin/sh # Print a version string. -scriptversion=2012-01-22.10; # UTC +scriptversion=2012-02-11.09; # UTC # Bootstrap this package from checked-out sources. @@ -423,7 +423,7 @@ check_versions() { $use_git || continue fi # Honor $APP variables ($TAR, $AUTOCONF, etc.) - appvar=`echo $app | tr '[a-z]-' '[A-Z]_'` + appvar=`echo $app | LC_ALL=C tr '[a-z]-' '[A-Z]_'` test "$appvar" = TAR && appvar=AMTAR case $appvar in GZIP) ;; # Do not use $GZIP: it contains gzip options. @@ -604,7 +604,7 @@ if $bootstrap_sync; then fi gnulib_tool=$GNULIB_SRCDIR/gnulib-tool -<$gnulib_tool || exit +<$gnulib_tool || exit $? # Get translations. diff --git a/gl/lib/regcomp.c.diff b/gl/lib/regcomp.c.diff index 63fc1875..e9656736 100644 --- a/gl/lib/regcomp.c.diff +++ b/gl/lib/regcomp.c.diff @@ -11,7 +11,7 @@ index d5968bd..4926676 100644 char *_Restrict_ errbuf, size_t errbuf_size) #endif { -@@ -1383,7 +1383,7 @@ calc_first (void *extra, bin_tree_t *node) +@@ -1415,7 +1415,7 @@ calc_first (void *extra, bin_tree_t *node) /* Pass 2: compute NEXT on the tree. Preorder visit. */ static reg_errcode_t @@ -20,17 +20,20 @@ index d5968bd..4926676 100644 { switch (node->token.type) { -@@ -2744,7 +2744,8 @@ static reg_errcode_t +@@ -2792,8 +2792,10 @@ build_range_exp (const reg_syntax_t synt + static reg_errcode_t internal_function - build_collating_symbol (bitset_t sbcset, # ifdef RE_ENABLE_I18N -- re_charset_t *mbcset, Idx *coll_sym_alloc, -+ re_charset_t *mbcset _UNUSED_PARAMETER_, +-build_collating_symbol (bitset_t sbcset, re_charset_t *mbcset, +- Idx *coll_sym_alloc, const unsigned char *name) ++build_collating_symbol (bitset_t sbcset, ++ re_charset_t *mbcset _UNUSED_PARAMETER_, + Idx *coll_sym_alloc _UNUSED_PARAMETER_, - # endif - const unsigned char *name) - { -@@ -3323,7 +3324,8 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token, ++ const unsigned char *name) + # else /* not RE_ENABLE_I18N */ + build_collating_symbol (bitset_t sbcset, const unsigned char *name) + # endif /* not RE_ENABLE_I18N */ +@@ -3377,7 +3379,8 @@ parse_bracket_exp (re_string_t *regexp, static reg_errcode_t parse_bracket_element (bracket_elem_t *elem, re_string_t *regexp, @@ -40,19 +43,20 @@ index d5968bd..4926676 100644 reg_syntax_t syntax, bool accept_hyphen) { #ifdef RE_ENABLE_I18N -@@ -3410,8 +3412,9 @@ parse_bracket_symbol (bracket_elem_t *elem, re_string_t *regexp, +@@ -3464,8 +3467,10 @@ parse_bracket_symbol (bracket_elem_t *elem, re_string_t *regexp, static reg_errcode_t #ifdef RE_ENABLE_I18N -build_equiv_class (bitset_t sbcset, re_charset_t *mbcset, - Idx *equiv_class_alloc, const unsigned char *name) -+build_equiv_class (bitset_t sbcset, re_charset_t *mbcset _UNUSED_PARAMETER_, ++build_equiv_class (bitset_t sbcset, ++ re_charset_t *mbcset _UNUSED_PARAMETER_, + Idx *equiv_class_alloc _UNUSED_PARAMETER_, + const unsigned char *name) #else /* not RE_ENABLE_I18N */ build_equiv_class (bitset_t sbcset, const unsigned char *name) #endif /* not RE_ENABLE_I18N */ -@@ -3816,7 +3819,7 @@ free_token (re_token_t *node) +@@ -3869,7 +3874,7 @@ free_token (re_token_t *node) and its children. */ static reg_errcode_t diff --git a/gnulib b/gnulib -Subproject 6f37b9dd8977f231e79d7a69277ed8a43af9625 +Subproject 9a25aef6918949dd5c7f5e9209409db9aa5b145 diff --git a/tests/init.sh b/tests/init.sh index 5985552a..ae867144 100644 --- a/tests/init.sh +++ b/tests/init.sh @@ -255,7 +255,10 @@ compare_dev_null_ () return 2 } -if diff_out_=`exec 2>/dev/null; diff -u "$0" "$0" < /dev/null`; then +if diff_out_=`exec 2>/dev/null; diff -u "$0" "$0" < /dev/null` \ + && diff -u Makefile "$0" 2>/dev/null | grep '^[+]#!' >/dev/null; then + # diff accepts the -u option and does not (like AIX 7 'diff') produce an + # extra space on column 1 of every content line. if test -z "$diff_out_"; then compare_ () { diff -u "$@"; } else |