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

petere · petere · commit e7c80220d35a · 2000-12-03T15:39:38.000Z
diff --git a/src/bin/psql/copy.c b/src/bin/psql/copy.c
@@ -3,7 +3,7 @@
  *
  * 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 "copy.h"
@@ -403,6 +403,7 @@ handleCopyIn(PGconn *conn, FILE *copystream, const char *prompt)
 	int			bufleft;
 	int			c = 0;
 	int			ret;
+	unsigned int linecount=0;
 
 #ifdef USE_ASSERT_CHECKING
 	assert(copy_in_state);
@@ -458,8 +459,10 @@ handleCopyIn(PGconn *conn, FILE *copystream, const char *prompt)
 			}
 		}
 		PQputline(conn, "\n");
+		linecount++;
 	}
 	ret = !PQendcopy(conn);
 	copy_in_state = false;
+	pset.lineno += linecount;
 	return ret;
 }

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`	`int bufleft;`
`404`	`404`	`int c = 0;`
`405`	`405`	`int ret;`
	`406`	`+ unsigned int linecount=0;`
`406`	`407`
`407`	`408`	`#ifdef USE_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`	`return ret;`
`465`	`468`	`}`