diff options
Diffstat (limited to 'src/backend/commands/copy.c')
| -rw-r--r-- | src/backend/commands/copy.c | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/src/backend/commands/copy.c b/src/backend/commands/copy.c index 7f1e288fab9..726ae39324f 100644 --- a/src/backend/commands/copy.c +++ b/src/backend/commands/copy.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.142 2001/10/25 05:49:24 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.143 2001/12/04 19:40:16 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -157,13 +157,10 @@ CopyGetChar(FILE *fp) { if (!fp) { - unsigned char ch; + int ch = pq_getbyte(); - if (pq_getbytes((char *) &ch, 1)) - { + if (ch == EOF) fe_eof = true; - return EOF; - } return ch; } else @@ -209,12 +206,9 @@ CopyDonePeek(FILE *fp, int c, int pickup) if (pickup) { /* - * We want to pick it up - just receive again into dummy - * buffer + * We want to pick it up */ - char c; - - pq_getbytes(&c, 1); + (void) pq_getbyte(); } /* If we didn't want to pick it up, just leave it where it sits */ } |