pmodules/bash
0
0
Fork 0
mirror of https://https.git.savannah.gnu.org/git/bash.git synced 2026-06-30 17:09:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

Bash-5.2 patch 3: preserve newlines while parsing command substitutions

Browse Source
This commit is contained in:
Chet Ramey
2022-11-07 11:39:47 -05:00
parent a99d905216
commit 3039110d08
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
patchlevel.h
+1 -1
View File
@@ -25,6 +25,6 @@
regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh
looks for to find the patch level (for the sccs version string). */
#define PATCHLEVEL 2
#define PATCHLEVEL 3
#endif /* _PATCHLEVEL_H_ */
print_cmd.c
+13 -2
View File
@@ -297,10 +297,12 @@ make_command_string_internal (command)
case '\n': /* special case this */
{
char c = command->value.Connection->connector;
int was_newline;
s[0] = printing_comsub ? c : ';';
s[1] = '\0';
was_newline = deferred_heredocs == 0 && was_heredoc == 0 && c == '\n';
if (deferred_heredocs == 0)
{
if (was_heredoc == 0)
@@ -314,6 +316,8 @@ make_command_string_internal (command)
if (inside_function_def)
cprintf ("\n");
else if (printing_comsub && c == '\n' && was_newline == 0)
cprintf ("\n"); /* preserve newlines in comsubs but don't double them */
else
{
if (c == ';')
@@ -1365,7 +1369,11 @@ print_function_def (func)
cmdcopy->redirects = func_redirects;
}
else
newline ("}");
{
/* { */
newline ("}");
was_heredoc = 0; /* not printing any here-documents now */
}
dispose_command (cmdcopy);
}
@@ -1442,7 +1450,10 @@ named_function_string (name, command, flags)
cmdcopy->redirects = func_redirects;
}
else
newline ("}");
{ /* { */
newline ("}");
was_heredoc = 0;
}
result = the_printed_command;