Commite7c8022

committed

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

1 parent6969b8f commite7c8022Copy full SHA for e7c8022

File tree

-1

lines changed

-1

lines changed

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`*`
`4`	`4`	`* Copyright 2000 by PostgreSQL Global Development Group`
`5`	`5`	`*`
`6`		`- * $Header: /cvsroot/pgsql/src/bin/psql/copy.c,v 1.15 2000/04/16 15:46:40 petere Exp $`
	`6`	`+ * $Header: /cvsroot/pgsql/src/bin/psql/copy.c,v 1.16 2000/12/03 15:39:38 petere Exp $`
`7`	`7`	`*/`
`8`	`8`	`#include"postgres.h"`
`9`	`9`	`#include"copy.h"`
`@@ -403,6 +403,7 @@ handleCopyIn(PGconn conn, FILE copystream, const char *prompt)`
`403`	`403`	`intbufleft;`
`404`	`404`	`intc=0;`
`405`	`405`	`intret;`
	`406`	`+unsignedintlinecount=0;`
`406`	`407`
`407`	`408`	`#ifdefUSE_ASSERT_CHECKING`
`408`	`409`	`assert(copy_in_state);`
`@@ -458,8 +459,10 @@ handleCopyIn(PGconn conn, FILE copystream, const char *prompt)`
`458`	`459`	`}`
`459`	`460`	`}`
`460`	`461`	`PQputline(conn,"\n");`
	`462`	`+linecount++;`
`461`	`463`	`}`
`462`	`464`	`ret= !PQendcopy(conn);`
`463`	`465`	`copy_in_state= false;`
	`466`	`+pset.lineno+=linecount;`
`464`	`467`	`returnret;`
`465`	`468`	`}`

Comments

(0)