Movatterモバイル変換

[0]ホーム
URL:

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

 Sign up
Appearance settings

Commit6bc710f

Browse files
committed
Make psql handle EOF during COPY FROM STDIN properly on all platforms.
When stdin is a terminal, it's possible to end a COPY FROM STDIN witha keyboard EOF signal (typically control-D), and then keep on issuingSQL commands. One would expect another COPY FROM STDIN to work as well,but on some platforms it did not. This turns out to be because we werenot resetting the stream's feof() flag, and BSD-ish versions of fread()and fgets() won't attempt to read more data if that's set.The misbehavior is observed on BSDen (including macOS), but not Linux,Windows, or SysV-ish Unixen, which makes this a portability bug notjust a missing feature.Add a clearerr() call to fix the behavior, and improve the prompt that'sissued when copying from a TTY to mention that EOF signals work.It's been like this forever, so back-patch to all supported branches.Thomas MunroDiscussion:https://postgr.es/m/CAEepm=0MCGfYf=JAMiYhO6JPtv9-3ZfBo8fcGeCZ8oMzaw+Z+Q@mail.gmail.com
1 parent80a06b5 commit6bc710f

File tree

1 file changed

+11
-1
lines changed

1 file changed

+11
-1
lines changed

‎src/bin/psql/copy.c

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -537,7 +537,7 @@ handleCopyIn(PGconn *conn, FILE *copystream, bool isbinary)
537537
{
538538
if (!pset.quiet)
539539
puts(_("Enter data to be copied followed by a newline.\n"
540-
"End with a backslash and a period on a line by itself."));
540+
"End with a backslash and a period on a line by itself, or an EOF signal."));
541541
prompt=get_prompt(PROMPT_COPY);
542542
}
543543
else
@@ -658,6 +658,16 @@ handleCopyIn(PGconn *conn, FILE *copystream, bool isbinary)
658658

659659
copyin_cleanup:
660660

661+
/*
662+
* Clear the EOF flag on the stream, in case copying ended due to an EOF
663+
* signal. This allows an interactive TTY session to perform another COPY
664+
* FROM STDIN later. (In non-STDIN cases, we're about to close the file
665+
* anyway, so it doesn't matter.) Although we don't ever test the flag
666+
* with feof(), some fread() implementations won't read more data if it's
667+
* set. This also clears the error flag, but we already checked that.
668+
*/
669+
clearerr(copystream);
670+
661671
/*
662672
* Check command status and return to normal libpq state.
663673
*

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp