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

Bash-4.2 patch 35

Browse source
This commit is contained in:
Chet Ramey 2012-07-10 09:44:43 -04:00
commit 8e9dc91799
2 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

13
builtins/mapfile.def
View file

@ -195,13 +195,9 @@ mapfile (fd, line_count_goal, origin, nskip, callback_quantum, callback, array_n
/* Reset the buffer for bash own stream */ /* Reset the buffer for bash own stream */
interrupt_immediately++; interrupt_immediately++;
for (array_index = origin, line_count = 1; for (array_index = origin, line_count = 1;
zgetline (fd, &line, &line_length, unbuffered_read) != -1; zgetline (fd, &line, &line_length, unbuffered_read) != -1;
array_index++, line_count++) array_index++)
{ {
/* Have we exceeded # of lines to store? */
if (line_count_goal != 0 && line_count > line_count_goal)
break;
/* Remove trailing newlines? */ /* Remove trailing newlines? */
if (flags & MAPF_CHOP) if (flags & MAPF_CHOP)
do_chop (line); do_chop (line);
@ -217,6 +213,11 @@ mapfile (fd, line_count_goal, origin, nskip, callback_quantum, callback, array_n
} }
bind_array_element (entry, array_index, line, 0); bind_array_element (entry, array_index, line, 0);
/* Have we exceeded # of lines to store? */
line_count++;
if (line_count_goal != 0 && line_count > line_count_goal)
break;
} }
xfree (line); xfree (line);

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 34 #define PATCHLEVEL 35
#endif /* _PATCHLEVEL_H_ */ #endif /* _PATCHLEVEL_H_ */