package/bash/bash44-012.patch

   1 From https://ftp.gnu.org/gnu/bash/bash-4.4-patches/bash44-012
   2
   3 Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
   4
   5                              BASH PATCH REPORT
   6                              =================
   7
   8 Bash-Release:   4.4
   9 Patch-ID:       bash44-012
  10
  11 Bug-Reported-by:        Clark Wang <dearvoid@gmail.com>
  12 Bug-Reference-ID:       <CADv8-ojttPUFOZXqbjsvy83LfaJtQKZ5qejGdF6j0VJ3vtrYOA@mail.gmail.com>
  13 Bug-Reference-URL:      http://lists.gnu.org/archive/html/bug-bash/2016-11/msg00106.html
  14
  15 Bug-Description:
  16
  17 When -N is used, the input is not supposed to be split using $IFS, but
  18 leading and trailing IFS whitespace was still removed.
  19
  20 Patch (apply with `patch -p0'):
  21
  22 *** bash-4.4-patched/subst.c    2017-01-20 14:22:01.000000000 -0500
  23 --- b/subst.c   2017-01-25 13:43:22.000000000 -0500
  24 ***************
  25 *** 2826,2834 ****
  26   /* Parse a single word from STRING, using SEPARATORS to separate fields.
  27      ENDPTR is set to the first character after the word.  This is used by
  28 !    the `read' builtin.  This is never called with SEPARATORS != $IFS;
  29 !    it should be simplified.
  30
  31      XXX - this function is very similar to list_string; they should be
  32          combined - XXX */
  33   char *
  34   get_word_from_string (stringp, separators, endptr)
  35 --- b/2826,2838 ----
  36   /* Parse a single word from STRING, using SEPARATORS to separate fields.
  37      ENDPTR is set to the first character after the word.  This is used by
  38 !    the `read' builtin.
  39 !
  40 !    This is never called with SEPARATORS != $IFS, and takes advantage of that.
  41
  42      XXX - this function is very similar to list_string; they should be
  43          combined - XXX */
  44 +
  45 + #define islocalsep(c) (local_cmap[(unsigned char)(c)] != 0)
  46 +
  47   char *
  48   get_word_from_string (stringp, separators, endptr)
  49 ***************
  50 *** 2838,2841 ****
  51 --- b/2842,2846 ----
  52     char *current_word;
  53     int sindex, sh_style_split, whitesep, xflags;
  54 +   unsigned char local_cmap[UCHAR_MAX+1];      /* really only need single-byte chars here */
  55     size_t slen;
  56
  57 ***************
  58 *** 2847,2854 ****
  59                                  separators[2] == '\n' &&
  60                                  separators[3] == '\0';
  61 !   for (xflags = 0, s = ifs_value; s && *s; s++)
  62       {
  63         if (*s == CTLESC) xflags |= SX_NOCTLESC;
  64         if (*s == CTLNUL) xflags |= SX_NOESCCTLNUL;
  65       }
  66
  67 --- b/2852,2861 ----
  68                                  separators[2] == '\n' &&
  69                                  separators[3] == '\0';
  70 !   memset (local_cmap, '\0', sizeof (local_cmap));
  71 !   for (xflags = 0, s = separators; s && *s; s++)
  72       {
  73         if (*s == CTLESC) xflags |= SX_NOCTLESC;
  74         if (*s == CTLNUL) xflags |= SX_NOESCCTLNUL;
  75 +       local_cmap[(unsigned char)*s] = 1;      /* local charmap of separators */
  76       }
  77
  78 ***************
  79 *** 2857,2864 ****
  80
  81     /* Remove sequences of whitespace at the beginning of STRING, as
  82 !      long as those characters appear in IFS. */
  83 !   if (sh_style_split || !separators || !*separators)
  84       {
  85 !       for (; *s && spctabnl (*s) && isifs (*s); s++);
  86
  87         /* If the string is nothing but whitespace, update it and return. */
  88 --- b/2864,2872 ----
  89
  90     /* Remove sequences of whitespace at the beginning of STRING, as
  91 !      long as those characters appear in SEPARATORS.  This happens if
  92 !      SEPARATORS == $' \t\n' or if IFS is unset. */
  93 !   if (sh_style_split || separators == 0)
  94       {
  95 !       for (; *s && spctabnl (*s) && islocalsep (*s); s++);
  96
  97         /* If the string is nothing but whitespace, update it and return. */
  98 ***************
  99 *** 2879,2885 ****
 100        This obeys the field splitting rules in Posix.2. */
 101     sindex = 0;
 102 !   /* Don't need string length in ADVANCE_CHAR or string_extract_verbatim
 103 !      unless multibyte chars are possible. */
 104 !   slen = (MB_CUR_MAX > 1) ? STRLEN (s) : 1;
 105     current_word = string_extract_verbatim (s, slen, &sindex, separators, xflags);
 106
 107 --- b/2887,2893 ----
 108        This obeys the field splitting rules in Posix.2. */
 109     sindex = 0;
 110 !   /* Don't need string length in ADVANCE_CHAR unless multibyte chars are
 111 !      possible, but need it in string_extract_verbatim for bounds checking */
 112 !   slen = STRLEN (s);
 113     current_word = string_extract_verbatim (s, slen, &sindex, separators, xflags);
 114
 115 ***************
 116 *** 2900,2904 ****
 117     /* Now skip sequences of space, tab, or newline characters if they are
 118        in the list of separators. */
 119 !   while (s[sindex] && spctabnl (s[sindex]) && isifs (s[sindex]))
 120       sindex++;
 121
 122 --- b/2908,2912 ----
 123     /* Now skip sequences of space, tab, or newline characters if they are
 124        in the list of separators. */
 125 !   while (s[sindex] && spctabnl (s[sindex]) && islocalsep (s[sindex]))
 126       sindex++;
 127
 128 ***************
 129 *** 2907,2916 ****
 130        delimiter, not a separate delimiter that would result in an empty field.
 131        Look at POSIX.2, 3.6.5, (3)(b). */
 132 !   if (s[sindex] && whitesep && isifs (s[sindex]) && !spctabnl (s[sindex]))
 133       {
 134         sindex++;
 135         /* An IFS character that is not IFS white space, along with any adjacent
 136          IFS white space, shall delimit a field. */
 137 !       while (s[sindex] && spctabnl (s[sindex]) && isifs (s[sindex]))
 138         sindex++;
 139       }
 140 --- b/2915,2924 ----
 141        delimiter, not a separate delimiter that would result in an empty field.
 142        Look at POSIX.2, 3.6.5, (3)(b). */
 143 !   if (s[sindex] && whitesep && islocalsep (s[sindex]) && !spctabnl (s[sindex]))
 144       {
 145         sindex++;
 146         /* An IFS character that is not IFS white space, along with any adjacent
 147          IFS white space, shall delimit a field. */
 148 !       while (s[sindex] && spctabnl (s[sindex]) && islocalsep(s[sindex]))
 149         sindex++;
 150       }
 151 *** bash-4.4/patchlevel.h       2016-06-22 14:51:03.000000000 -0400
 152 --- b/patchlevel.h      2016-10-01 11:01:28.000000000 -0400
 153 ***************
 154 *** 26,30 ****
 155      looks for to find the patch level (for the sccs version string). */
 156
 157 ! #define PATCHLEVEL 11
 158
 159   #endif /* _PATCHLEVEL_H_ */
 160 --- b/26,30 ----
 161      looks for to find the patch level (for the sccs version string). */
 162
 163 ! #define PATCHLEVEL 12
 164
 165   #endif /* _PATCHLEVEL_H_ */