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

Bash-4.3 patch 25

Browse source
This commit is contained in:
Chet Ramey 2014-09-25 08:45:07 -04:00
commit b64a0e1d0b
5 changed files with 22 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
builtins/common.h
View file

@ -33,6 +33,8 @@
#define SEVAL_RESETLINE 0x010 #define SEVAL_RESETLINE 0x010
#define SEVAL_PARSEONLY 0x020 #define SEVAL_PARSEONLY 0x020
#define SEVAL_NOLONGJMP 0x040 #define SEVAL_NOLONGJMP 0x040
#define SEVAL_FUNCDEF 0x080 /* only allow function definitions */
#define SEVAL_ONECMD 0x100 /* only allow a single command */
/* Flags for describe_command, shared between type.def and command.def */ /* Flags for describe_command, shared between type.def and command.def */
#define CDESC_ALL 0x001 /* type -a */ #define CDESC_ALL 0x001 /* type -a */

11
builtins/evalstring.c
View file

@ -308,6 +308,14 @@ parse_and_execute (string, from_file, flags)
{ {
struct fd_bitmap *bitmap; struct fd_bitmap *bitmap;
if ((flags & SEVAL_FUNCDEF) && command->type != cm_function_def)
{
internal_warning ("%s: ignoring function definition attempt", from_file);
should_jump_to_top_level = 0;
last_result = last_command_exit_value = EX_BADUSAGE;
break;
}
bitmap = new_fd_bitmap (FD_BITMAP_SIZE); bitmap = new_fd_bitmap (FD_BITMAP_SIZE);
begin_unwind_frame ("pe_dispose"); begin_unwind_frame ("pe_dispose");
add_unwind_protect (dispose_fd_bitmap, bitmap); add_unwind_protect (dispose_fd_bitmap, bitmap);
@ -368,6 +376,9 @@ parse_and_execute (string, from_file, flags)
dispose_command (command); dispose_command (command);
dispose_fd_bitmap (bitmap); dispose_fd_bitmap (bitmap);
discard_unwind_frame ("pe_dispose"); discard_unwind_frame ("pe_dispose");
if (flags & SEVAL_ONECMD)
break;
} }
} }
else else

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 24 #define PATCHLEVEL 25
#endif /* _PATCHLEVEL_H_ */ #endif /* _PATCHLEVEL_H_ */

4
subst.c
View file

@ -8047,7 +8047,9 @@ comsub:
goto return0; goto return0;
} }
else if (var = find_variable_last_nameref (temp1)) else if (var && (invisible_p (var) || var_isset (var) == 0))
temp = (char *)NULL;
else if ((var = find_variable_last_nameref (temp1)) && var_isset (var) && invisible_p (var) == 0)
{ {
temp = nameref_cell (var); temp = nameref_cell (var);
#if defined (ARRAY_VARS) #if defined (ARRAY_VARS)

16
variables.c
View file

@ -358,13 +358,11 @@ initialize_shell_variables (env, privmode)
temp_string[char_index] = ' '; temp_string[char_index] = ' ';
strcpy (temp_string + char_index + 1, string); strcpy (temp_string + char_index + 1, string);
if (posixly_correct == 0 || legal_identifier (name)) /* Don't import function names that are invalid identifiers from the
parse_and_execute (temp_string, name, SEVAL_NONINT|SEVAL_NOHIST); environment, though we still allow them to be defined as shell
variables. */
/* Ancient backwards compatibility. Old versions of bash exported if (legal_identifier (name))
functions like name()=() {...} */ parse_and_execute (temp_string, name, SEVAL_NONINT|SEVAL_NOHIST|SEVAL_FUNCDEF|SEVAL_ONECMD);
if (name[char_index - 1] == ')' && name[char_index - 2] == '(')
name[char_index - 2] = '\0';
if (temp_var = find_function (name)) if (temp_var = find_function (name))
{ {
@ -381,10 +379,6 @@ initialize_shell_variables (env, privmode)
last_command_exit_value = 1; last_command_exit_value = 1;
report_error (_("error importing function definition for `%s'"), name); report_error (_("error importing function definition for `%s'"), name);
} }
/* ( */
if (name[char_index - 1] == ')' && name[char_index - 2] == '\0')
name[char_index - 2] = '('; /* ) */
} }
#if defined (ARRAY_VARS) #if defined (ARRAY_VARS)
# if ARRAY_EXPORT # if ARRAY_EXPORT