diff options
author | Jari Aalto <jari.aalto@cante.net> | 1997-06-05 14:59:13 +0000 |
---|---|---|
committer | Jari Aalto <jari.aalto@cante.net> | 2009-09-12 16:46:50 +0000 |
commit | d166f048818e10cf3799aa24a174fb22835f1acc (patch) | |
tree | 1ca27f9243900f8b236d0cde6a3862002aea9e19 /make_cmd.c | |
parent | ccc6cda312fea9f0468ee65b8f368e9653e1380b (diff) | |
download | bash-d166f048818e10cf3799aa24a174fb22835f1acc.tar.gz |
Imported from ../bash-2.01.tar.gz.
Diffstat (limited to 'make_cmd.c')
-rw-r--r-- | make_cmd.c | 31 |
1 files changed, 14 insertions, 17 deletions
@@ -100,6 +100,7 @@ make_word (string) return (make_word_flags (temp, string)); } +#ifdef INCLUDE_UNUSED WORD_DESC * make_word_from_token (token) int token; @@ -111,6 +112,7 @@ make_word_from_token (token) return (make_word (tokenizer)); } +#endif WORD_LIST * make_word_list (word, link) @@ -466,24 +468,27 @@ make_redirection (source, instruction, dest_and_filename) switch (instruction) { - case r_output_direction: /* >foo */ - case r_output_force: /* >| foo */ + case r_output_direction: /* >foo */ + case r_output_force: /* >| foo */ + case r_err_and_out: /* command &>filename */ temp->flags = O_TRUNC | O_WRONLY | O_CREAT; break; - case r_input_direction: /* <foo */ - case r_inputa_direction: /* foo & makes this. */ - temp->flags = O_RDONLY; + case r_appending_to: /* >>foo */ + temp->flags = O_APPEND | O_WRONLY | O_CREAT; break; - case r_appending_to: /* >>foo */ - temp->flags = O_APPEND | O_WRONLY | O_CREAT; + case r_input_direction: /* <foo */ + case r_inputa_direction: /* foo & makes this. */ + temp->flags = O_RDONLY; break; - case r_deblank_reading_until: /* <<-foo */ - case r_reading_until: /* << foo */ + case r_input_output: /* <>foo */ + temp->flags = O_RDWR | O_CREAT; break; + case r_deblank_reading_until: /* <<-foo */ + case r_reading_until: /* << foo */ case r_close_this: /* <&- */ case r_duplicating_input: /* 1<&2 */ case r_duplicating_output: /* 1>&2 */ @@ -491,14 +496,6 @@ make_redirection (source, instruction, dest_and_filename) case r_duplicating_output_word: /* 1>&$foo */ break; - case r_err_and_out: /* command &>filename */ - temp->flags = O_TRUNC | O_WRONLY | O_CREAT; - break; - - case r_input_output: - temp->flags = O_RDWR | O_CREAT; - break; - default: programming_error ("make_redirection: redirection instruction `%d' out of range", instruction); abort (); |