diff options
| author | Jari Aalto <jari.aalto@cante.net> | 2001-11-13 17:56:06 +0000 |
|---|---|---|
| committer | Jari Aalto <jari.aalto@cante.net> | 2009-09-12 16:46:54 +0000 |
| commit | f73dda092b33638d2d5e9c35375f687a607b5403 (patch) | |
| tree | f21584e70a444d6a1ecba0fb5e2cf79e8cce91db /builtins/evalstring.c | |
| parent | 28ef6c316f1aff914bb95ac09787a3c83c1815fd (diff) | |
| download | android_external_bash-f73dda092b33638d2d5e9c35375f687a607b5403.tar.gz android_external_bash-f73dda092b33638d2d5e9c35375f687a607b5403.tar.bz2 android_external_bash-f73dda092b33638d2d5e9c35375f687a607b5403.zip | |
Imported from ../bash-2.05a.tar.gz.
Diffstat (limited to 'builtins/evalstring.c')
| -rw-r--r-- | builtins/evalstring.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/builtins/evalstring.c b/builtins/evalstring.c index 21e4772..b164e74 100644 --- a/builtins/evalstring.c +++ b/builtins/evalstring.c @@ -40,6 +40,7 @@ #include "../input.h" #include "../execute_cmd.h" #include "../redir.h" +#include "../trap.h" #if defined (HISTORY) # include "../bashhist.h" @@ -53,20 +54,15 @@ extern int errno; #define IS_BUILTIN(s) (builtin_address_internal(s, 0) != (struct builtin *)NULL) -extern void run_trap_cleanup (); -extern int zwrite (); - -extern int interactive, interactive_shell; extern int indirection_level, startup_state, subshell_environment; extern int line_number; extern int last_command_exit_value; extern int running_trap; extern int posixly_correct; -extern COMMAND *global_command; int parse_and_execute_level = 0; -static int cat_file (); +static int cat_file __P((REDIRECT *)); /* How to force parse_and_execute () to clean up after itself. */ void @@ -92,7 +88,7 @@ parse_and_execute_cleanup () int parse_and_execute (string, from_file, flags) char *string; - char *from_file; + const char *from_file; int flags; { int code, x; @@ -297,7 +293,8 @@ cat_file (r) REDIRECT *r; { char lbuf[128], *fn; - int nr, fd, rval; + int fd, rval; + ssize_t nr; if (r->instruction != r_input_direction) return -1; @@ -344,5 +341,5 @@ cat_file (r) free (fn); close (fd); - return (0); + return (rval); } |