Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 204d779

Browse filesBrowse files
committed
Use mode "r" for popen() in psql's evaluate_backtick().
In almost all other places, we use plain "r" or "w" mode in popen() calls (the exceptions being for COPY data). This one has been overlooked (possibly because it's buried in a ".l" flex file?), but it's using PG_BINARY_R. Kensuke Okamura complained in bug #16688 that we fail to strip \r when stripping the trailing newline from a backtick result string. That's true enough, but we'd also fail to convert embedded \r\n cleanly, which also seems undesirable. Fixing the popen() mode seems like the best way to deal with this. It's been like this for a long time, so back-patch to all supported branches. Discussion: https://postgr.es/m/16688-c649c7b69cd7e6f8@postgresql.org
1 parent cc623ed commit 204d779
Copy full SHA for 204d779

File tree

Expand file treeCollapse file tree

1 file changed

+2
-2
lines changed
Filter options
Expand file treeCollapse file tree

1 file changed

+2
-2
lines changed

‎src/bin/psql/psqlscanslash.l

Copy file name to clipboardExpand all lines: src/bin/psql/psqlscanslash.l
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -705,7 +705,7 @@ evaluate_backtick(PsqlScanState state)
705705

706706
initPQExpBuffer(&cmd_output);
707707

708-
fd = popen(cmd, PG_BINARY_R);
708+
fd = popen(cmd, "r");
709709
if (!fd)
710710
{
711711
state->callbacks->write_error("%s: %s\n", cmd, strerror(errno));
@@ -746,7 +746,7 @@ evaluate_backtick(PsqlScanState state)
746746
/* If no error, transfer result to output_buf */
747747
if (!error)
748748
{
749-
/* strip any trailing newline */
749+
/* strip any trailing newline (but only one) */
750750
if (cmd_output.len > 0 &&
751751
cmd_output.data[cmd_output.len - 1] == '\n')
752752
cmd_output.len--;

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.