/* make_cmd.c -- Functions for making instances of the various
parser constructs. */
-/* Copyright (C) 1989-2003 Free Software Foundation, Inc.
+/* Copyright (C) 1989-2009 Free Software Foundation, Inc.
-This file is part of GNU Bash, the Bourne Again SHell.
+ This file is part of GNU Bash, the Bourne Again SHell.
-Bash is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free
-Software Foundation; either version 2, or (at your option) any later
-version.
+ Bash is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
-Bash is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-for more details.
+ Bash is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
-You should have received a copy of the GNU General Public License along
-with Bash; see the file COPYING. If not, write to the Free Software
-Foundation, 59 Temple Place, Suite 330, Boston, MA 02111 USA. */
+ You should have received a copy of the GNU General Public License
+ along with Bash. If not, see <http://www.gnu.org/licenses/>.
+*/
#include "config.h"
#include "bashintl.h"
+#include "parser.h"
#include "syntax.h"
#include "command.h"
#include "general.h"
#include "shmbutil.h"
-extern int line_number, current_command_line_count;
+extern int line_number, current_command_line_count, parser_state;
extern int last_command_exit_value;
+extern int shell_initialized;
+
+int here_doc_first_line = 0;
/* Object caching */
sh_obj_cache_t wdcache = {0, 0, 0};
sh_obj_cache_t wlcache = {0, 0, 0};
-#define WDCACHESIZE 60
-#define WLCACHESIZE 60
+#define WDCACHESIZE 128
+#define WLCACHESIZE 128
static COMMAND *make_for_or_select __P((enum command_type, WORD_DESC *, WORD_LIST *, COMMAND *, int));
#if defined (ARITH_FOR_COMMAND)
ocache_create (wlcache, WORD_LIST, WLCACHESIZE);
}
+WORD_DESC *
+alloc_word_desc ()
+{
+ WORD_DESC *temp;
+
+ ocache_alloc (wdcache, WORD_DESC, temp);
+ temp->flags = 0;
+ temp->word = 0;
+ return temp;
+}
+
WORD_DESC *
make_bare_word (string)
const char *string;
{
WORD_DESC *temp;
-#if 0
- temp = (WORD_DESC *)xmalloc (sizeof (WORD_DESC));
-#else
- ocache_alloc (wdcache, WORD_DESC, temp);
-#endif
+
+ temp = alloc_word_desc ();
if (*string)
temp->word = savestring (string);
temp->word[0] = '\0';
}
- temp->flags = 0;
return (temp);
}
{
WORD_LIST *temp;
-#if 0
- temp = (WORD_LIST *)xmalloc (sizeof (WORD_LIST));
-#else
ocache_alloc (wlcache, WORD_LIST, temp);
-#endif
+
temp->word = word;
temp->next = wlink;
return (temp);
if (s == 0 || *s == '\0')
return ((WORD_LIST *)NULL);
wd = make_word (s);
- wd->flags |= W_NOGLOB|W_NOSPLIT|W_QUOTED; /* no word splitting or globbing */
+ wd->flags |= W_NOGLOB|W_NOSPLIT|W_QUOTED|W_DQUOTE; /* no word splitting or globbing */
+#if defined (PROCESS_SUBSTITUTION)
+ wd->flags |= W_NOPROCSUB; /* no process substitution */
+#endif
result = make_word_list (wd, (WORD_LIST *)NULL);
return result;
}
ARITH_FOR_COM *temp;
WORD_LIST *init, *test, *step;
char *s, *t, *start;
- int nsemi;
+ int nsemi, i;
init = test = step = (WORD_LIST *)NULL;
/* Parse the string into the three component sub-expressions. */
s++;
start = s;
/* skip to the semicolon or EOS */
- while (*s && *s != ';')
- s++;
+ i = skip_to_delim (start, 0, ";", SD_NOJMP|SD_NOPROCSUB);
+ s = start + i;
- t = (s > start) ? substring (start, 0, s - start) : (char *)NULL;
+ t = (i > 0) ? substring (start, 0, i) : (char *)NULL;
nsemi++;
switch (nsemi)
else
parser_error (lineno, _("syntax error: `;' unexpected"));
parser_error (lineno, _("syntax error: `((%s))'"), exprs->word->word);
+ free (init);
+ free (test);
+ free (step);
last_command_exit_value = 2;
return ((COMMAND *)NULL);
}
make_case_command (word, clauses, lineno)
WORD_DESC *word;
PATTERN_LIST *clauses;
+ int lineno;
{
CASE_COM *temp;
temp->patterns = REVERSE_LIST (patterns, WORD_LIST *);
temp->action = action;
temp->next = NULL;
+ temp->flags = 0;
return (temp);
}
/* If we are starting from scratch, then make the initial command
structure. Also note that we have to fill in all the slots, since
malloc doesn't return zeroed space. */
- if (!command)
- command = make_bare_simple_command ();
+ if (command == 0)
+ {
+ command = make_bare_simple_command ();
+ parser_state |= PST_REDIRLIST;
+ }
if (element.word)
- command->value.Simple->words = make_word_list (element.word, command->value.Simple->words);
+ {
+ command->value.Simple->words = make_word_list (element.word, command->value.Simple->words);
+ parser_state &= ~PST_REDIRLIST;
+ }
else if (element.redirect)
{
REDIRECT *r = element.redirect;
r->next = command->value.Simple->redirects;
command->value.Simple->redirects = element.redirect;
}
+
return (command);
}
the redirectee.word with the new input text. If <<- is on,
then remove leading TABS from each line. */
void
-make_here_document (temp)
+make_here_document (temp, lineno)
REDIRECT *temp;
+ int lineno;
{
int kill_leading, redir_len;
char *redir_word, *document, *full_line;
register char *line;
int len;
+ here_doc_first_line = 0;
line = full_line;
line_number++;
+ /* If set -v is in effect, echo the line read. read_secondary_line/
+ read_a_line leaves the newline at the end, so don't print another. */
+ if (echo_input_at_read)
+ fprintf (stderr, "%s", line);
+
if (kill_leading && *line)
{
/* Hack: To be compatible with some Bourne shells, we
document_index += len;
}
+ if (full_line == 0)
+ internal_warning (_("here-document at line %d delimited by end-of-file (wanted `%s')"), lineno, redir_word);
+
document_done:
if (document)
document[document_index] = '\0';
document[0] = '\0';
}
temp->redirectee.filename->word = document;
+ here_doc_first_line = 0;
}
/* Generate a REDIRECT from SOURCE, DEST, and INSTRUCTION.
INSTRUCTION is the instruction type, SOURCE is a file descriptor,
and DEST is a file descriptor or a WORD_DESC *. */
REDIRECT *
-make_redirection (source, instruction, dest_and_filename)
- int source;
+make_redirection (source, instruction, dest_and_filename, flags)
+ REDIRECTEE source;
enum r_instruction instruction;
REDIRECTEE dest_and_filename;
+ int flags;
{
REDIRECT *temp;
WORD_DESC *w;
/* First do the common cases. */
temp->redirector = source;
temp->redirectee = dest_and_filename;
+ temp->here_doc_eof = 0;
temp->instruction = instruction;
temp->flags = 0;
+ temp->rflags = flags;
temp->next = (REDIRECT *)NULL;
switch (instruction)
case r_output_direction: /* >foo */
case r_output_force: /* >| foo */
- case r_err_and_out: /* command &>filename */
+ case r_err_and_out: /* &>filename */
temp->flags = O_TRUNC | O_WRONLY | O_CREAT;
break;
case r_appending_to: /* >>foo */
+ case r_append_err_and_out: /* &>> filename */
temp->flags = O_APPEND | O_WRONLY | O_CREAT;
break;
#if defined (ARRAY_VARS)
SHELL_VAR *bash_source_v;
ARRAY *bash_source_a;
- char *t;
#endif
temp = (FUNCTION_DEF *)xmalloc (sizeof (FUNCTION_DEF));
if (bash_source_a && array_num_elements (bash_source_a) > 0)
temp->source_file = array_reference (bash_source_a, 0);
#endif
+ /* Assume that shell functions without a source file before the shell is
+ initialized come from the environment. Otherwise default to "main"
+ (usually functions being defined interactively) */
+ if (temp->source_file == 0)
+ temp->source_file = shell_initialized ? "main" : "environment";
+
+#if defined (DEBUGGER)
bind_function_def (name->word, temp);
+#endif
+
+ temp->source_file = temp->source_file ? savestring (temp->source_file) : 0;
- temp->source_file = 0;
return (make_command (cm_function_def, (SIMPLE_COM *)temp));
}
return (make_command (cm_subshell, (SIMPLE_COM *)temp));
}
+COMMAND *
+make_coproc_command (name, command)
+ char *name;
+ COMMAND *command;
+{
+ COPROC_COM *temp;
+
+ temp = (COPROC_COM *)xmalloc (sizeof (COPROC_COM));
+ temp->name = savestring (name);
+ temp->command = command;
+ temp->flags = CMD_WANT_SUBSHELL|CMD_COPROC_SUBSHELL;
+ return (make_command (cm_coproc, (SIMPLE_COM *)temp));
+}
+
/* Reverse the word list and redirection list in the simple command
has just been parsed. It seems simpler to do this here the one
time then by any other method that I can think of. */
REVERSE_LIST (command->value.Simple->redirects, REDIRECT *);
}
+ parser_state &= ~PST_REDIRLIST;
return (command);
}
projects / thirdparty / bash.git / blobdiff