package/bash/bash44-002.patch

   1 From https://ftp.gnu.org/gnu/bash/bash-4.4-patches/bash44-002
   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-002
  10
  11 Bug-Reported-by:        Eric Pruitt <eric.pruitt@gmail.com>
  12 Bug-Reference-ID:       <20160916055120.GA28272@sinister.codevat.com>
  13 Bug-Reference-URL:      http://lists.gnu.org/archive/html/bug-bash/2016-09/msg00015.html
  14
  15 Bug-Description:
  16
  17 Bash-4.4 warns when discarding NUL bytes in command substitution output
  18 instead of silently dropping them.  This patch changes the warnings from
  19 one per NUL byte encountered to one warning per command substitution.
  20
  21 Patch (apply with `patch -p0'):
  22
  23 *** a/bash-4.4/subst.c  2016-08-30 16:46:38.000000000 -0400
  24 --- b/subst.c   2016-09-26 10:20:19.000000000 -0400
  25 ***************
  26 *** 5932,5935 ****
  27 --- 5933,5937 ----
  28     int istring_index, istring_size, c, tflag, skip_ctlesc, skip_ctlnul;
  29     ssize_t bufn;
  30 +   int nullbyte;
  31
  32     istring = (char *)NULL;
  33 ***************
  34 *** 5939,5942 ****
  35 --- 5941,5946 ----
  36       skip_ctlesc |= *s == CTLESC, skip_ctlnul |= *s == CTLNUL;
  37
  38 +   nullbyte = 0;
  39 +
  40     /* Read the output of the command through the pipe.  This may need to be
  41        changed to understand multibyte characters in the future. */
  42 ***************
  43 *** 5957,5961 ****
  44         {
  45   #if 1
  46 !         internal_warning ("%s", _("command substitution: ignored null byte in input"));
  47   #endif
  48           continue;
  49 --- 5961,5969 ----
  50         {
  51   #if 1
  52 !         if (nullbyte == 0)
  53 !           {
  54 !             internal_warning ("%s", _("command substitution: ignored null byte in input"));
  55 !             nullbyte = 1;
  56 !           }
  57   #endif
  58           continue;
  59 *** a/bash-4.4/patchlevel.h     2016-06-22 14:51:03.000000000 -0400
  60 --- b/patchlevel.h      2016-10-01 11:01:28.000000000 -0400
  61 ***************
  62 *** 26,30 ****
  63      looks for to find the patch level (for the sccs version string). */
  64
  65 ! #define PATCHLEVEL 1
  66
  67   #endif /* _PATCHLEVEL_H_ */
  68 --- 26,30 ----
  69      looks for to find the patch level (for the sccs version string). */
  70
  71 ! #define PATCHLEVEL 2
  72
  73   #endif /* _PATCHLEVEL_H_ */