diff options
Diffstat (limited to 'subst.c')
| -rw-r--r-- | subst.c | 1596 |
1 files changed, 1263 insertions, 333 deletions
@@ -4,30 +4,32 @@ /* ``Have a little faith, there's magic in the night. You ain't a beauty, but, hey, you're alright.'' */ -/* Copyright (C) 1987-2006 Free Software Foundation, Inc. +/* Copyright (C) 1987-2009 Free Software Foundation, Inc. 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 "bashtypes.h" #include <stdio.h> #include "chartypes.h" -#include <pwd.h> +#if defined (HAVE_PWD_H) +# include <pwd.h> +#endif #include <signal.h> #include <errno.h> @@ -53,6 +55,8 @@ #include "builtins/getopt.h" #include "builtins/common.h" +#include "builtins/builtext.h" + #include <tilde/tilde.h> #include <glob/strmatch.h> @@ -69,6 +73,7 @@ extern int errno; #define VT_POSPARMS 1 #define VT_ARRAYVAR 2 #define VT_ARRAYMEMBER 3 +#define VT_ASSOCVAR 4 #define VT_STARSUB 128 /* $* or ${array[*]} -- used to split */ @@ -78,14 +83,10 @@ extern int errno; #define ST_SQUOTE 0x04 /* unused yet */ #define ST_DQUOTE 0x08 /* unused yet */ -/* Flags for the string extraction functions. */ -#define EX_NOALLOC 0x01 /* just skip; don't return substring */ -#define EX_VARNAME 0x02 /* variable name; for string_extract () */ -#define EX_REQMATCH 0x04 /* closing/matching delimiter required */ -#define EX_COMMAND 0x08 /* extracting a shell script/command */ - /* Flags for the `pflags' argument to param_expand() */ #define PF_NOCOMSUB 0x01 /* Do not perform command substitution */ +#define PF_IGNUNBOUND 0x02 /* ignore unbound vars even if -u set */ +#define PF_NOSPLIT2 0x04 /* same as W_NOSPLIT2 */ /* These defs make it easier to use the editor. */ #define LBRACE '{' @@ -93,6 +94,11 @@ extern int errno; #define LPAREN '(' #define RPAREN ')' +#if defined (HANDLE_MULTIBYTE) +#define WLPAREN L'(' +#define WRPAREN L')' +#endif + /* Evaluates to 1 if C is one of the shell's special parameters whose length can be taken, but is also one of the special expansion characters. */ #define VALID_SPECIAL_LENGTH_PARAM(c) \ @@ -134,10 +140,20 @@ size_t ifs_firstc_len; unsigned char ifs_firstc; #endif +/* Sentinel to tell when we are performing variable assignments preceding a + command name and putting them into the environment. Used to make sure + we use the temporary environment when looking up variable values. */ +int assigning_in_environment; + +/* Used to hold a list of variable assignments preceding a command. Global + so the SIGCHLD handler in jobs.c can unwind-protect it when it runs a + SIGCHLD trap and so it can be saved and restored by the trap handlers. */ +WORD_LIST *subst_assign_varlist = (WORD_LIST *)NULL; + /* Extern functions and variables from different files. */ extern int last_command_exit_value, last_command_exit_signal; -extern int subshell_environment; -extern int subshell_level; +extern int subshell_environment, line_number; +extern int subshell_level, parse_and_execute_level, sourcelevel; extern int eof_encountered; extern int return_catch_flag, return_catch_value; extern pid_t dollar_dollar_pid; @@ -181,11 +197,6 @@ static int no_longjmp_on_fatal_error = 0; $* on $IFS, primarily when doing assignment statements. */ static int expand_no_split_dollar_star = 0; -/* Used to hold a list of variable assignments preceding a command. Global - so the SIGCHLD handler in jobs.c can unwind-protect it when it runs a - SIGCHLD trap. */ -WORD_LIST *subst_assign_varlist = (WORD_LIST *)NULL; - /* A WORD_LIST of words to be expanded by expand_word_list_internal, without any leading variable assignments. */ static WORD_LIST *garglist = (WORD_LIST *)NULL; @@ -202,11 +213,8 @@ static WORD_LIST *expand_string_leave_quoted __P((char *, int)); static WORD_LIST *expand_string_for_rhs __P((char *, int, int *, int *)); static WORD_LIST *list_quote_escapes __P((WORD_LIST *)); -static char *dequote_escapes __P((char *)); static char *make_quoted_char __P((int)); static WORD_LIST *quote_list __P((WORD_LIST *)); -static char *remove_quoted_escapes __P((char *)); -static char *remove_quoted_nulls __P((char *)); static int unquoted_substring __P((char *, char *)); static int unquoted_member __P((int, char *)); @@ -216,7 +224,7 @@ static SHELL_VAR *do_compound_assignment __P((char *, char *, int)); #endif static int do_assignment_internal __P((const WORD_DESC *, int)); -static char *string_extract_verbatim __P((char *, size_t, int *, char *)); +static char *string_extract_verbatim __P((char *, size_t, int *, char *, int)); static char *string_extract __P((char *, int *, char *, int)); static char *string_extract_double_quoted __P((char *, int *, int)); static inline char *string_extract_single_quoted __P((char *, int *)); @@ -224,6 +232,7 @@ static inline int skip_single_quoted __P((const char *, size_t, int)); static int skip_double_quoted __P((char *, size_t, int)); static char *extract_delimited_string __P((char *, int *, char *, char *, char *, int)); static char *extract_dollar_brace_string __P((char *, int *, int, int)); +static int skip_matched_pair __P((const char *, int, int, int, int)); static char *pos_params __P((char *, int, int, int)); @@ -248,13 +257,13 @@ static char *variable_remove_pattern __P((char *, char *, int, int)); static char *list_remove_pattern __P((WORD_LIST *, char *, int, int, int)); static char *parameter_list_remove_pattern __P((int, char *, int, int)); #ifdef ARRAY_VARS -static char *array_remove_pattern __P((ARRAY *, char *, int, char *, int)); +static char *array_remove_pattern __P((SHELL_VAR *, char *, int, char *, int)); #endif static char *parameter_brace_remove_pattern __P((char *, char *, char *, int, int)); static char *process_substitute __P((char *, int)); -static char *read_comsub __P((int, int)); +static char *read_comsub __P((int, int, int *)); #ifdef ARRAY_VARS static arrayind_t array_length_reference __P((char *)); @@ -264,7 +273,7 @@ static int valid_brace_expansion_word __P((char *, int)); static int chk_atstar __P((char *, int, int *, int *)); static int chk_arithsub __P((const char *, int)); -static WORD_DESC *parameter_brace_expand_word __P((char *, int, int)); +static WORD_DESC *parameter_brace_expand_word __P((char *, int, int, int)); static WORD_DESC *parameter_brace_expand_indir __P((char *, int, int, int *, int *)); static WORD_DESC *parameter_brace_expand_rhs __P((char *, char *, int, int, int *, int *)); static void parameter_brace_expand_error __P((char *, char *)); @@ -273,7 +282,7 @@ static int valid_length_expression __P((char *)); static intmax_t parameter_brace_expand_length __P((char *)); static char *skiparith __P((char *, int)); -static int verify_substring_values __P((char *, char *, int, intmax_t *, intmax_t *)); +static int verify_substring_values __P((SHELL_VAR *, char *, char *, int, intmax_t *, intmax_t *)); static int get_var_and_type __P((char *, char *, int, SHELL_VAR **, char **)); static char *mb_substring __P((char *, int, int)); static char *parameter_brace_substring __P((char *, char *, char *, int)); @@ -282,7 +291,10 @@ static char *pos_params_pat_subst __P((char *, char *, char *, int)); static char *parameter_brace_patsub __P((char *, char *, char *, int)); -static WORD_DESC *parameter_brace_expand __P((char *, int *, int, int *, int *)); +static char *pos_params_casemod __P((char *, char *, int, int)); +static char *parameter_brace_casemod __P((char *, char *, int, char *, int)); + +static WORD_DESC *parameter_brace_expand __P((char *, int *, int, int, int *, int *)); static WORD_DESC *param_expand __P((char *, int *, int, int *, int *, int *, int *, int)); static WORD_LIST *expand_word_internal __P((WORD_DESC *, int, int, int *, int *)); @@ -296,6 +308,9 @@ static WORD_LIST *glob_expand_word_list __P((WORD_LIST *, int)); #ifdef BRACE_EXPANSION static WORD_LIST *brace_expand_word_list __P((WORD_LIST *, int)); #endif +#if defined (ARRAY_VARS) +static int make_internal_declare __P((char *, char *)); +#endif static WORD_LIST *shell_expand_word_list __P((WORD_LIST *, int)); static WORD_LIST *expand_word_list_internal __P((WORD_LIST *, int)); @@ -305,6 +320,135 @@ static WORD_LIST *expand_word_list_internal __P((WORD_LIST *, int)); /* */ /* **************************************************************** */ +#if defined (DEBUG) +void +dump_word_flags (flags) + int flags; +{ + int f; + + f = flags; + fprintf (stderr, "%d -> ", f); + if (f & W_ASSIGNASSOC) + { + f &= ~W_ASSIGNASSOC; + fprintf (stderr, "W_ASSIGNASSOC%s", f ? "|" : ""); + } + if (f & W_HASCTLESC) + { + f &= ~W_HASCTLESC; + fprintf (stderr, "W_HASCTLESC%s", f ? "|" : ""); + } + if (f & W_NOPROCSUB) + { + f &= ~W_NOPROCSUB; + fprintf (stderr, "W_NOPROCSUB%s", f ? "|" : ""); + } + if (f & W_DQUOTE) + { + f &= ~W_DQUOTE; + fprintf (stderr, "W_DQUOTE%s", f ? "|" : ""); + } + if (f & W_HASQUOTEDNULL) + { + f &= ~W_HASQUOTEDNULL; + fprintf (stderr, "W_HASQUOTEDNULL%s", f ? "|" : ""); + } + if (f & W_ASSIGNARG) + { + f &= ~W_ASSIGNARG; + fprintf (stderr, "W_ASSIGNARG%s", f ? "|" : ""); + } + if (f & W_ASSNBLTIN) + { + f &= ~W_ASSNBLTIN; + fprintf (stderr, "W_ASSNBLTIN%s", f ? "|" : ""); + } + if (f & W_COMPASSIGN) + { + f &= ~W_COMPASSIGN; + fprintf (stderr, "W_COMPASSIGN%s", f ? "|" : ""); + } + if (f & W_NOEXPAND) + { + f &= ~W_NOEXPAND; + fprintf (stderr, "W_NOEXPAND%s", f ? "|" : ""); + } + if (f & W_ITILDE) + { + f &= ~W_ITILDE; + fprintf (stderr, "W_ITILDE%s", f ? "|" : ""); + } + if (f & W_NOTILDE) + { + f &= ~W_NOTILDE; + fprintf (stderr, "W_NOTILDE%s", f ? "|" : ""); + } + if (f & W_ASSIGNRHS) + { + f &= ~W_ASSIGNRHS; + fprintf (stderr, "W_ASSIGNRHS%s", f ? "|" : ""); + } + if (f & W_NOCOMSUB) + { + f &= ~W_NOCOMSUB; + fprintf (stderr, "W_NOCOMSUB%s", f ? "|" : ""); + } + if (f & W_DOLLARSTAR) + { + f &= ~W_DOLLARSTAR; + fprintf (stderr, "W_DOLLARSTAR%s", f ? "|" : ""); + } + if (f & W_DOLLARAT) + { + f &= ~W_DOLLARAT; + fprintf (stderr, "W_DOLLARAT%s", f ? "|" : ""); + } + if (f & W_TILDEEXP) + { + f &= ~W_TILDEEXP; + fprintf (stderr, "W_TILDEEXP%s", f ? "|" : ""); + } + if (f & W_NOSPLIT2) + { + f &= ~W_NOSPLIT2; + fprintf (stderr, "W_NOSPLIT2%s", f ? "|" : ""); + } + if (f & W_NOGLOB) + { + f &= ~W_NOGLOB; + fprintf (stderr, "W_NOGLOB%s", f ? "|" : ""); + } + if (f & W_NOSPLIT) + { + f &= ~W_NOSPLIT; + fprintf (stderr, "W_NOSPLIT%s", f ? "|" : ""); + } + if (f & W_GLOBEXP) + { + f &= ~W_GLOBEXP; + fprintf (stderr, "W_GLOBEXP%s", f ? "|" : ""); + } + if (f & W_ASSIGNMENT) + { + f &= ~W_ASSIGNMENT; + fprintf (stderr, "W_ASSIGNMENT%s", f ? "|" : ""); + } + if (f & W_QUOTED) + { + f &= ~W_QUOTED; + fprintf (stderr, "W_QUOTED%s", f ? "|" : ""); + } + if (f & W_HASDOLLAR) + { + f &= ~W_HASDOLLAR; + fprintf (stderr, "W_HASDOLLAR%s", f ? "|" : ""); + } + fprintf (stderr, "\n"); + fflush (stderr); +} +#endif + #ifdef INCLUDE_UNUSED static char * quoted_substring (string, start, end) @@ -543,11 +687,11 @@ sub_append_number (number, target, indx, size) /* Extract a substring from STRING, starting at SINDEX and ending with one of the characters in CHARLIST. Don't make the ending character part of the string. Leave SINDEX pointing at the ending character. - Understand about backslashes in the string. If (flags & EX_VARNAME) + Understand about backslashes in the string. If (flags & SX_VARNAME) is non-zero, and array variables have been compiled into the shell, everything between a `[' and a corresponding `]' is skipped over. - If (flags & EX_NOALLOC) is non-zero, don't return the substring, just - update SINDEX. If (flags & EX_REQMATCH) is non-zero, the string must + If (flags & SX_NOALLOC) is non-zero, don't return the substring, just + update SINDEX. If (flags & SX_REQMATCH) is non-zero, the string must contain a closing character from CHARLIST. */ static char * string_extract (string, sindex, charlist, flags) @@ -575,11 +719,11 @@ string_extract (string, sindex, charlist, flags) break; } #if defined (ARRAY_VARS) - else if ((flags & EX_VARNAME) && c == '[') + else if ((flags & SX_VARNAME) && c == '[') { int ni; /* If this is an array subscript, skip over it and continue. */ - ni = skipsubscript (string, i); + ni = skipsubscript (string, i, 0); if (string[ni] == ']') i = ni; } @@ -595,13 +739,13 @@ string_extract (string, sindex, charlist, flags) /* If we had to have a matching delimiter and didn't find one, return an error and let the caller deal with it. */ - if ((flags & EX_REQMATCH) && found == 0) + if ((flags & SX_REQMATCH) && found == 0) { *sindex = i; return (&extract_string_error); } - temp = (flags & EX_NOALLOC) ? (char *)NULL : substring (string, *sindex, i); + temp = (flags & SX_NOALLOC) ? (char *)NULL : substring (string, *sindex, i); *sindex = i; return (temp); @@ -712,7 +856,7 @@ add_one_character: si = i + 2; if (string[i + 1] == LPAREN) - ret = extract_delimited_string (string, &si, "$(", "(", ")", EX_COMMAND); /*)*/ + ret = extract_command_subst (string, &si, 0); else ret = extract_dollar_brace_string (string, &si, 1, 0); @@ -814,9 +958,9 @@ skip_double_quoted (string, slen, sind) { si = i + 2; if (string[i + 1] == LPAREN) - ret = extract_delimited_string (string, &si, "$(", "(", ")", EX_NOALLOC|EX_COMMAND); /* ) */ + ret = extract_command_subst (string, &si, SX_NOALLOC); else - ret = extract_dollar_brace_string (string, &si, 0, EX_NOALLOC); + ret = extract_dollar_brace_string (string, &si, 1, SX_NOALLOC); i = si + 1; continue; @@ -886,13 +1030,14 @@ skip_single_quoted (string, slen, sind) /* Just like string_extract, but doesn't hack backslashes or any of that other stuff. Obeys CTLESC quoting. Used to do splitting on $IFS. */ static char * -string_extract_verbatim (string, slen, sindex, charlist) +string_extract_verbatim (string, slen, sindex, charlist, flags) char *string; size_t slen; int *sindex; char *charlist; + int flags; { - register int i = *sindex; + register int i; #if defined (HANDLE_MULTIBYTE) size_t clen; wchar_t *wcharlist; @@ -923,7 +1068,15 @@ string_extract_verbatim (string, slen, sindex, charlist) #if defined (HANDLE_MULTIBYTE) size_t mblength; #endif - if (c == CTLESC) + if ((flags & SX_NOCTLESC) == 0 && c == CTLESC) + { + i += 2; + continue; + } + /* Even if flags contains SX_NOCTLESC, we let CTLESC quoting CTLNUL + through, to protect the CTLNULs from later calls to + remove_quoted_nulls. */ + else if ((flags & SX_NOESCCTLNUL) == 0 && c == CTLESC && string[i+1] == CTLNUL) { i += 2; continue; @@ -976,13 +1129,21 @@ string_extract_verbatim (string, slen, sindex, charlist) /* Extract the $( construct in STRING, and return a new string. Start extracting at (SINDEX) as if we had just seen "$(". - Make (SINDEX) get the position of the matching ")". ) */ + Make (SINDEX) get the position of the matching ")". ) + XFLAGS is additional flags to pass to other extraction functions. */ char * -extract_command_subst (string, sindex) +extract_command_subst (string, sindex, xflags) char *string; int *sindex; + int xflags; { - return (extract_delimited_string (string, sindex, "$(", "(", ")", EX_COMMAND)); /*)*/ + if (string[*sindex] == LPAREN) + return (extract_delimited_string (string, sindex, "$(", "(", ")", xflags|SX_COMMAND)); /*)*/ + else + { + xflags |= (no_longjmp_on_fatal_error ? SX_NOLONGJMP : 0); + return (xparse_dolparen (string, string+*sindex, sindex, xflags)); + } } /* Extract the $[ construct in STRING, and return a new string. (]) @@ -1088,8 +1249,8 @@ extract_delimited_string (string, sindex, opener, alt_opener, closer, flags) } /* Not exactly right yet; should handle shell metacharacters and - multibyte characters, too. */ - if ((flags & EX_COMMAND) && c == '#' && (i == 0 || string[i - 1] == '\n' || whitespace (string[i - 1]))) + multibyte characters, too. See COMMENT_BEGIN define in parse.y */ + if ((flags & SX_COMMAND) && c == '#' && (i == 0 || string[i - 1] == '\n' || shellblank (string[i - 1]))) { in_comment = 1; ADVANCE_CHAR (string, slen, i); @@ -1103,11 +1264,23 @@ extract_delimited_string (string, sindex, opener, alt_opener, closer, flags) continue; } +#if 0 + /* Process a nested command substitution, but only if we're parsing a + command substitution. XXX - for bash-4.2 */ + if ((flags & SX_COMMAND) && string[i] == '$' && string[i+1] == LPAREN) + { + si = i + 2; + t = extract_command_subst (string, &si, flags); + i = si + 1; + continue; + } +#endif + /* Process a nested OPENER. */ if (STREQN (string + i, opener, len_opener)) { si = i + len_opener; - t = extract_delimited_string (string, &si, opener, alt_opener, closer, flags|EX_NOALLOC); + t = extract_delimited_string (string, &si, opener, alt_opener, closer, flags|SX_NOALLOC); i = si + 1; continue; } @@ -1116,7 +1289,7 @@ extract_delimited_string (string, sindex, opener, alt_opener, closer, flags) if (len_alt_opener && STREQN (string + i, alt_opener, len_alt_opener)) { si = i + len_alt_opener; - t = extract_delimited_string (string, &si, alt_opener, alt_opener, closer, flags|EX_NOALLOC); + t = extract_delimited_string (string, &si, alt_opener, alt_opener, closer, flags|SX_NOALLOC); i = si + 1; continue; } @@ -1135,7 +1308,7 @@ extract_delimited_string (string, sindex, opener, alt_opener, closer, flags) if (c == '`') { si = i + 1; - t = string_extract (string, &si, "`", flags|EX_NOALLOC); + t = string_extract (string, &si, "`", flags|SX_NOALLOC); i = si + 1; continue; } @@ -1169,7 +1342,7 @@ extract_delimited_string (string, sindex, opener, alt_opener, closer, flags) } si = i - *sindex - len_closer + 1; - if (flags & EX_NOALLOC) + if (flags & SX_NOALLOC) result = (char *)NULL; else { @@ -1244,7 +1417,7 @@ extract_dollar_brace_string (string, sindex, quoted, flags) if (c == '`') { si = i + 1; - t = string_extract (string, &si, "`", flags|EX_NOALLOC); + t = string_extract (string, &si, "`", flags|SX_NOALLOC); i = si + 1; continue; } @@ -1254,7 +1427,7 @@ extract_dollar_brace_string (string, sindex, quoted, flags) if (string[i] == '$' && string[i+1] == LPAREN) { si = i + 2; - t = extract_delimited_string (string, &si, "$(", "(", ")", flags|EX_NOALLOC|EX_COMMAND); /*)*/ + t = extract_command_subst (string, &si, flags|SX_NOALLOC); i = si + 1; continue; } @@ -1278,7 +1451,7 @@ extract_dollar_brace_string (string, sindex, quoted, flags) { if (no_longjmp_on_fatal_error == 0) { /* { */ - report_error ("bad substitution: no closing `%s' in %s", "}", string); + report_error (_("bad substitution: no closing `%s' in %s"), "}", string); last_command_exit_value = EXECUTION_FAILURE; exp_jump_to_top_level (DISCARD); } @@ -1289,7 +1462,7 @@ extract_dollar_brace_string (string, sindex, quoted, flags) } } - result = (flags & EX_NOALLOC) ? (char *)NULL : substring (string, *sindex, i); + result = (flags & SX_NOALLOC) ? (char *)NULL : substring (string, *sindex, i); *sindex = i; return (result); @@ -1351,38 +1524,37 @@ unquote_bang (string) } #endif -#if defined (READLINE) -/* Return 1 if the portion of STRING ending at EINDEX is quoted (there is - an unclosed quoted string), or if the character at EINDEX is quoted - by a backslash. NO_LONGJMP_ON_FATAL_ERROR is used to flag that the various - single and double-quoted string parsing functions should not return an - error if there are unclosed quotes or braces. The characters that this - recognizes need to be the same as the contents of - rl_completer_quote_characters. */ - #define CQ_RETURN(x) do { no_longjmp_on_fatal_error = 0; return (x); } while (0) -int -char_is_quoted (string, eindex) - char *string; - int eindex; +/* This function assumes s[i] == open; returns with s[ret] == close; used to + parse array subscripts. FLAGS & 1 means to not attempt to skip over + matched pairs of quotes or backquotes, or skip word expansions; it is + intended to be used after expansion has been performed and during final + assignment parsing (see arrayfunc.c:assign_compound_array_list()). */ +static int +skip_matched_pair (string, start, open, close, flags) + const char *string; + int start, open, close, flags; { - int i, pass_next, c; + int i, pass_next, backq, si, c, count; size_t slen; + char *temp, *ss; DECLARE_MBSTATE; - slen = strlen (string); + slen = strlen (string + start) + start; no_longjmp_on_fatal_error = 1; - i = pass_next = 0; - while (i <= eindex) - { - c = string[i]; + i = start + 1; /* skip over leading bracket */ + count = 1; + pass_next = backq = 0; + ss = (char *)string; + while (c = string[i]) + { if (pass_next) { pass_next = 0; - if (i >= eindex) /* XXX was if (i >= eindex - 1) */ - CQ_RETURN(1); + if (c == 0) + CQ_RETURN(i); ADVANCE_CHAR (string, slen, i); continue; } @@ -1392,68 +1564,72 @@ char_is_quoted (string, eindex) i++; continue; } - else if (c == '\'' || c == '"') + else if (backq) { - i = (c == '\'') ? skip_single_quoted (string, slen, ++i) - : skip_double_quoted (string, slen, ++i); - if (i > eindex) - CQ_RETURN(1); - /* no increment, the skip_xxx functions go one past end */ + if (c == '`') + backq = 0; + ADVANCE_CHAR (string, slen, i); + continue; } - else - ADVANCE_CHAR (string, slen, i); - } - - CQ_RETURN(0); -} - -int -unclosed_pair (string, eindex, openstr) - char *string; - int eindex; - char *openstr; -{ - int i, pass_next, openc, olen; - size_t slen; - DECLARE_MBSTATE; - - slen = strlen (string); - olen = strlen (openstr); - i = pass_next = openc = 0; - while (i <= eindex) - { - if (pass_next) + else if ((flags & 1) == 0 && c == '`') { - pass_next = 0; - if (i >= eindex) /* XXX was if (i >= eindex - 1) */ - return 0; - ADVANCE_CHAR (string, slen, i); + backq = 1; + i++; continue; } - else if (string[i] == '\\') + else if ((flags & 1) == 0 && c == open) { - pass_next = 1; + count++; i++; continue; } - else if (STREQN (string + i, openstr, olen)) + else if (c == close) { - openc = 1 - openc; - i += olen; + count--; + if (count == 0) + break; + i++; + continue; } - else if (string[i] == '\'' || string[i] == '"') + else if ((flags & 1) == 0 && (c == '\'' || c == '"')) { - i = (string[i] == '\'') ? skip_single_quoted (string, slen, i) - : skip_double_quoted (string, slen, i); - if (i > eindex) - return 0; + i = (c == '\'') ? skip_single_quoted (ss, slen, ++i) + : skip_double_quoted (ss, slen, ++i); + /* no increment, the skip functions increment past the closing quote. */ + } + else if ((flags&1) == 0 && c == '$' && (string[i+1] == LPAREN || string[i+1] == LBRACE)) + { + si = i + 2; + if (string[si] == '\0') + CQ_RETURN(si); + + if (string[i+1] == LPAREN) + temp = extract_delimited_string (ss, &si, "$(", "(", ")", SX_NOALLOC|SX_COMMAND); /* ) */ + else + temp = extract_dollar_brace_string (ss, &si, 0, SX_NOALLOC); + i = si; + if (string[i] == '\0') /* don't increment i past EOS in loop */ + break; + i++; + continue; } else ADVANCE_CHAR (string, slen, i); } - return (openc); + + CQ_RETURN(i); } +#if defined (ARRAY_VARS) +int +skipsubscript (string, start, flags) + const char *string; + int start, flags; +{ + return (skip_matched_pair (string, start, '[', ']', flags)); +} +#endif + /* Skip characters in STRING until we find a character in DELIMS, and return the index of that character. START is the index into string at which we begin. This is similar in spirit to strpbrk, but it returns an index into @@ -1461,22 +1637,32 @@ unclosed_pair (string, eindex, openstr) a lot of shell syntax. It's very similar to skip_double_quoted and other functions of that ilk. */ int -skip_to_delim (string, start, delims) +skip_to_delim (string, start, delims, flags) char *string; int start; char *delims; + int flags; { - int i, pass_next, backq, si, c; + int i, pass_next, backq, si, c, invert, skipquote, skipcmd; size_t slen; char *temp; DECLARE_MBSTATE; slen = strlen (string + start) + start; - no_longjmp_on_fatal_error = 1; + if (flags & SD_NOJMP) + no_longjmp_on_fatal_error = 1; + invert = (flags & SD_INVERT); + skipcmd = (flags & SD_NOSKIPCMD) == 0; + i = start; pass_next = backq = 0; while (c = string[i]) { + /* If this is non-zero, we should not let quote characters be delimiters + and the current character is a single or double quote. We should not + test whether or not it's a delimiter until after we skip single- or + double-quoted strings. */ + skipquote = ((flags & SD_NOQUOTEDELIM) && (c == '\'' || c =='"')); if (pass_next) { pass_next = 0; @@ -1504,29 +1690,45 @@ skip_to_delim (string, start, delims) i++; continue; } + else if (skipquote == 0 && invert == 0 && member (c, delims)) + break; else if (c == '\'' || c == '"') { i = (c == '\'') ? skip_single_quoted (string, slen, ++i) : skip_double_quoted (string, slen, ++i); /* no increment, the skip functions increment past the closing quote. */ } - else if (c == '$' && (string[i+1] == LPAREN || string[i+1] == LBRACE)) + else if (c == '$' && ((skipcmd && string[i+1] == LPAREN) || string[i+1] == LBRACE)) { si = i + 2; if (string[si] == '\0') CQ_RETURN(si); if (string[i+1] == LPAREN) - temp = extract_delimited_string (string, &si, "$(", "(", ")", EX_NOALLOC|EX_COMMAND); /* ) */ + temp = extract_delimited_string (string, &si, "$(", "(", ")", SX_NOALLOC|SX_COMMAND); /* ) */ else - temp = extract_dollar_brace_string (string, &si, 0, EX_NOALLOC); + temp = extract_dollar_brace_string (string, &si, 0, SX_NOALLOC); i = si; if (string[i] == '\0') /* don't increment i past EOS in loop */ break; i++; continue; } - else if (member (c, delims)) +#if defined (PROCESS_SUBSTITUTION) + else if (skipcmd && (c == '<' || c == '>') && string[i+1] == LPAREN) + { + si = i + 2; + if (string[si] == '\0') + CQ_RETURN(si); + temp = extract_process_subst (string, (c == '<') ? "<(" : ">(", &si); + i = si; + if (string[i] == '\0') + break; + i++; + continue; + } +#endif /* PROCESS_SUBSTITUTION */ + else if ((skipquote || invert) && (member (c, delims) == 0)) break; else ADVANCE_CHAR (string, slen, i); @@ -1535,6 +1737,107 @@ skip_to_delim (string, start, delims) CQ_RETURN(i); } +#if defined (READLINE) +/* Return 1 if the portion of STRING ending at EINDEX is quoted (there is + an unclosed quoted string), or if the character at EINDEX is quoted + by a backslash. NO_LONGJMP_ON_FATAL_ERROR is used to flag that the various + single and double-quoted string parsing functions should not return an + error if there are unclosed quotes or braces. The characters that this + recognizes need to be the same as the contents of + rl_completer_quote_characters. */ + +int +char_is_quoted (string, eindex) + char *string; + int eindex; +{ + int i, pass_next, c; + size_t slen; + DECLARE_MBSTATE; + + slen = strlen (string); + no_longjmp_on_fatal_error = 1; + i = pass_next = 0; + while (i <= eindex) + { + c = string[i]; + + if (pass_next) + { + pass_next = 0; + if (i >= eindex) /* XXX was if (i >= eindex - 1) */ + CQ_RETURN(1); + ADVANCE_CHAR (string, slen, i); + continue; + } + else if (c == '\\') + { + pass_next = 1; + i++; + continue; + } + else if (c == '\'' || c == '"') + { + i = (c == '\'') ? skip_single_quoted (string, slen, ++i) + : skip_double_quoted (string, slen, ++i); + if (i > eindex) + CQ_RETURN(1); + /* no increment, the skip_xxx functions go one past end */ + } + else + ADVANCE_CHAR (string, slen, i); + } + + CQ_RETURN(0); +} + +int +unclosed_pair (string, eindex, openstr) + char *string; + int eindex; + char *openstr; +{ + int i, pass_next, openc, olen; + size_t slen; + DECLARE_MBSTATE; + + slen = strlen (string); + olen = strlen (openstr); + i = pass_next = openc = 0; + while (i <= eindex) + { + if (pass_next) + { + pass_next = 0; + if (i >= eindex) /* XXX was if (i >= eindex - 1) */ + return 0; + ADVANCE_CHAR (string, slen, i); + continue; + } + else if (string[i] == '\\') + { + pass_next = 1; + i++; + continue; + } + else if (STREQN (string + i, openstr, olen)) + { + openc = 1 - openc; + i += olen; + } + else if (string[i] == '\'' || string[i] == '"') + { + i = (string[i] == '\'') ? skip_single_quoted (string, slen, i) + : skip_double_quoted (string, slen, i); + if (i > eindex) + return 0; + } + else + ADVANCE_CHAR (string, slen, i); + } + return (openc); +} + /* Split STRING (length SLEN) at DELIMS, and return a WORD_LIST with the individual words. If DELIMS is NULL, the current value of $IFS is used to split the string, and the function follows the shell field splitting @@ -1543,14 +1846,14 @@ skip_to_delim (string, start, delims) the index of the word containing SENTINEL. Non-whitespace chars in DELIMS delimit separate fields. */ WORD_LIST * -split_at_delims (string, slen, delims, sentinel, nwp, cwp) +split_at_delims (string, slen, delims, sentinel, flags, nwp, cwp) char *string; int slen; char *delims; - int sentinel; + int sentinel, flags; int *nwp, *cwp; { - int ts, te, i, nw, cw, ifs_split; + int ts, te, i, nw, cw, ifs_split, dflags; char *token, *d, *d2; WORD_LIST *ret, *tl; @@ -1607,7 +1910,7 @@ split_at_delims (string, slen, delims, sentinel, nwp, cwp) ret = (WORD_LIST *)NULL; - /* Remove sequences of whitspace characters at the start of the string, as + /* Remove sequences of whitespace characters at the start of the string, as long as those characters are delimiters. */ for (i = 0; member (string[i], d) && spctabnl (string[i]); i++) ; @@ -1617,9 +1920,10 @@ split_at_delims (string, slen, delims, sentinel, nwp, cwp) ts = i; nw = 0; cw = -1; + dflags = flags|SD_NOJMP; while (1) { - te = skip_to_delim (string, ts, d); + te = skip_to_delim (string, ts, d, dflags); /* If we have a non-whitespace delimiter character, use it to make a separate field. This is just about what $IFS splitting does and @@ -1677,9 +1981,10 @@ split_at_delims (string, slen, delims, sentinel, nwp, cwp) /* Special case for SENTINEL at the end of STRING. If we haven't found the word containing SENTINEL yet, and the index we're looking for is at - the end of STRING, add an additional null argument and set the current - word pointer to that. */ - if (cwp && cw == -1 && sentinel >= slen) + the end of STRING (or past the end of the previously-found token, + possible if the end of the line is composed solely of IFS whitespace) + add an additional null argument and set the current word pointer to that. */ + if (cwp && cw == -1 && (sentinel >= slen || sentinel >= te)) { if (whitespace (string[sentinel - 1])) { @@ -1785,6 +2090,42 @@ string_list (list) return (string_list_internal (list, " ")); } +/* An external interface that can be used by the rest of the shell to + obtain a string containing the first character in $IFS. Handles all + the multibyte complications. If LENP is non-null, it is set to the + length of the returned string. */ +char * +ifs_firstchar (lenp) + int *lenp; +{ + char *ret; + int len; + + ret = xmalloc (MB_LEN_MAX + 1); +#if defined (HANDLE_MULTIBYTE) + if (ifs_firstc_len == 1) + { + ret[0] = ifs_firstc[0]; + ret[1] = '\0'; + len = ret[0] ? 1 : 0; + } + else + { + memcpy (ret, ifs_firstc, ifs_firstc_len); + ret[len = ifs_firstc_len] = '\0'; + } +#else + ret[0] = ifs_firstc; + ret[1] = '\0'; + len = ret[0] ? 0 : 1; +#endif + + if (lenp) + *lenp = len; + + return ret; +} + /* Return a single string of all the words present in LIST, obeying the quoting rules for "$*", to wit: (P1003.2, draft 11, 3.5.2) "If the expansion [of $*] appears within a double quoted string, it expands @@ -1887,7 +2228,13 @@ string_list_dollar_at (list, quoted) sep[1] = '\0'; #endif + /* XXX -- why call quote_list if ifs == 0? we can get away without doing + it now that quote_escapes quotes spaces */ +#if 0 tlist = ((quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES)) || (ifs && *ifs == 0)) +#else + tlist = (quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES|Q_PATQUOTE)) +#endif ? quote_list (list) : list_quote_escapes (list); @@ -1898,6 +2245,55 @@ string_list_dollar_at (list, quoted) return ret; } +/* Turn the positional paramters into a string, understanding quoting and + the various subtleties of using the first character of $IFS as the + separator. Calls string_list_dollar_at, string_list_dollar_star, and + string_list as appropriate. */ +char * +string_list_pos_params (pchar, list, quoted) + int pchar; + WORD_LIST *list; + int quoted; +{ + char *ret; + WORD_LIST *tlist; + + if (pchar == '*' && (quoted & Q_DOUBLE_QUOTES)) + { + tlist = quote_list (list); + word_list_remove_quoted_nulls (tlist); + ret = string_list_dollar_star (tlist); + } + else if (pchar == '*' && (quoted & Q_HERE_DOCUMENT)) + { + tlist = quote_list (list); + word_list_remove_quoted_nulls (tlist); + ret = string_list (tlist); + } + else if (pchar == '*') + { + /* Even when unquoted, string_list_dollar_star does the right thing + making sure that the first character of $IFS is used as the + separator. */ + ret = string_list_dollar_star (list); + } + else if (pchar == '@' && (quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES))) + /* We use string_list_dollar_at, but only if the string is quoted, since + that quotes the escapes if it's not, which we don't want. We could + use string_list (the old code did), but that doesn't do the right + thing if the first character of $IFS is not a space. We use + string_list_dollar_star if the string is unquoted so we make sure that + the elements of $@ are separated by the first character of $IFS for + later splitting. */ + ret = string_list_dollar_at (list, quoted); + else if (pchar == '@') + ret = string_list_dollar_star (list); + else + ret = string_list ((quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES)) ? quote_list (list) : list); + + return ret; +} + /* Return the list of words present in STRING. Separate the string into words at any of the characters found in SEPARATORS. If QUOTED is non-zero then word in the list will have its quoted flag set, otherwise @@ -1938,7 +2334,7 @@ list_string (string, separators, quoted) WORD_LIST *result; WORD_DESC *t; char *current_word, *s; - int sindex, sh_style_split, whitesep; + int sindex, sh_style_split, whitesep, xflags; size_t slen; if (!string || !*string) @@ -1948,6 +2344,11 @@ list_string (string, separators, quoted) separators[1] == '\t' && separators[2] == '\n' && separators[3] == '\0'; + for (xflags = 0, s = ifs_value; s && *s; s++) + { + if (*s == CTLESC) xflags |= SX_NOCTLESC; + else if (*s == CTLNUL) xflags |= SX_NOESCCTLNUL; + } slen = 0; /* Remove sequences of whitespace at the beginning of STRING, as @@ -1973,7 +2374,7 @@ list_string (string, separators, quoted) { /* Don't need string length in ADVANCE_CHAR or string_extract_verbatim unless multibyte chars are possible. */ - current_word = string_extract_verbatim (string, slen, &sindex, separators); + current_word = string_extract_verbatim (string, slen, &sindex, separators, xflags); if (current_word == 0) break; @@ -2055,19 +2456,23 @@ get_word_from_string (stringp, separators, endptr) { register char *s; char *current_word; - int sindex, sh_style_split, whitesep; + int sindex, sh_style_split, whitesep, xflags; size_t slen; if (!stringp || !*stringp || !**stringp) return ((char *)NULL); - s = *stringp; - sh_style_split = separators && separators[0] == ' ' && separators[1] == '\t' && separators[2] == '\n' && separators[3] == '\0'; + for (xflags = 0, s = ifs_value; s && *s; s++) + { + if (*s == CTLESC) xflags |= SX_NOCTLESC; + if (*s == CTLNUL) xflags |= SX_NOESCCTLNUL; + } + s = *stringp; slen = 0; /* Remove sequences of whitespace at the beginning of STRING, as @@ -2096,7 +2501,7 @@ get_word_from_string (stringp, separators, endptr) /* Don't need string length in ADVANCE_CHAR or string_extract_verbatim unless multibyte chars are possible. */ slen = (MB_CUR_MAX > 1) ? strlen (s) : 1; - current_word = string_extract_verbatim (s, slen, &sindex, separators); + current_word = string_extract_verbatim (s, slen, &sindex, separators, xflags); /* Set ENDPTR to the first character after the end of the word. */ if (endptr) @@ -2223,16 +2628,19 @@ do_compound_assignment (name, value, flags) int flags; { SHELL_VAR *v; - int mklocal; + int mklocal, mkassoc; WORD_LIST *list; mklocal = flags & ASS_MKLOCAL; + mkassoc = flags & ASS_MKASSOC; if (mklocal && variable_context) { - list = expand_compound_array_assignment (value, flags); v = find_variable (name); - if (v == 0 || array_p (v) == 0 || v->context != variable_context) + list = expand_compound_array_assignment (v, value, flags); + if (mkassoc) + v = make_local_assoc_variable (name); + else if (v == 0 || (array_p (v) == 0 && assoc_p (v) == 0) || v->context != variable_context) v = make_local_array_variable (name); assign_compound_array_list (v, list, flags); } @@ -2253,7 +2661,7 @@ do_assignment_internal (word, expand) const WORD_DESC *word; int expand; { - int offset, tlen, appendop, assign_list, aflags; + int offset, tlen, appendop, assign_list, aflags, retval; char *name, *value; SHELL_VAR *entry; #if defined (ARRAY_VARS) @@ -2293,7 +2701,6 @@ do_assignment_internal (word, expand) } else #endif - if (expand && temp[0]) value = expand_string_if_necessary (temp, 0, expand_string_assignment); else @@ -2321,7 +2728,7 @@ do_assignment_internal (word, expand) aflags |= ASS_APPEND; #if defined (ARRAY_VARS) - if (t = xstrchr (name, '[')) /*]*/ + if (t = mbschr (name, '[')) /*]*/ { if (assign_list) { @@ -2336,6 +2743,8 @@ do_assignment_internal (word, expand) { if (word->flags & W_ASSIGNARG) aflags |= ASS_MKLOCAL; + if (word->flags & W_ASSIGNASSOC) + aflags |= ASS_MKASSOC; entry = do_compound_assignment (name, value, aflags); } else @@ -2344,11 +2753,28 @@ do_assignment_internal (word, expand) stupidly_hack_special_variables (name); +#if 1 + /* Return 1 if the assignment seems to have been performed correctly. */ + if (entry == 0 || readonly_p (entry)) + retval = 0; /* assignment failure */ + else if (noassign_p (entry)) + { + last_command_exit_value = EXECUTION_FAILURE; + retval = 1; /* error status, but not assignment failure */ + } + else + retval = 1; + + if (entry && retval != 0 && noassign_p (entry) == 0) + VUNSETATTR (entry, att_invisible); + + ASSIGN_RETURN (retval); +#else if (entry) VUNSETATTR (entry, att_invisible); - /* Return 1 if the assignment seems to have been performed correctly. */ ASSIGN_RETURN (entry ? ((readonly_p (entry) == 0) && noassign_p (entry) == 0) : 0); +#endif } /* Perform the assignment statement in STRING, and expand the @@ -2481,7 +2907,13 @@ pos_params (string, start, end, quoted) if (save == 0) return ((char *)NULL); - for (i = 1; params && i < start; i++) + if (start == 0) /* handle ${@:0[:x]} specially */ + { + t = make_word_list (make_word (dollar_vars[0]), params); + save = params = t; + } + + for (i = start ? 1 : 0; params && i < start; i++) params = params->next; if (params == 0) return ((char *)NULL); @@ -2492,17 +2924,9 @@ pos_params (string, start, end, quoted) } t->next = (WORD_LIST *)NULL; - if (string[0] == '*') - { - if (quoted & Q_DOUBLE_QUOTES) - ret = string_list_dollar_star (quote_list (h)); - else if (quoted & Q_HERE_DOCUMENT) - ret = string_list (quote_list (h)); - else - ret = string_list (h); - } - else - ret = string_list ((quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES)) ? quote_list (h) : h); + + ret = string_list_pos_params (string[0], h, quoted); + if (t != params) t->next = params; @@ -2619,6 +3043,7 @@ expand_assignment_string_to_string (string, quoted) char * expand_arith_string (string, quoted) char *string; + int quoted; { return (expand_string_if_necessary (string, quoted, expand_string)); } @@ -2646,11 +3071,12 @@ remove_backslashes (string) /* This needs better error handling. */ /* Expand W for use as an argument to a unary or binary operator in a - [[...]] expression. If SPECIAL is nonzero, this is the rhs argument + [[...]] expression. If SPECIAL is 1, this is the rhs argument to the != or == operator, and should be treated as a pattern. In - this case, we quote the string specially for the globbing code. The - caller is responsible for removing the backslashes if the unquoted - words is needed later. */ + this case, we quote the string specially for the globbing code. If + SPECIAL is 2, this is an rhs argument for the =~ operator, and should + be quoted appropriately for regcomp/regexec. The caller is responsible + for removing the backslashes if the unquoted word is needed later. */ char * cond_expand_word (w, special) WORD_DESC *w; @@ -2658,10 +3084,12 @@ cond_expand_word (w, special) { char *r, *p; WORD_LIST *l; + int qflags; if (w->word == 0 || w->word[0] == '\0') return ((char *)NULL); + w->flags |= W_NOSPLIT2; l = call_expand_word_internal (w, 0, 0, (int *)0, (int *)0); if (l) { @@ -2672,8 +3100,11 @@ cond_expand_word (w, special) } else { + qflags = QGLOB_CVTNULL; + if (special == 2) + qflags |= QGLOB_REGEXP; p = string_list (l); - r = quote_string_for_globbing (p, QGLOB_CVTNULL); + r = quote_string_for_globbing (p, qflags); free (p); } dispose_words (l); @@ -2803,9 +3234,10 @@ expand_string_assignment (string, quoted) passed string when an error occurs. Might want to trap other calls to jump_to_top_level here so we don't endlessly loop. */ WORD_LIST * -expand_prompt_string (string, quoted) +expand_prompt_string (string, quoted, wflags) char *string; int quoted; + int wflags; { WORD_LIST *value; WORD_DESC td; @@ -2813,7 +3245,7 @@ expand_prompt_string (string, quoted) if (string == 0 || *string == 0) return ((WORD_LIST *)NULL); - td.flags = 0; + td.flags = wflags; td.word = savestring (string); no_longjmp_on_fatal_error = 1; @@ -2916,7 +3348,14 @@ expand_string (string, quoted) /* Quote escape characters in string s, but no other characters. This is used to protect CTLESC and CTLNUL in variable values from the rest of - the word expansion process after the variable is expanded. */ + the word expansion process after the variable is expanded (word splitting + and filename generation). If IFS is null, we quote spaces as well, just + in case we split on spaces later (in the case of unquoted $@, we will + eventually attempt to split the entire word on spaces). Corresponding + code exists in dequote_escapes. Even if we don't end up splitting on + spaces, quoting spaces is not a problem. This should never be called on + a string that is quoted with single or double quotes or part of a here + document (effectively double-quoted). */ char * quote_escapes (string) char *string; @@ -2924,17 +3363,23 @@ quote_escapes (string) register char *s, *t; size_t slen; char *result, *send; + int quote_spaces, skip_ctlesc, skip_ctlnul; DECLARE_MBSTATE; slen = strlen (string); send = string + slen; + quote_spaces = (ifs_value && *ifs_value == 0); + + for (skip_ctlesc = skip_ctlnul = 0, s = ifs_value; s && *s; s++) + skip_ctlesc |= *s == CTLESC, skip_ctlnul |= *s == CTLNUL; + t = result = (char *)xmalloc ((slen * 2) + 1); s = string; while (*s) { - if (*s == CTLESC || *s == CTLNUL) + if ((skip_ctlesc == 0 && *s == CTLESC) || (skip_ctlnul == 0 && *s == CTLNUL) || (quote_spaces && *s == ' ')) *t++ = CTLESC; COPY_CHAR_P (t, s, send); } @@ -2969,13 +3414,14 @@ list_quote_escapes (list) characters. Also used by parts of the pattern substitution code. */ -static char * +char * dequote_escapes (string) char *string; { - register char *s, *t; + register char *s, *t, *s1; size_t slen; char *result, *send; + int quote_spaces; DECLARE_MBSTATE; if (string == 0) @@ -2985,14 +3431,16 @@ dequote_escapes (string) send = string + slen; t = result = (char *)xmalloc (slen + 1); - s = string; if (strchr (string, CTLESC) == 0) - return (strcpy (result, s)); + return (strcpy (result, string)); + + quote_spaces = (ifs_value && *ifs_value == 0); + s = string; while (*s) { - if (*s == CTLESC && (s[1] == CTLESC || s[1] == CTLNUL)) + if (*s == CTLESC && (s[1] == CTLESC || s[1] == CTLNUL || (quote_spaces && s[1] == ' '))) { s++; if (*s == '\0') @@ -3118,9 +3566,10 @@ quote_list (list) { t = w->word->word; w->word->word = quote_string (t); - free (t); + if (*t == 0) + w->word->flags |= W_HASQUOTEDNULL; /* XXX - turn on W_HASQUOTEDNULL here? */ w->word->flags |= W_QUOTED; - /* XXX - turn on W_HAVEQUOTEDNULL here? */ + free (t); } return list; } @@ -3136,16 +3585,17 @@ dequote_list (list) for (tlist = list; tlist; tlist = tlist->next) { s = dequote_string (tlist->word->word); + if (QUOTED_NULL (tlist->word->word)) + tlist->word->flags &= ~W_HASQUOTEDNULL; free (tlist->word->word); tlist->word->word = s; - /* XXX - turn off W_HAVEQUOTEDNULL here? */ } return list; } /* Remove CTLESC protecting a CTLESC or CTLNUL in place. Return the passed string. */ -static char * +char * remove_quoted_escapes (string) char *string; { @@ -3166,7 +3616,7 @@ remove_quoted_escapes (string) of how expand_word_internal works. remove_quoted_nulls () turns STRING into an empty string iff it only consists of a quoted null, and removes all unquoted CTLNUL characters. */ -static char * +char * remove_quoted_nulls (string) char *string; { @@ -3512,11 +3962,11 @@ match_upattern (string, pat, mtype, sp, ep) /* XXX - check this later if I ever implement `**' with special meaning, since this will potentially result in `**' at the beginning or end */ len = STRLEN (pat); - if (pat[0] != '*' || pat[len - 1] != '*') + if (pat[0] != '*' || (pat[0] == '*' && pat[1] == LPAREN && extended_glob) || pat[len - 1] != '*') { p = npat = (char *)xmalloc (len + 3); p1 = pat; - if (*p1 != '*') + if (*p1 != '*' || (*p1 == '*' && p1[1] == LPAREN && extended_glob)) *p++ = '*'; while (*p1) *p++ = *p1++; @@ -3656,11 +4106,11 @@ match_wpattern (wstring, indices, wstrlen, wpat, mtype, sp, ep) /* XXX - check this later if I ever implement `**' with special meaning, since this will potentially result in `**' at the beginning or end */ len = wcslen (wpat); - if (wpat[0] != L'*' || wpat[len - 1] != L'*') + if (wpat[0] != L'*' || (wpat[0] == L'*' && wpat[1] == WLPAREN && extended_glob) || wpat[len - 1] != L'*') { wp = nwpat = (wchar_t *)xmalloc ((len + 3) * sizeof (wchar_t)); wp1 = wpat; - if (*wp1 != L'*') + if (*wp1 != L'*' || (*wp1 == '*' && wp1[1] == WLPAREN && extended_glob)) *wp++ = L'*'; while (*wp1 != L'\0') *wp++ = *wp1++; @@ -3807,7 +4257,6 @@ getpattern (value, quoted, expandpat) #if 0 int i; #endif - /* There is a problem here: how to handle single or double quotes in the pattern string when the whole expression is between double quotes? POSIX.2 says that enclosing double quotes do not cause the pattern to @@ -3875,12 +4324,9 @@ list_remove_pattern (list, pattern, patspec, itype, quoted) } l = REVERSE_LIST (new, WORD_LIST *); - if (itype == '*') - tword = (quoted & Q_DOUBLE_QUOTES) ? string_list_dollar_star (l) : string_list (l); - else - tword = string_list ((quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES)) ? quote_list (l) : l); - + tword = string_list_pos_params (itype, l, quoted); dispose_words (l); + return (tword); } @@ -3903,13 +4349,15 @@ parameter_list_remove_pattern (itype, pattern, patspec, quoted) #if defined (ARRAY_VARS) static char * -array_remove_pattern (a, pattern, patspec, varname, quoted) - ARRAY *a; +array_remove_pattern (var, pattern, patspec, varname, quoted) + SHELL_VAR *var; char *pattern; int patspec; char *varname; /* so we can figure out how it's indexed */ int quoted; { + ARRAY *a; + HASH_TABLE *h; int itype; char *ret; WORD_LIST *list; @@ -3919,7 +4367,10 @@ array_remove_pattern (a, pattern, patspec, varname, quoted) v = array_variable_part (varname, &ret, 0); itype = ret[0]; - list = array_to_word_list (a); + a = (v && array_p (v)) ? array_cell (v) : 0; + h = (v && assoc_p (v)) ? assoc_cell (v) : 0; + + list = a ? array_to_word_list (a) : (h ? assoc_to_word_list (h) : 0); if (list == 0) return ((char *)NULL); ret = list_remove_pattern (list, pattern, patspec, itype, quoted); @@ -3954,7 +4405,11 @@ parameter_brace_remove_pattern (varname, value, patstr, rtype, quoted) if (patspec == RP_LONG_LEFT || patspec == RP_LONG_RIGHT) patstr++; - pattern = getpattern (patstr, quoted, 1); + /* Need to pass getpattern newly-allocated memory in case of expansion -- + the expansion code will free the passed string on an error. */ + temp1 = savestring (patstr); + pattern = getpattern (temp1, quoted, 1); + free (temp1); temp1 = (char *)NULL; /* shut up gcc */ switch (vtype) @@ -3966,14 +4421,16 @@ parameter_brace_remove_pattern (varname, value, patstr, rtype, quoted) FREE (val); if (temp1) { - val = quote_escapes (temp1); + val = (quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES)) + ? quote_string (temp1) + : quote_escapes (temp1); free (temp1); temp1 = val; } break; #if defined (ARRAY_VARS) case VT_ARRAYVAR: - temp1 = array_remove_pattern (array_cell (v), pattern, patspec, varname, quoted); + temp1 = array_remove_pattern (v, pattern, patspec, varname, quoted); if (temp1 && ((quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES)) == 0)) { val = quote_escapes (temp1); @@ -4031,6 +4488,12 @@ expand_word_unsplit (word, quoted) WORD_LIST *result; expand_no_split_dollar_star = 1; +#if defined (HANDLE_MULTIBYTE) + if (ifs_firstc[0] == 0) +#else + if (ifs_firstc == 0) +#endif + word->flags |= W_NOSPLIT; result = call_expand_word_internal (word, quoted, 0, (int *)NULL, (int *)NULL); expand_no_split_dollar_star = 0; @@ -4038,13 +4501,27 @@ expand_word_unsplit (word, quoted) } /* Perform shell expansions on WORD, but do not perform word splitting or - quote removal on the result. */ + quote removal on the result. Virtually identical to expand_word_unsplit; + could be combined if implementations don't diverge. */ WORD_LIST * expand_word_leave_quoted (word, quoted) WORD_DESC *word; int quoted; { - return (call_expand_word_internal (word, quoted, 0, (int *)NULL, (int *)NULL)); + WORD_LIST *result; + + expand_no_split_dollar_star = 1; +#if defined (HANDLE_MULTIBYTE) + if (ifs_firstc[0] == 0) +#else + if (ifs_firstc == 0) +#endif + word->flags |= W_NOSPLIT; + word->flags |= W_NOSPLIT2; + result = call_expand_word_internal (word, quoted, 0, (int *)NULL, (int *)NULL); + expand_no_split_dollar_star = 0; + + return result; } #if defined (PROCESS_SUBSTITUTION) @@ -4123,12 +4600,18 @@ unlink_fifo_list () nfifo = 0; } +int +fifos_pending () +{ + return nfifo; +} + static char * make_named_pipe () { char *tname; - tname = sh_mktmpname ("sh-np", MT_USERANDOM); + tname = sh_mktmpname ("sh-np", MT_USERANDOM|MT_USETMPDIR); if (mkfifo (tname, 0600) < 0) { free (tname); @@ -4161,7 +4644,7 @@ add_fifo_list (fd) totfds = getdtablesize (); if (totfds < 0 || totfds > 256) totfds = 256; - if (fd > totfds) + if (fd >= totfds) totfds = fd + 2; dev_fd_list = (char *)xrealloc (dev_fd_list, totfds); @@ -4172,6 +4655,12 @@ add_fifo_list (fd) nfds++; } +int +fifos_pending () +{ + return 0; /* used for cleanup; not needed with /dev/fd */ +} + void unlink_fifo_list () { @@ -4214,7 +4703,7 @@ make_dev_fd_filename (fd) { char *ret, intbuf[INT_STRLEN_BOUND (int) + 1], *p; - ret = (char *)xmalloc (sizeof (DEV_FD_PREFIX) + 4); + ret = (char *)xmalloc (sizeof (DEV_FD_PREFIX) + 8); strcpy (ret, DEV_FD_PREFIX); p = inttostr (fd, intbuf, sizeof (intbuf)); @@ -4276,7 +4765,7 @@ process_substitute (string, open_for_read_in_child) pathname = make_dev_fd_filename (parent_pipe_fd); #endif /* HAVE_DEV_FD */ - if (!pathname) + if (pathname == 0) { sys_error (_("cannot make pipe for process substitution")); return ((char *)NULL); @@ -4298,12 +4787,13 @@ process_substitute (string, open_for_read_in_child) /* Cancel traps, in trap.c. */ restore_original_signals (); setup_async_signals (); - subshell_environment |= SUBSHELL_COMSUB; + subshell_environment |= SUBSHELL_COMSUB|SUBSHELL_PROCSUB; } #if defined (JOB_CONTROL) set_sigchld_handler (); stop_making_children (); + /* XXX - should we only do this in the parent? (as in command subst) */ pipeline_pgrp = old_pipeline_pgrp; #endif /* JOB_CONTROL */ @@ -4364,7 +4854,7 @@ process_substitute (string, open_for_read_in_child) { if (sh_unset_nodelay_mode (fd) < 0) { - sys_error (_("cannout reset nodelay mode for fd %d"), fd); + sys_error (_("cannot reset nodelay mode for fd %d"), fd); exit (127); } } @@ -4417,21 +4907,26 @@ process_substitute (string, open_for_read_in_child) /***********************************/ static char * -read_comsub (fd, quoted) +read_comsub (fd, quoted, rflag) int fd, quoted; + int *rflag; { - char *istring, buf[128], *bufp; - int istring_index, istring_size, c; + char *istring, buf[128], *bufp, *s; + int istring_index, istring_size, c, tflag, skip_ctlesc, skip_ctlnul; ssize_t bufn; istring = (char *)NULL; - istring_index = istring_size = bufn = 0; + istring_index = istring_size = bufn = tflag = 0; + + for (skip_ctlesc = skip_ctlnul = 0, s = ifs_value; s && *s; s++) + skip_ctlesc |= *s == CTLESC, skip_ctlnul |= *s == CTLNUL; #ifdef __CYGWIN__ setmode (fd, O_TEXT); /* we don't want CR/LF, we want Unix-style */ #endif - /* Read the output of the command through the pipe. */ + /* Read the output of the command through the pipe. This may need to be + changed to understand multibyte characters in the future. */ while (1) { if (fd < 0) @@ -4456,7 +4951,18 @@ read_comsub (fd, quoted) /* Add the character to ISTRING, possibly after resizing it. */ RESIZE_MALLOCED_BUFFER (istring, istring_index, 2, istring_size, DEFAULT_ARRAY_SIZE); - if ((quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES)) || c == CTLESC || c == CTLNUL) + /* This is essentially quote_string inline */ + if ((quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES)) /* || c == CTLESC || c == CTLNUL */) + istring[istring_index++] = CTLESC; + /* Escape CTLESC and CTLNUL in the output to protect those characters + from the rest of the word expansions (word splitting and globbing.) + This is essentially quote_escapes inline. */ + else if (skip_ctlesc == 0 && c == CTLESC) + { + tflag |= W_HASCTLESC; + istring[istring_index++] = CTLESC; + } + else if ((skip_ctlnul == 0 && c == CTLNUL) || (c == ' ' && (ifs_value && *ifs_value == 0))) istring[istring_index++] = CTLESC; istring[istring_index++] = c; @@ -4480,6 +4986,8 @@ read_comsub (fd, quoted) if (istring_index == 0) { FREE (istring); + if (rflag) + *rflag = tflag; return (char *)NULL; } @@ -4504,30 +5012,33 @@ read_comsub (fd, quoted) else strip_trailing (istring, istring_index - 1, 1); + if (rflag) + *rflag = tflag; return istring; } -/* Perform command substitution on STRING. This returns a string, - possibly quoted. */ -char * +/* Perform command substitution on STRING. This returns a WORD_DESC * with the + contained string possibly quoted. */ +WORD_DESC * command_substitute (string, quoted) char *string; int quoted; { pid_t pid, old_pid, old_pipeline_pgrp, old_async_pid; char *istring; - int result, fildes[2], function_value, pflags, rc; + int result, fildes[2], function_value, pflags, rc, tflag; + WORD_DESC *ret; istring = (char *)NULL; /* Don't fork () if there is no need to. In the case of no command to run, just return NULL. */ if (!string || !*string || (string[0] == '\n' && !string[1])) - return ((char *)NULL); + return ((WORD_DESC *)NULL); if (wordexp_only && read_but_dont_execute) { - last_command_exit_value = 125; + last_command_exit_value = EX_WEXPCOMSUB; jump_to_top_level (EXITPROG); } @@ -4544,7 +5055,7 @@ command_substitute (string, quoted) maybe_make_export_env (); /* XXX */ /* Flags to pass to parse_and_execute() */ - pflags = interactive ? SEVAL_RESETLINE : 0; + pflags = (interactive && sourcelevel == 0) ? SEVAL_RESETLINE : 0; /* Pipe the output of executing STRING into the current shell. */ if (pipe (fildes) < 0) @@ -4563,11 +5074,7 @@ command_substitute (string, quoted) #endif /* JOB_CONTROL */ old_async_pid = last_asynchronous_pid; -#if 0 - pid = make_child ((char *)NULL, 0); -#else pid = make_child ((char *)NULL, subshell_environment&SUBSHELL_ASYNC); -#endif last_asynchronous_pid = old_async_pid; if (pid == 0) @@ -4576,9 +5083,11 @@ command_substitute (string, quoted) reset_signal_handlers (); #if defined (JOB_CONTROL) + /* XXX DO THIS ONLY IN PARENT ? XXX */ set_sigchld_handler (); stop_making_children (); - pipeline_pgrp = old_pipeline_pgrp; + if (pid != 0) + pipeline_pgrp = old_pipeline_pgrp; #else stop_making_children (); #endif /* JOB_CONTROL */ @@ -4591,7 +5100,7 @@ command_substitute (string, quoted) FREE (istring); close (fildes[0]); close (fildes[1]); - return ((char *)NULL); + return ((WORD_DESC *)NULL); } if (pid == 0) @@ -4665,6 +5174,9 @@ command_substitute (string, quoted) last_command_exit_value = rc; rc = run_exit_trap (); +#if defined (PROCESS_SUBSTITUTION) + unlink_fifo_list (); +#endif exit (rc); } else @@ -4675,7 +5187,8 @@ command_substitute (string, quoted) close (fildes[1]); - istring = read_comsub (fildes[0], quoted); + tflag = 0; + istring = read_comsub (fildes[0], quoted, &tflag); close (fildes[0]); @@ -4705,7 +5218,11 @@ command_substitute (string, quoted) give_terminal_to (pipeline_pgrp, 0); #endif /* JOB_CONTROL */ - return (istring); + ret = alloc_word_desc (); + ret->word = istring; + ret->flags = tflag; + + return ret; } } @@ -4723,6 +5240,7 @@ array_length_reference (s) { int len; arrayind_t ind; + char *akey; char *t, c; ARRAY *array; SHELL_VAR *var; @@ -4731,10 +5249,11 @@ array_length_reference (s) /* If unbound variables should generate an error, report one and return failure. */ - if ((var == 0 || array_p (var) == 0) && unbound_vars_is_error) + if ((var == 0 || (assoc_p (var) == 0 && array_p (var) == 0)) && unbound_vars_is_error) { c = *--t; *t = '\0'; + last_command_exit_value = EXECUTION_FAILURE; err_unboundvar (s); *t = c; return (-1); @@ -4749,21 +5268,42 @@ array_length_reference (s) array = array_p (var) ? array_cell (var) : (ARRAY *)NULL; if (ALL_ELEMENT_SUB (t[0]) && t[1] == ']') - return (array_p (var) ? array_num_elements (array) : 1); - - ind = array_expand_index (t, len); - if (ind < 0) { - err_badarraysub (t); - return (-1); + if (assoc_p (var)) + return (assoc_num_elements (assoc_cell (var))); + else if (array_p (var)) + return (array_num_elements (array)); + else + return 1; } - if (array_p (var)) - t = array_reference (array, ind); + if (assoc_p (var)) + { + t[len - 1] = '\0'; + akey = expand_assignment_string_to_string (t, 0); /* [ */ + t[len - 1] = ']'; + if (akey == 0 || *akey == 0) + { + err_badarraysub (t); + return (-1); + } + t = assoc_reference (assoc_cell (var), akey); + } else - t = (ind == 0) ? value_cell (var) : (char *)NULL; + { + ind = array_expand_index (t, len); + if (ind < 0) + { + err_badarraysub (t); + return (-1); + } + if (array_p (var)) + t = array_reference (array, ind); + else + t = (ind == 0) ? value_cell (var) : (char *)NULL; + } - len = STRLEN (t); + len = MB_STRLEN (t); return (len); } #endif /* ARRAY_VARS */ @@ -4824,7 +5364,7 @@ chk_atstar (name, quoted, quoted_dollar_atp, contains_dollar_at) #if defined (ARRAY_VARS) else if (valid_array_reference (name)) { - temp1 = xstrchr (name, '['); + temp1 = mbschr (name, '['); if (temp1 && temp1[1] == '@' && temp1[2] == ']') { if ((quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES)) && quoted_dollar_atp) @@ -4852,18 +5392,19 @@ chk_atstar (name, quoted, quoted_dollar_atp, contains_dollar_at) the shell, e.g., "@", "$", "*", etc. QUOTED, if non-zero, means that NAME was found inside of a double-quoted expression. */ static WORD_DESC * -parameter_brace_expand_word (name, var_is_special, quoted) +parameter_brace_expand_word (name, var_is_special, quoted, pflags) char *name; - int var_is_special, quoted; + int var_is_special, quoted, pflags; { WORD_DESC *ret; char *temp, *tt; intmax_t arg_index; SHELL_VAR *var; - int atype; + int atype, rflags; ret = 0; temp = 0; + rflags = 0; /* Handle multiple digit arguments, as in ${11}. */ if (legal_number (name, &arg_index)) @@ -4885,7 +5426,7 @@ parameter_brace_expand_word (name, var_is_special, quoted) strcpy (tt + 1, name); ret = param_expand (tt, &sindex, quoted, (int *)NULL, (int *)NULL, - (int *)NULL, (int *)NULL, 0); + (int *)NULL, (int *)NULL, pflags); free (tt); } #if defined (ARRAY_VARS) @@ -4896,6 +5437,8 @@ parameter_brace_expand_word (name, var_is_special, quoted) temp = (*temp && (quoted & (Q_DOUBLE_QUOTES|Q_HERE_DOCUMENT))) ? quote_string (temp) : quote_escapes (temp); + else if (atype == 1 && temp && QUOTED_NULL (temp) && (quoted & (Q_DOUBLE_QUOTES|Q_HERE_DOCUMENT))) + rflags |= W_HASQUOTEDNULL; } #endif else if (var = find_variable (name)) @@ -4903,7 +5446,12 @@ parameter_brace_expand_word (name, var_is_special, quoted) if (var_isset (var) && invisible_p (var) == 0) { #if defined (ARRAY_VARS) - temp = array_p (var) ? array_reference (array_cell (var), 0) : value_cell (var); + if (assoc_p (var)) + temp = assoc_reference (assoc_cell (var), "0"); + else if (array_p (var)) + temp = array_reference (array_cell (var), 0); + else + temp = value_cell (var); #else temp = value_cell (var); #endif @@ -4923,6 +5471,7 @@ parameter_brace_expand_word (name, var_is_special, quoted) { ret = alloc_word_desc (); ret->word = temp; + ret->flags |= rflags; } return ret; } @@ -4938,7 +5487,7 @@ parameter_brace_expand_indir (name, var_is_special, quoted, quoted_dollar_atp, c char *temp, *t; WORD_DESC *w; - w = parameter_brace_expand_word (name, var_is_special, quoted); + w = parameter_brace_expand_word (name, var_is_special, quoted, PF_IGNUNBOUND); t = w->word; /* Have to dequote here if necessary */ if (t) @@ -4955,7 +5504,7 @@ parameter_brace_expand_indir (name, var_is_special, quoted, quoted_dollar_atp, c if (t == 0) return (WORD_DESC *)NULL; - w = parameter_brace_expand_word (t, SPECIAL_VAR(t, 0), quoted); + w = parameter_brace_expand_word (t, SPECIAL_VAR(t, 0), quoted, 0); free (t); return w; @@ -4977,7 +5526,7 @@ parameter_brace_expand_rhs (name, value, c, quoted, qdollaratp, hasdollarat) /* If the entire expression is between double quotes, we want to treat the value as a double-quoted string, with the exception that we strip - embedded unescaped double quotes. */ + embedded unescaped double quotes (for sh backwards compatibility). */ if ((quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES)) && *value) { hasdol = 0; @@ -5175,9 +5724,12 @@ parameter_brace_expand_length (name) FREE (t); } #if defined (ARRAY_VARS) - else if ((var = find_variable (name + 1)) && (invisible_p (var) == 0) && array_p (var)) + else if ((var = find_variable (name + 1)) && (invisible_p (var) == 0) && (array_p (var) || assoc_p (var))) { - t = array_reference (array_cell (var), 0); + if (assoc_p (var)) + t = assoc_reference (assoc_cell (var), "0"); + else + t = array_reference (array_cell (var), 0); number = MB_STRLEN (t); } #endif @@ -5266,7 +5818,8 @@ skiparith (substr, delim) Return value is 1 if both values were OK, 0 if there was a problem with an invalid expression, or -1 if the values were out of range. */ static int -verify_substring_values (value, substr, vtype, e1p, e2p) +verify_substring_values (v, value, substr, vtype, e1p, e2p) + SHELL_VAR *v; char *value, *substr; int vtype; intmax_t *e1p, *e2p; @@ -5276,6 +5829,7 @@ verify_substring_values (value, substr, vtype, e1p, e2p) int expok; #if defined (ARRAY_VARS) ARRAY *a; + HASH_TABLE *h; #endif /* duplicate behavior of strchr(3) */ @@ -5300,13 +5854,24 @@ verify_substring_values (value, substr, vtype, e1p, e2p) break; case VT_POSPARMS: len = number_of_args () + 1; + if (*e1p == 0) + len++; /* add one arg if counting from $0 */ break; #if defined (ARRAY_VARS) case VT_ARRAYVAR: - a = (ARRAY *)value; /* For arrays, the first value deals with array indices. Negative - offsets count from one past the array's maximum index. */ - len = array_max_index (a) + (*e1p < 0); /* arrays index from 0 to n - 1 */ + offsets count from one past the array's maximum index. Associative + arrays treat the number of elements as the maximum index. */ + if (assoc_p (v)) + { + h = assoc_cell (v); + len = assoc_num_elements (h) + (*e1p < 0); + } + else + { + a = (ARRAY *)value; + len = array_max_index (a) + (*e1p < 0); /* arrays index from 0 to n - 1 */ + } break; #endif } @@ -5323,7 +5888,7 @@ verify_substring_values (value, substr, vtype, e1p, e2p) #if defined (ARRAY_VARS) /* For arrays, the second offset deals with the number of elements. */ if (vtype == VT_ARRAYVAR) - len = array_num_elements (a); + len = assoc_p (v) ? assoc_num_elements (h) : array_num_elements (a); #endif if (t) @@ -5389,14 +5954,15 @@ get_var_and_type (varname, value, quoted, varp, valp) if (valid_array_reference (varname)) { v = array_variable_part (varname, &temp, (int *)0); - if (v && array_p (v)) + if (v && (array_p (v) || assoc_p (v))) { /* [ */ if (ALL_ELEMENT_SUB (temp[0]) && temp[1] == ']') { + /* Callers have to differentiate betwen indexed and associative */ vtype = VT_ARRAYVAR; if (temp[0] == '*') vtype |= VT_STARSUB; - *valp = (char *)array_cell (v); + *valp = array_p (v) ? (char *)array_cell (v) : (char *)assoc_cell (v); } else { @@ -5415,13 +5981,17 @@ get_var_and_type (varname, value, quoted, varp, valp) *valp = dequote_escapes (value); } else - return -1; + { + vtype = VT_ARRAYMEMBER; + *varp = v; + *valp = array_value (varname, 1, (int *)NULL); + } } - else if ((v = find_variable (varname)) && (invisible_p (v) == 0) && array_p (v)) + else if ((v = find_variable (varname)) && (invisible_p (v) == 0) && (assoc_p (v) || array_p (v))) { vtype = VT_ARRAYMEMBER; *varp = v; - *valp = array_reference (array_cell (v), 0); + *valp = assoc_p (v) ? assoc_reference (assoc_cell (v), "0") : array_reference (array_cell (v), 0); } else #endif @@ -5506,7 +6076,7 @@ parameter_brace_substring (varname, value, substr, quoted) starsub = vtype & VT_STARSUB; vtype &= ~VT_STARSUB; - r = verify_substring_values (val, substr, vtype, &e1, &e2); + r = verify_substring_values (v, val, substr, vtype, &e1, &e2); this_command_name = oname; if (r <= 0) return ((r == 0) ? &expand_param_error : (char *)NULL); @@ -5542,17 +6112,17 @@ parameter_brace_substring (varname, value, substr, quoted) break; #if defined (ARRAY_VARS) case VT_ARRAYVAR: + if (assoc_p (v)) + /* we convert to list and take first e2 elements starting at e1th + element -- officially undefined for now */ + temp = assoc_subrange (assoc_cell (v), e1, e2, starsub, quoted); + else /* We want E2 to be the number of elements desired (arrays can be sparse, so verify_substring_values just returns the numbers specified and we rely on array_subrange to understand how to deal with them). */ - tt = array_subrange (array_cell (v), e1, e2, starsub, quoted); - if ((quoted & (Q_DOUBLE_QUOTES|Q_HERE_DOCUMENT)) == 0) - { - temp = tt ? quote_escapes (tt) : (char *)NULL; - FREE (tt); - } - else - temp = tt; + temp = array_subrange (array_cell (v), e1, e2, starsub, quoted); + /* array_subrange now calls array_quote_escapes as appropriate, so the + caller no longer needs to. */ break; #endif default: @@ -5634,7 +6204,13 @@ pat_subst (string, pat, rep, mflags) break; if (s == e) - e++, str++; /* avoid infinite recursion on zero-length match */ + { + /* On a zero-length match, make sure we copy one character, since + we increment one character to avoid infinite recursion. */ + RESIZE_MALLOCED_BUFFER (ret, rptr, 1, rsize, 64); + ret[rptr++] = *str++; + e++; /* avoid infinite recursion on zero-length match */ + } } /* Now copy the unmatched portion of the input string */ @@ -5658,6 +6234,7 @@ pos_params_pat_subst (string, pat, rep, mflags) WORD_LIST *save, *params; WORD_DESC *w; char *ret; + int pchar, qflags; save = params = list_rest_of_args (); if (save == 0) @@ -5672,10 +6249,22 @@ pos_params_pat_subst (string, pat, rep, mflags) params->word = w; } + pchar = (mflags & MATCH_STARSUB) == MATCH_STARSUB ? '*' : '@'; + qflags = (mflags & MATCH_QUOTED) == MATCH_QUOTED ? Q_DOUBLE_QUOTES : 0; + +#if 0 if ((mflags & (MATCH_QUOTED|MATCH_STARSUB)) == (MATCH_QUOTED|MATCH_STARSUB)) ret = string_list_dollar_star (quote_list (save)); + else if ((mflags & MATCH_STARSUB) == MATCH_STARSUB) + ret = string_list_dollar_star (save); + else if ((mflags & MATCH_QUOTED) == MATCH_QUOTED) + ret = string_list_dollar_at (save, qflags); else - ret = string_list ((mflags & MATCH_QUOTED) ? quote_list (save) : save); + ret = string_list_dollar_star (save); +#else + ret = string_list_pos_params (pchar, save, qflags); +#endif + dispose_words (save); return (ret); @@ -5690,7 +6279,7 @@ parameter_brace_patsub (varname, value, patsub, quoted) char *varname, *value, *patsub; int quoted; { - int vtype, mflags, starsub; + int vtype, mflags, starsub, delim; char *val, *temp, *pat, *rep, *p, *lpatsub, *tt; SHELL_VAR *v; @@ -5707,6 +6296,11 @@ parameter_brace_patsub (varname, value, patsub, quoted) vtype &= ~VT_STARSUB; mflags = 0; + if (patsub && *patsub == '/') + { + mflags |= MATCH_GLOBREP; + patsub++; + } /* Malloc this because expand_string_if_necessary or one of the expansion functions in its call chain may free it on a substitution error. */ @@ -5720,10 +6314,21 @@ parameter_brace_patsub (varname, value, patsub, quoted) /* If the pattern starts with a `/', make sure we skip over it when looking for the replacement delimiter. */ +#if 0 if (rep = quoted_strchr ((*patsub == '/') ? lpatsub+1 : lpatsub, '/', ST_BACKSL)) *rep++ = '\0'; else rep = (char *)NULL; +#else + delim = skip_to_delim (lpatsub, ((*patsub == '/') ? 1 : 0), "/", 0); + if (lpatsub[delim] == '/') + { + lpatsub[delim] = 0; + rep = lpatsub + delim + 1; + } + else + rep = (char *)NULL; +#endif if (rep && *rep == '\0') rep = (char *)NULL; @@ -5741,13 +6346,12 @@ parameter_brace_patsub (varname, value, patsub, quoted) } /* ksh93 doesn't allow the match specifier to be a part of the expanded - pattern. This is an extension. */ + pattern. This is an extension. Make sure we don't anchor the pattern + at the beginning or end of the string if we're doing global replacement, + though. */ p = pat; - if (pat && pat[0] == '/') - { - mflags |= MATCH_GLOBREP|MATCH_ANY; - p++; - } + if (mflags & MATCH_GLOBREP) + mflags |= MATCH_ANY; else if (pat && pat[0] == '#') { mflags |= MATCH_BEG; @@ -5781,7 +6385,7 @@ parameter_brace_patsub (varname, value, patsub, quoted) FREE (val); if (temp) { - tt = quote_escapes (temp); + tt = (mflags & MATCH_QUOTED) ? quote_string (temp) : quote_escapes (temp); free (temp); temp = tt; } @@ -5797,20 +6401,161 @@ parameter_brace_patsub (varname, value, patsub, quoted) break; #if defined (ARRAY_VARS) case VT_ARRAYVAR: - temp = array_patsub (array_cell (v), p, rep, mflags); - if (temp && (mflags & MATCH_QUOTED) == 0) + temp = assoc_p (v) ? assoc_patsub (assoc_cell (v), p, rep, mflags) + : array_patsub (array_cell (v), p, rep, mflags); + /* Don't call quote_escapes anymore; array_patsub calls + array_quote_escapes as appropriate before adding the + space separators; ditto for assoc_patsub. */ + break; +#endif + } + + FREE (pat); + FREE (rep); + free (lpatsub); + + return temp; +} + +/****************************************************************/ +/* */ +/* Functions to perform case modification on variable values */ +/* */ +/****************************************************************/ + +/* Do case modification on the positional parameters. */ + +static char * +pos_params_modcase (string, pat, modop, mflags) + char *string, *pat; + int modop; + int mflags; +{ + WORD_LIST *save, *params; + WORD_DESC *w; + char *ret; + int pchar, qflags; + + save = params = list_rest_of_args (); + if (save == 0) + return ((char *)NULL); + + for ( ; params; params = params->next) + { + ret = sh_modcase (params->word->word, pat, modop); + w = alloc_word_desc (); + w->word = ret ? ret : savestring (""); + dispose_word (params->word); + params->word = w; + } + + pchar = (mflags & MATCH_STARSUB) == MATCH_STARSUB ? '*' : '@'; + qflags = (mflags & MATCH_QUOTED) == MATCH_QUOTED ? Q_DOUBLE_QUOTES : 0; + + ret = string_list_pos_params (pchar, save, qflags); + dispose_words (save); + + return (ret); +} + +/* Perform case modification on VALUE, which is the expansion of + VARNAME. MODSPEC is an expression supplying the type of modification + to perform. QUOTED is a flags word containing the type of quoting + currently in effect. */ +static char * +parameter_brace_casemod (varname, value, modspec, patspec, quoted) + char *varname, *value; + int modspec; + char *patspec; + int quoted; +{ + int vtype, starsub, modop, mflags, x; + char *val, *temp, *pat, *p, *lpat, *tt; + SHELL_VAR *v; + + if (value == 0) + return ((char *)NULL); + + this_command_name = varname; + + vtype = get_var_and_type (varname, value, quoted, &v, &val); + if (vtype == -1) + return ((char *)NULL); + + starsub = vtype & VT_STARSUB; + vtype &= ~VT_STARSUB; + + modop = 0; + mflags = 0; + if (quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES)) + mflags |= MATCH_QUOTED; + if (starsub) + mflags |= MATCH_STARSUB; + + p = patspec; + if (modspec == '^') + { + x = p && p[0] == modspec; + modop = x ? CASE_UPPER : CASE_UPFIRST; + p += x; + } + else if (modspec == ',') + { + x = p && p[0] == modspec; + modop = x ? CASE_LOWER : CASE_LOWFIRST; + p += x; + } + else if (modspec == '~') + { + x = p && p[0] == modspec; + modop = x ? CASE_TOGGLEALL : CASE_TOGGLE; + p += x; + } + + lpat = p ? savestring (p) : 0; + /* Perform the same expansions on the pattern as performed by the + pattern removal expansions. FOR LATER */ + pat = lpat ? getpattern (lpat, quoted, 1) : 0; + + /* OK, now we do the case modification. */ + switch (vtype) + { + case VT_VARIABLE: + case VT_ARRAYMEMBER: + temp = sh_modcase (val, pat, modop); + if (vtype == VT_VARIABLE) + FREE (val); + if (temp) + { + tt = (mflags & MATCH_QUOTED) ? quote_string (temp) : quote_escapes (temp); + free (temp); + temp = tt; + } + break; + + case VT_POSPARMS: + temp = pos_params_modcase (val, pat, modop, mflags); + if (temp && (mflags & MATCH_QUOTED) == 0) { tt = quote_escapes (temp); free (temp); temp = tt; } break; + +#if defined (ARRAY_VARS) + case VT_ARRAYVAR: + temp = assoc_p (v) ? assoc_modcase (assoc_cell (v), pat, modop, mflags) + : array_modcase (array_cell (v), pat, modop, mflags); + /* Don't call quote_escapes; array_modcase calls array_quote_escapes + as appropriate before adding the space separators; ditto for + assoc_modcase. */ + break; #endif } FREE (pat); - FREE (rep); - free (lpatsub); + free (lpat); return temp; } @@ -5832,9 +6577,9 @@ chk_arithsub (s, len) i = count = 0; while (i < len) { - if (s[i] == '(') + if (s[i] == LPAREN) count++; - else if (s[i] == ')') + else if (s[i] == RPAREN) { count--; if (count < 0) @@ -5872,30 +6617,40 @@ chk_arithsub (s, len) /* */ /****************************************************************/ -/* ${[#][!]name[[:]#[#]%[%]-=?+[word][:e1[:e2]]]} */ +/* ${[#][!]name[[:][^[^]][,[,]]#[#]%[%]-=?+[word][:e1[:e2]]]} */ static WORD_DESC * -parameter_brace_expand (string, indexp, quoted, quoted_dollar_atp, contains_dollar_at) +parameter_brace_expand (string, indexp, quoted, pflags, quoted_dollar_atp, contains_dollar_at) char *string; - int *indexp, quoted, *quoted_dollar_atp, *contains_dollar_at; + int *indexp, quoted, *quoted_dollar_atp, *contains_dollar_at, pflags; { int check_nullness, var_is_set, var_is_null, var_is_special; - int want_substring, want_indir, want_patsub; + int want_substring, want_indir, want_patsub, want_casemod; char *name, *value, *temp, *temp1; WORD_DESC *tdesc, *ret; - int t_index, sindex, c, tflag; + int t_index, sindex, c, tflag, modspec; intmax_t number; - value = (char *)NULL; + temp = temp1 = value = (char *)NULL; var_is_set = var_is_null = var_is_special = check_nullness = 0; - want_substring = want_indir = want_patsub = 0; + want_substring = want_indir = want_patsub = want_casemod = 0; sindex = *indexp; t_index = ++sindex; /* ${#var} doesn't have any of the other parameter expansions on it. */ if (string[t_index] == '#' && legal_variable_starter (string[t_index+1])) /* {{ */ - name = string_extract (string, &t_index, "}", EX_VARNAME); + name = string_extract (string, &t_index, "}", SX_VARNAME); else - name = string_extract (string, &t_index, "#%:-=?+/}", EX_VARNAME); +#if defined (CASEMOD_EXPANSIONS) + /* To enable case-toggling expansions using the `~' operator character + change the 1 to 0. */ +# if defined (CASEMOD_CAPCASE) + name = string_extract (string, &t_index, "#%^,~:-=?+/}", SX_VARNAME); +# else + name = string_extract (string, &t_index, "#%^,:-=?+/}", SX_VARNAME); +# endif /* CASEMOD_CAPCASE */ +#else + name = string_extract (string, &t_index, "#%:-=?+/}", SX_VARNAME); +#endif /* CASEMOD_EXPANSIONS */ ret = 0; tflag = 0; @@ -5949,6 +6704,13 @@ parameter_brace_expand (string, indexp, quoted, quoted_dollar_atp, contains_doll want_substring = 1; else if (c == '/' && string[sindex] != RBRACE) want_patsub = 1; +#if defined (CASEMOD_EXPANSIONS) + else if (c == '^' || c == ',' || c == '~') + { + modspec = c; + want_casemod = 1; + } +#endif /* Catch the valid and invalid brace expressions that made it through the tests above. */ @@ -6046,7 +6808,7 @@ parameter_brace_expand (string, indexp, quoted, quoted_dollar_atp, contains_doll *contains_dollar_at = 1; } free (x); - free (xlist); + dispose_words (xlist); free (temp1); *indexp = sindex; @@ -6067,7 +6829,7 @@ parameter_brace_expand (string, indexp, quoted, quoted_dollar_atp, contains_doll FREE (x); if (ALL_ELEMENT_SUB (x1[0]) && x1[1] == ']') { - temp = array_keys (temp1, quoted); + temp = array_keys (temp1, quoted); /* handles assoc vars too */ if (x1[0] == '@') { if ((quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES)) && quoted_dollar_atp) @@ -6099,7 +6861,7 @@ parameter_brace_expand (string, indexp, quoted, quoted_dollar_atp, contains_doll if (want_indir) tdesc = parameter_brace_expand_indir (name + 1, var_is_special, quoted, quoted_dollar_atp, contains_dollar_at); else - tdesc = parameter_brace_expand_word (name, var_is_special, quoted); + tdesc = parameter_brace_expand_word (name, var_is_special, quoted, PF_IGNUNBOUND|(pflags&PF_NOSPLIT2)); if (tdesc) { @@ -6167,8 +6929,32 @@ parameter_brace_expand (string, indexp, quoted, quoted_dollar_atp, contains_doll ret = alloc_word_desc (); ret->word = temp1; + ret = alloc_word_desc (); + ret->word = temp1; + if (temp1 && QUOTED_NULL (temp1) && (quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES))) + ret->flags |= W_QUOTED|W_HASQUOTEDNULL; return ret; } +#if defined (CASEMOD_EXPANSIONS) + else if (want_casemod) + { + temp1 = parameter_brace_casemod (name, temp, modspec, value, quoted); + FREE (name); + FREE (value); + FREE (temp); + + if (temp1 == &expand_param_error) + return (&expand_wdesc_error); + else if (temp1 == &expand_param_fatal) + return (&expand_wdesc_fatal); + + ret = alloc_word_desc (); + ret->word = temp1; + if (temp1 && QUOTED_NULL (temp1) && (quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES))) + ret->flags |= W_QUOTED|W_HASQUOTEDNULL; + return ret; + } +#endif /* Do the right thing based on which character ended the variable name. */ switch (c) @@ -6183,13 +6969,13 @@ parameter_brace_expand (string, indexp, quoted, quoted_dollar_atp, contains_doll return &expand_wdesc_error; case RBRACE: - if (var_is_set == 0 && unbound_vars_is_error) + if (var_is_set == 0 && unbound_vars_is_error && ((name[0] != '@' && name[0] != '*') || name[1])) { + last_command_exit_value = EXECUTION_FAILURE; err_unboundvar (name); FREE (value); FREE (temp); free (name); - last_command_exit_value = EXECUTION_FAILURE; return (interactive_shell ? &expand_wdesc_error : &expand_wdesc_fatal); } break; @@ -6204,8 +6990,12 @@ parameter_brace_expand (string, indexp, quoted, quoted_dollar_atp, contains_doll temp1 = parameter_brace_remove_pattern (name, temp, value, c, quoted); free (temp); free (value); - temp = temp1; - break; + + ret = alloc_word_desc (); + ret->word = temp1; + if (temp1 && QUOTED_NULL (temp1) && (quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES))) + ret->flags |= W_QUOTED|W_HASQUOTEDNULL; + return ret; case '-': case '=': @@ -6341,8 +7131,8 @@ param_expand (string, sindex, quoted, expanded_something, uerror[0] = '$'; uerror[1] = c; uerror[2] = '\0'; - err_unboundvar (uerror); last_command_exit_value = EXECUTION_FAILURE; + err_unboundvar (uerror); return (interactive_shell ? &expand_wdesc_error : &expand_wdesc_fatal); } if (temp1) @@ -6389,8 +7179,8 @@ param_expand (string, sindex, quoted, expanded_something, uerror[0] = '$'; uerror[1] = c; uerror[2] = '\0'; - err_unboundvar (uerror); last_command_exit_value = EXECUTION_FAILURE; + err_unboundvar (uerror); return (interactive_shell ? &expand_wdesc_error : &expand_wdesc_fatal); } } @@ -6402,19 +7192,39 @@ param_expand (string, sindex, quoted, expanded_something, case '*': /* `$*' */ list = list_rest_of_args (); +#if 0 + /* According to austin-group posix proposal by Geoff Clare in + <20090505091501.GA10097@squonk.masqnet> of 5 May 2009: + + "The shell shall write a message to standard error and + immediately exit when it tries to expand an unset parameter + other than the '@' and '*' special parameters." + */ + + if (list == 0 && unbound_vars_is_error && (pflags & PF_IGNUNBOUND) == 0) + { + uerror[0] = '$'; + uerror[1] = '*'; + uerror[2] = '\0'; + last_command_exit_value = EXECUTION_FAILURE; + err_unboundvar (uerror); + return (interactive_shell ? &expand_wdesc_error : &expand_wdesc_fatal); + } +#endif + /* If there are no command-line arguments, this should just disappear if there are other characters in the expansion, even if it's quoted. */ if ((quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES)) && list == 0) temp = (char *)NULL; - else if (quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES)) + else if (quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES|Q_PATQUOTE)) { /* If we have "$*" we want to make a string of the positional parameters, separated by the first character of $IFS, and quote the whole string, including the separators. If IFS is unset, the parameters are separated by ' '; if $IFS is null, the parameters are concatenated. */ - temp = (quoted & Q_DOUBLE_QUOTES) ? string_list_dollar_star (list) : string_list (list); + temp = (quoted & (Q_DOUBLE_QUOTES|Q_PATQUOTE)) ? string_list_dollar_star (list) : string_list (list); temp1 = quote_string (temp); if (*temp == 0) tflag |= W_HASQUOTEDNULL; @@ -6454,16 +7264,42 @@ param_expand (string, sindex, quoted, expanded_something, case '@': /* `$@' */ list = list_rest_of_args (); +#if 0 + /* According to austin-group posix proposal by Geoff Clare in + <20090505091501.GA10097@squonk.masqnet> of 5 May 2009: + + "The shell shall write a message to standard error and + immediately exit when it tries to expand an unset parameter + other than the '@' and '*' special parameters." + */ + + if (list == 0 && unbound_vars_is_error && (pflags & PF_IGNUNBOUND) == 0) + { + uerror[0] = '$'; + uerror[1] = '@'; + uerror[2] = '\0'; + last_command_exit_value = EXECUTION_FAILURE; + err_unboundvar (uerror); + return (interactive_shell ? &expand_wdesc_error : &expand_wdesc_fatal); + } +#endif + /* We want to flag the fact that we saw this. We can't turn off quoting entirely, because other characters in the string might need it (consider "\"$@\""), but we need some way to signal that the final split on the first character of $IFS should be done, even though QUOTED is 1. */ + /* XXX - should this test include Q_PATQUOTE? */ if (quoted_dollar_at_p && (quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES))) *quoted_dollar_at_p = 1; if (contains_dollar_at) *contains_dollar_at = 1; +#if 0 + if (pflags & PF_NOSPLIT2) + temp = string_list_internal (quoted ? quote_list (list) : list, " "); + else +#endif /* We want to separate the positional parameters with the first character of $IFS in case $IFS is something other than a space. We also want to make sure that splitting is done no matter what -- @@ -6475,7 +7311,7 @@ param_expand (string, sindex, quoted, expanded_something, break; case LBRACE: - tdesc = parameter_brace_expand (string, &zindex, quoted, + tdesc = parameter_brace_expand (string, &zindex, quoted, pflags, quoted_dollar_at_p, contains_dollar_at); @@ -6510,7 +7346,7 @@ param_expand (string, sindex, quoted, expanded_something, case LPAREN: /* We have to extract the contents of this paren substitution. */ t_index = zindex + 1; - temp = extract_command_subst (string, &t_index); + temp = extract_command_subst (string, &t_index, 0); zindex = t_index; /* For Posix.2-style `$(( ))' arithmetic substitution, @@ -6534,6 +7370,9 @@ param_expand (string, sindex, quoted, expanded_something, if (chk_arithsub (temp2, t_index) == 0) { free (temp2); +#if 0 + internal_warning (_("future versions of the shell will force evaluation as an arithmetic substitution")); +#endif goto comsub; } @@ -6566,7 +7405,12 @@ comsub: /* we need zindex+1 because string[zindex] == RPAREN */ temp1 = substring (string, *sindex, zindex+1); else - temp1 = command_substitute (temp, quoted); + { + tdesc = command_substitute (temp, quoted); + temp1 = tdesc ? tdesc->word : (char *)NULL; + if (tdesc) + dispose_word_desc (tdesc); + } FREE (temp); temp = temp1; break; @@ -6578,6 +7422,13 @@ comsub: t_index = zindex + 1; temp = extract_arithmetic_subst (string, &t_index); zindex = t_index; + if (temp == 0) + { + temp = savestring (string); + if (expanded_something) + *expanded_something = 0; + goto return0; + } /* Do initial variable expansion. */ temp1 = expand_arith_string (temp, Q_DOUBLE_QUOTES); @@ -6610,9 +7461,10 @@ comsub: if (var && invisible_p (var) == 0 && var_isset (var)) { #if defined (ARRAY_VARS) - if (array_p (var)) + if (assoc_p (var) || array_p (var)) { - temp = array_reference (array_cell (var), 0); + temp = array_p (var) ? array_reference (array_cell (var), 0) + : assoc_reference (assoc_cell (var), "0"); if (temp) temp = (*temp && (quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES))) ? quote_string (temp) @@ -6639,7 +7491,10 @@ comsub: unbound_variable: if (unbound_vars_is_error) - err_unboundvar (temp1); + { + last_command_exit_value = EXECUTION_FAILURE; + err_unboundvar (temp1); + } else { free (temp1); @@ -6737,6 +7592,7 @@ expand_word_internal (word, quoted, isexp, contains_dollar_at, expanded_somethin int had_quoted_null; int has_dollar_at; int tflag; + int pflags; /* flags passed to param_expand */ int assignoff; /* If assignment, offset of `=' */ @@ -6845,7 +7701,12 @@ add_string: assignment statements. We now do tilde expansion on such words even in POSIX mode. */ if (word->flags & (W_ASSIGNRHS|W_NOTILDE)) - goto add_character; + { + if (isexp == 0 && (word->flags & (W_NOSPLIT|W_NOSPLIT2)) == 0 && isifs (c)) + goto add_ifs_character; + else + goto add_character; + } /* If we're not in posix mode or forcing assignment-statement tilde expansion, note where the `=' appears in the word and prepare to do tilde expansion following the first `='. */ @@ -6861,16 +7722,28 @@ add_string: string[sindex+1] == '~') word->flags |= W_ITILDE; #endif - goto add_character; + if (isexp == 0 && (word->flags & (W_NOSPLIT|W_NOSPLIT2)) == 0 && isifs (c)) + goto add_ifs_character; + else + goto add_character; case ':': if (word->flags & W_NOTILDE) - goto add_character; + { + if (isexp == 0 && (word->flags & (W_NOSPLIT|W_NOSPLIT2)) == 0 && isifs (c)) + goto add_ifs_character; + else + goto add_character; + } if ((word->flags & (W_ASSIGNMENT|W_ASSIGNRHS|W_TILDEEXP)) && string[sindex+1] == '~') word->flags |= W_ITILDE; - goto add_character; + + if (isexp == 0 && (word->flags & (W_NOSPLIT|W_NOSPLIT2)) == 0 && isifs (c)) + goto add_ifs_character; + else + goto add_character; case '~': /* If the word isn't supposed to be tilde expanded, or we're not @@ -6881,7 +7754,10 @@ add_string: (quoted & (Q_DOUBLE_QUOTES|Q_HERE_DOCUMENT))) { word->flags &= ~W_ITILDE; - goto add_character; + if (isexp == 0 && (word->flags & (W_NOSPLIT|W_NOSPLIT2)) == 0 && isifs (c) && (quoted & (Q_DOUBLE_QUOTES|Q_HERE_DOCUMENT)) == 0) + goto add_ifs_character; + else + goto add_character; } if (word->flags & W_ASSIGNRHS) @@ -6907,7 +7783,7 @@ add_string: free (temp); temp = temp1; sindex += t_index; - goto add_string; + goto add_quoted_string; /* XXX was add_string */ } else { @@ -6920,10 +7796,12 @@ add_string: *expanded_something = 1; has_dollar_at = 0; + pflags = (word->flags & W_NOCOMSUB) ? PF_NOCOMSUB : 0; + if (word->flags & W_NOSPLIT2) + pflags |= PF_NOSPLIT2; tword = param_expand (string, &sindex, quoted, expanded_something, &has_dollar_at, "ed_dollar_at, - &had_quoted_null, - (word->flags & W_NOCOMSUB) ? PF_NOCOMSUB : 0); + &had_quoted_null, pflags); if (tword == &expand_wdesc_error || tword == &expand_wdesc_fatal) { @@ -6948,7 +7826,7 @@ add_string: { t_index = sindex++; - temp = string_extract (string, &sindex, "`", EX_REQMATCH); + temp = string_extract (string, &sindex, "`", SX_REQMATCH); /* The test of sindex against t_index is to allow bare instances of ` to pass through, for backwards compatibility. */ if (temp == &extract_string_error || temp == &extract_string_fatal) @@ -6958,7 +7836,7 @@ add_string: sindex = t_index; goto add_character; } - report_error ("bad substitution: no closing \"`\" in %s", string+t_index); + report_error (_("bad substitution: no closing \"`\" in %s") , string+t_index); free (string); free (istring); return ((temp == &extract_string_error) ? &expand_word_error @@ -6974,7 +7852,10 @@ add_string: else { de_backslash (temp); - temp1 = command_substitute (temp, quoted); + tword = command_substitute (temp, quoted); + temp1 = tword ? tword->word : (char *)NULL; + if (tword) + dispose_word_desc (tword); } FREE (temp); temp = temp1; @@ -7115,6 +7996,11 @@ add_twochars: { if (list->next) { +#if 0 + if (quoted_dollar_at && word->flags & W_NOSPLIT2) + temp = string_list_internal (quote_list (list), " "); + else +#endif /* Testing quoted_dollar_at makes sure that "$@" is split correctly when $IFS does not contain a space. */ temp = quoted_dollar_at @@ -7218,6 +8104,7 @@ add_twochars: default: /* This is the fix for " $@ " */ + add_ifs_character: if ((quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES)) || (isexp == 0 && isifs (c))) { if (string[sindex]) /* from old goto dollar_add_string */ @@ -7402,6 +8289,11 @@ string_quote_removal (string, quoted) { case '\\': c = string[++sindex]; + if (c == 0) + { + *r++ = '\\'; + break; + } if (((quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES)) || dquote) && (sh_syntaxtab[c] & CBSDQUOTE) == 0) *r++ = '\\'; /* FALLTHROUGH */ @@ -7500,11 +8392,7 @@ setifs (v) unsigned char uc; ifs_var = v; -#if 0 - ifs_value = v ? value_cell (v) : " \t\n"; -#else ifs_value = (v && value_cell (v)) ? value_cell (v) : " \t\n"; -#endif /* Should really merge ifs_cmap with sh_syntaxtab. XXX - doesn't yet handle multibyte chars in IFS */ @@ -7603,9 +8491,15 @@ static void exp_jump_to_top_level (v) int v; { + set_pipestatus_from_exit (last_command_exit_value); + /* Cleanup code goes here. */ expand_no_split_dollar_star = 0; /* XXX */ expanding_redir = 0; + assigning_in_environment = 0; + + if (parse_and_execute_level == 0) + top_level_cleanup (); /* from sig.c */ jump_to_top_level (v); } @@ -7625,7 +8519,7 @@ separate_out_assignments (tlist) { register WORD_LIST *vp, *lp; - if (!tlist) + if (tlist == 0) return ((WORD_LIST *)NULL); if (subst_assign_varlist) @@ -7824,7 +8718,7 @@ glob_expand_word_list (tlist, eflags) else if (fail_glob_expansion != 0) { report_error (_("no match: %s"), tlist->word->word); - jump_to_top_level (DISCARD); + exp_jump_to_top_level (DISCARD); } else if (allow_null_glob_expansion == 0) { @@ -7877,14 +8771,21 @@ brace_expand_word_list (tlist, eflags) { next = tlist->next; + if ((tlist->word->flags & (W_COMPASSIGN|W_ASSIGNARG)) == (W_COMPASSIGN|W_ASSIGNARG)) + { +/*itrace("brace_expand_word_list: %s: W_COMPASSIGN|W_ASSIGNARG", tlist->word->word);*/ + PREPEND_LIST (tlist, output_list); + continue; + } + /* Only do brace expansion if the word has a brace character. If not, just add the word list element to BRACES and continue. In the common case, at least when running shell scripts, this will - degenerate to a bunch of calls to `xstrchr', and then what is + degenerate to a bunch of calls to `mbschr', and then what is basically a reversal of TLIST into BRACES, which is corrected by a call to REVERSE_LIST () on BRACES when the end of TLIST is reached. */ - if (xstrchr (tlist->word->word, LBRACE)) + if (mbschr (tlist->word->word, LBRACE)) { expansions = brace_expand (tlist->word->word); @@ -7919,6 +8820,30 @@ brace_expand_word_list (tlist, eflags) } #endif +#if defined (ARRAY_VARS) +/* Take WORD, a compound associative array assignment, and internally run + 'declare -A w', where W is the variable name portion of WORD. */ +static int +make_internal_declare (word, option) + char *word; + char *option; +{ + int t; + WORD_LIST *wl; + WORD_DESC *w; + + w = make_word (word); + + t = assignment (w->word, 0); + w->word[t] = '\0'; + + wl = make_word_list (w, (WORD_LIST *)NULL); + wl = make_word_list (make_word (option), wl); + + return (declare_builtin (wl)); +} +#endif + static WORD_LIST * shell_expand_word_list (tlist, eflags) WORD_LIST *tlist; @@ -7947,6 +8872,9 @@ shell_expand_word_list (tlist, eflags) { int t; + if (tlist->word->flags & W_ASSIGNASSOC) + make_internal_declare (tlist->word->word, "-A"); + t = do_word_assignment (tlist->word); if (t == 0) { @@ -7957,7 +8885,7 @@ shell_expand_word_list (tlist, eflags) /* Now transform the word as ksh93 appears to do and go on */ t = assignment (tlist->word->word, 0); tlist->word->word[t] = '\0'; - tlist->word->flags &= ~(W_ASSIGNMENT|W_NOSPLIT|W_COMPASSIGN|W_ASSIGNARG); + tlist->word->flags &= ~(W_ASSIGNMENT|W_NOSPLIT|W_COMPASSIGN|W_ASSIGNARG|W_ASSIGNASSOC); } #endif @@ -8106,7 +9034,9 @@ expand_word_list_internal (list, eflags) for (temp_list = subst_assign_varlist; temp_list; temp_list = temp_list->next) { this_command_name = (char *)NULL; + assigning_in_environment = (assign_func == assign_in_env); tint = (*assign_func) (temp_list->word); + assigning_in_environment = 0; /* Variable assignment errors in non-interactive shells running in Posix.2 mode cause the shell to exit. */ if (tint == 0) |