source: patches/bash-4.1-branch_update-1.patch@ 986e898d

clfs-1.2 clfs-2.1 clfs-3.0.0-systemd clfs-3.0.0-sysvinit systemd sysvinit
Last change on this file since 986e898d was e9b21a8, checked in by Joe Ciccone <jciccone@…>, 14 years ago

Updated Bash to 4.1p7.
  • Property mode set to 100644
File size: 5.0 KB

  • bashline.c 

    Submitted By: Joe Ciccone <jciccone@gmail.com>
Date: 07-25-2010
Initial Package Version: 4.1
Origin: Upstream
Upstream Status: From Upstream
Description: Contains all upstream patches up to 4.1-007

diff -Naur bash-4.1.orig//bashline.c bash-4.1/bashline.c
    old new  
    16801680     a single match (multiple matches that end up reducing the number of
    16811681     characters in the common prefix are bad) will ever be returned on
    16821682     regular completion. */
    1683   if (glob_pattern_p (hint))
     1683  if (globpat)
    16841684    {
    16851685      if (state == 0)
    16861686        {

  • builtins/printf.def 

    diff -Naur bash-4.1.orig//builtins/printf.def bash-4.1/builtins/printf.def
    old new  
    117117    else if (have_fieldwidth) \
    118118      nw = vflag ? vbprintf (f, fieldwidth, func) : printf (f, fieldwidth, func); \
    119119    else if (have_precision) \
    120       nw = vflag ? vbprintf (f, precision, func) : printf (f, fieldwidth, func); \
     120      nw = vflag ? vbprintf (f, precision, func) : printf (f, precision, func); \
    121121    else \
    122122      nw = vflag ? vbprintf (f, func) : printf (f, func); \
    123123    tw += nw; \
    … …  
    172172#endif
    173173
    174174#if !HAVE_VSNPRINTF
    175 extern int vsnprintf __P((char *, size_t, const char *, ...)) __attribute__((__format__ (printf, 3, 4)));
     175extern int vsnprintf __P((char *, size_t, const char *, va_list)) __attribute__((__format__ (printf, 3, 0)));
    176176#endif
    177177
    178178static void printf_erange __P((char *));

  • builtins/read.def 

    diff -Naur bash-4.1.orig//builtins/read.def bash-4.1/builtins/read.def
    old new  
    615615  if (unbuffered_read == 0)
    616616    zsyncfd (fd);
    617617
    618   interrupt_immediately--;
    619   terminate_immediately--;
    620618  discard_unwind_frame ("read_builtin");
    621619
    622620  retval = eof ? EXECUTION_FAILURE : EXECUTION_SUCCESS;
    623621
    624622assign_vars:
    625623
     624  interrupt_immediately--;
     625  terminate_immediately--;
     626
    626627#if defined (ARRAY_VARS)
    627628  /* If -a was given, take the string read, break it into a list of words,
    628629     an assign them to `arrayname' in turn. */

  • lib/readline/complete.c 

    diff -Naur bash-4.1.orig//lib/readline/complete.c bash-4.1/lib/readline/complete.c
    old new  
    21382138         All other entries except "." and ".." match. */
    21392139      if (filename_len == 0)
    21402140        {
    2141           if (_rl_match_hidden_files == 0 && HIDDEN_FILE (entry->d_name))
     2141          if (_rl_match_hidden_files == 0 && HIDDEN_FILE (convfn))
    21422142            continue;
    21432143
    21442144          if (convfn[0] != '.' ||
    … …  
    22192219                temp[dirlen++] = '/';
    22202220            }
    22212221
    2222           strcpy (temp + dirlen, entry->d_name);
     2222          strcpy (temp + dirlen, convfn);
    22232223        }
    22242224      else
    22252225        temp = savestring (convfn);

  • patchlevel.h 

    diff -Naur bash-4.1.orig//patchlevel.h bash-4.1/patchlevel.h
    old new  
    2525   regexp `^#define[    ]*PATCHLEVEL', since that's what support/mkversion.sh
    2626   looks for to find the patch level (for the sccs version string). */
    2727
    28 #define PATCHLEVEL 0
     28#define PATCHLEVEL 7
    2929
    3030#endif /* _PATCHLEVEL_H_ */

  • print_cmd.c 

    diff -Naur bash-4.1.orig//print_cmd.c bash-4.1/print_cmd.c
    old new  
    113113
    114114#define CHECK_XTRACE_FP xtrace_fp = (xtrace_fp ? xtrace_fp : stderr)
    115115
     116#define PRINT_DEFERRED_HEREDOCS(x) \
     117  do { \
     118    if (deferred_heredocs) \
     119      print_deferred_heredocs (x); \
     120  } while (0)
     121
    116122/* Non-zero means the stuff being printed is inside of a function def. */
    117123static int inside_function_def;
    118124static int skip_this_indent;
    … …  
    560566     FOR_COM *for_command;
    561567{
    562568  print_for_command_head (for_command);
    563 
    564569  cprintf (";");
    565570  newline ("do\n");
     571
    566572  indentation += indentation_amount;
    567573  make_command_string_internal (for_command->action);
     574  PRINT_DEFERRED_HEREDOCS ("");
    568575  semicolon ();
    569576  indentation -= indentation_amount;
     577
    570578  newline ("done");
    571579}
    572580

  • variables.c 

    diff -Naur bash-4.1.orig//variables.c bash-4.1/variables.c
    old new  
    38083808
    38093809  if (tempvar_p (var) && (posixly_correct || (var->attributes & att_propagate)))
    38103810    {
     3811      /* Make sure we have a hash table to store the variable in while it is
     3812         being propagated down to the global variables table.  Create one if
     3813         we have to */
     3814      if ((vc_isfuncenv (shell_variables) || vc_istempenv (shell_variables)) && shell_variables->table == 0)
     3815        shell_variables->table = hash_create (0);
    38113816      /* XXX - should we set v->context here? */
    38123817      v = bind_variable_internal (var->name, value_cell (var), shell_variables->table, 0, 0);
    38133818      if (shell_variables == global_variables)
Note: See TracBrowser for help on using the repository browser.