dmbcs/i-bash
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Bash-4.4 patch 2

Browse source
This commit is contained in:
Chet Ramey 2016-11-14 14:27:06 -05:00
commit 280bd77d8d
2 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
patchlevel.h
View file

@ -25,6 +25,6 @@
regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh
looks for to find the patch level (for the sccs version string). */ looks for to find the patch level (for the sccs version string). */
#define PATCHLEVEL 1 #define PATCHLEVEL 2
#endif /* _PATCHLEVEL_H_ */ #endif /* _PATCHLEVEL_H_ */

9
subst.c
View file

@ -5931,6 +5931,7 @@ read_comsub (fd, quoted, rflag)
char *istring, buf[128], *bufp, *s; char *istring, buf[128], *bufp, *s;
int istring_index, istring_size, c, tflag, skip_ctlesc, skip_ctlnul; int istring_index, istring_size, c, tflag, skip_ctlesc, skip_ctlnul;
ssize_t bufn; ssize_t bufn;
int nullbyte;
istring = (char *)NULL; istring = (char *)NULL;
istring_index = istring_size = bufn = tflag = 0; istring_index = istring_size = bufn = tflag = 0;
@ -5938,6 +5939,8 @@ read_comsub (fd, quoted, rflag)
for (skip_ctlesc = skip_ctlnul = 0, s = ifs_value; s && *s; s++) for (skip_ctlesc = skip_ctlnul = 0, s = ifs_value; s && *s; s++)
skip_ctlesc |= *s == CTLESC, skip_ctlnul |= *s == CTLNUL; skip_ctlesc |= *s == CTLESC, skip_ctlnul |= *s == CTLNUL;
nullbyte = 0;
/* Read the output of the command through the pipe. This may need to be /* Read the output of the command through the pipe. This may need to be
changed to understand multibyte characters in the future. */ changed to understand multibyte characters in the future. */
while (1) while (1)
@ -5956,7 +5959,11 @@ read_comsub (fd, quoted, rflag)
if (c == 0) if (c == 0)
{ {
#if 1 #if 1
internal_warning ("%s", _("command substitution: ignored null byte in input")); if (nullbyte == 0)
{
internal_warning ("%s", _("command substitution: ignored null byte in input"));
nullbyte = 1;
}
#endif #endif
continue; continue;
} }