commit bash-20120216 snapshot

This commit is contained in:
Chet Ramey
2012-03-05 21:16:53 -05:00
parent 7f947b6872
commit 1f6ec1a86f
37 changed files with 27234 additions and 28 deletions
+3 -3
View File
@@ -1,6 +1,6 @@
/* evalstring.c - evaluate a string as one or more shell commands. */
/* Copyright (C) 1996-2010 Free Software Foundation, Inc.
/* Copyright (C) 1996-2012 Free Software Foundation, Inc.
This file is part of GNU Bash, the Bourne Again SHell.
@@ -308,7 +308,8 @@ parse_and_execute (string, from_file, flags)
command->value.Simple->words == 0 &&
command->value.Simple->redirects &&
command->value.Simple->redirects->next == 0 &&
command->value.Simple->redirects->instruction == r_input_direction)
command->value.Simple->redirects->instruction == r_input_direction &&
command->value.Simple->redirects->redirector.dest == 1)
{
int r;
r = cat_file (command->value.Simple->redirects);
@@ -317,7 +318,6 @@ parse_and_execute (string, from_file, flags)
else
last_result = execute_command_internal
(command, 0, NO_PIPE, NO_PIPE, bitmap);
dispose_command (command);
dispose_fd_bitmap (bitmap);
discard_unwind_frame ("pe_dispose");