mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2025-02-11 19:20:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix counting of lines in scripts with 'copy from stdin'.

Browse Source
This commit is contained in:
Peter Eisentraut 2000-12-03 15:39:38 +00:00
parent 6969b8fa11
commit e7c80220d3
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/bin/psql/copy.c
View File

@ -3,7 +3,7 @@
* *
* Copyright 2000 by PostgreSQL Global Development Group * Copyright 2000 by PostgreSQL Global Development Group
* *
* $Header: /cvsroot/pgsql/src/bin/psql/copy.c,v 1.15 2000/04/16 15:46:40 petere Exp $ * $Header: /cvsroot/pgsql/src/bin/psql/copy.c,v 1.16 2000/12/03 15:39:38 petere Exp $
*/ */
#include "postgres.h" #include "postgres.h"
#include "copy.h" #include "copy.h"
@ -403,6 +403,7 @@ handleCopyIn(PGconn *conn, FILE *copystream, const char *prompt)
int bufleft; int bufleft;
int c = 0; int c = 0;
int ret; int ret;
unsigned int linecount=0;
#ifdef USE_ASSERT_CHECKING #ifdef USE_ASSERT_CHECKING
assert(copy_in_state); assert(copy_in_state);
@ -458,8 +459,10 @@ handleCopyIn(PGconn *conn, FILE *copystream, const char *prompt)
} }
} }
PQputline(conn, "\n"); PQputline(conn, "\n");
linecount++;
} }
ret = !PQendcopy(conn); ret = !PQendcopy(conn);
copy_in_state = false; copy_in_state = false;
pset.lineno += linecount;
return ret; return ret;
} }