diff options
| author | Pete Travis <immanetize@fedoraproject.org> | 2014-09-26 14:32:59 -0600 |
|---|---|---|
| committer | Pete Travis <immanetize@fedoraproject.org> | 2014-09-26 14:32:59 -0600 |
| commit | fe5673aed2053463a7164ec5e7b609877340c0fa (patch) | |
| tree | f7db962c06e191244951fa2f415c79325051892d /SOURCES/funcdef-import-3.1.patch | |
| parent | 08b01b8f3f227bda87ee2591c7e6ccb379fad187 (diff) | |
| download | rpmbuild-fe5673aed2053463a7164ec5e7b609877340c0fa.tar.gz rpmbuild-fe5673aed2053463a7164ec5e7b609877340c0fa.tar.xz rpmbuild-fe5673aed2053463a7164ec5e7b609877340c0fa.zip | |
SLES10 bash init
Diffstat (limited to 'SOURCES/funcdef-import-3.1.patch')
| -rw-r--r-- | SOURCES/funcdef-import-3.1.patch | 72 |
1 files changed, 72 insertions, 0 deletions
diff --git a/SOURCES/funcdef-import-3.1.patch b/SOURCES/funcdef-import-3.1.patch new file mode 100644 index 0000000..4393211 --- /dev/null +++ b/SOURCES/funcdef-import-3.1.patch @@ -0,0 +1,72 @@ +*** ../bash-3.1.17/builtins/common.h 2004-09-09 13:21:08.000000000 -0400 +--- builtins/common.h 2014-09-16 22:00:02.000000000 -0400 +*************** +*** 34,37 **** +--- 34,39 ---- + + /* Flags for describe_command, shared between type.def and command.def */ ++ #define SEVAL_FUNCDEF 0x080 /* only allow function definitions */ ++ #define SEVAL_ONECMD 0x100 /* only allow a single command */ + #define CDESC_ALL 0x001 /* type -a */ + #define CDESC_SHORTDESC 0x002 /* command -V */ +*** ../bash-3.1.17/builtins/evalstring.c 2005-10-30 18:28:24.000000000 -0500 +--- builtins/evalstring.c 2014-09-16 22:00:02.000000000 -0400 +*************** +*** 224,227 **** +--- 224,235 ---- + struct fd_bitmap *bitmap; + ++ if ((flags & SEVAL_FUNCDEF) && command->type != cm_function_def) ++ { ++ internal_warning ("%s: ignoring function definition attempt", from_file); ++ should_jump_to_top_level = 0; ++ last_result = last_command_exit_value = EX_BADUSAGE; ++ break; ++ } ++ + bitmap = new_fd_bitmap (FD_BITMAP_SIZE); + begin_unwind_frame ("pe_dispose"); +*************** +*** 279,282 **** +--- 287,293 ---- + dispose_fd_bitmap (bitmap); + discard_unwind_frame ("pe_dispose"); ++ ++ if (flags & SEVAL_ONECMD) ++ break; + } + } +*** ../bash-3.1.17/variables.c 2006-03-10 16:56:29.000000000 -0500 +--- variables.c 2014-09-16 22:00:02.000000000 -0400 +*************** +*** 311,320 **** + strcpy (temp_string + char_index + 1, string); + +! parse_and_execute (temp_string, name, SEVAL_NONINT|SEVAL_NOHIST); +! +! /* Ancient backwards compatibility. Old versions of bash exported +! functions like name()=() {...} */ +! if (name[char_index - 1] == ')' && name[char_index - 2] == '(') +! name[char_index - 2] = '\0'; + + if (temp_var = find_function (name)) +--- 311,318 ---- + strcpy (temp_string + char_index + 1, string); + +! /* Don't import function names that are invalid identifiers from the +! environment. */ +! if (legal_identifier (name)) +! parse_and_execute (temp_string, name, SEVAL_NONINT|SEVAL_NOHIST|SEVAL_FUNCDEF|SEVAL_ONECMD); + + if (temp_var = find_function (name)) +*************** +*** 325,332 **** + else + report_error (_("error importing function definition for `%s'"), name); +- +- /* ( */ +- if (name[char_index - 1] == ')' && name[char_index - 2] == '\0') +- name[char_index - 2] = '('; /* ) */ + } + #if defined (ARRAY_VARS) +--- 323,326 ---- |