app-shells/bash/files/bash-4.x-deferred-heredocs.patch


1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47

http://bugs.gentoo.org/310197
http://lists.gnu.org/archive/html/bug-bash/2010-03/msg00063.html

fix heredocs handling in `set` output

*** bash-4.1/print_cmd.c
--- bash-4.1/print_cmd.c
***************
*** 114,117 ****
--- 114,123 ----
  #define CHECK_XTRACE_FP	xtrace_fp = (xtrace_fp ? xtrace_fp : stderr)
  
+ #define PRINT_DEFERRED_HEREDOCS(x) \
+   do { \
+     if (deferred_heredocs) \
+       print_deferred_heredocs (x); \
+   } while (0)
+ 
  /* Non-zero means the stuff being printed is inside of a function def. */
  static int inside_function_def;
***************
*** 561,571 ****
  {
    print_for_command_head (for_command);
- 
    cprintf (";");
    newline ("do\n");
    indentation += indentation_amount;
    make_command_string_internal (for_command->action);
    semicolon ();
    indentation -= indentation_amount;
    newline ("done");
  }
--- 566,578 ----
  {
    print_for_command_head (for_command);
    cprintf (";");
    newline ("do\n");
+ 
    indentation += indentation_amount;
    make_command_string_internal (for_command->action);
+   PRINT_DEFERRED_HEREDOCS ("");
    semicolon ();
    indentation -= indentation_amount;
+ 
    newline ("done");
  }