aboutsummaryrefslogtreecommitdiffstats
path: root/builtins/evalstring.c
diff options
context:
space:
mode:
authorChet Ramey <chet.ramey@case.edu>2014-09-25 08:45:07 -0400
committerChet Ramey <chet.ramey@case.edu>2014-09-25 08:45:07 -0400
commitb64a0e1d0b412cedda763a32d6e5cd6927333f02 (patch)
tree8f329c41d473d69fb4a7f36042892a15a2b50a7e /builtins/evalstring.c
parent1a1f8b54fb29c2af275253f35a7fcf79815222d5 (diff)
downloadandroid_external_bash-b64a0e1d0b412cedda763a32d6e5cd6927333f02.tar.gz
android_external_bash-b64a0e1d0b412cedda763a32d6e5cd6927333f02.tar.bz2
android_external_bash-b64a0e1d0b412cedda763a32d6e5cd6927333f02.zip
Bash-4.3 patch 25
Diffstat (limited to 'builtins/evalstring.c')
-rw-r--r--builtins/evalstring.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/builtins/evalstring.c b/builtins/evalstring.c
index ce5b4d6..21937ba 100644
--- a/builtins/evalstring.c
+++ b/builtins/evalstring.c
@@ -308,6 +308,14 @@ parse_and_execute (string, from_file, flags)
{
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);
begin_unwind_frame ("pe_dispose");
add_unwind_protect (dispose_fd_bitmap, bitmap);
@@ -368,6 +376,9 @@ parse_and_execute (string, from_file, flags)
dispose_command (command);
dispose_fd_bitmap (bitmap);
discard_unwind_frame ("pe_dispose");
+
+ if (flags & SEVAL_ONECMD)
+ break;
}
}
else