Commit3f9ef2b

committed

Properly recognize and announce input errors.

1 parent492ae18 commit3f9ef2bCopy full SHA for 3f9ef2b

File tree

+15

-4

lines changed

+15

-4

lines changed

Lines changed: 10 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`*`
`4`	`4`	`* Copyright (c) 2000-2007, PostgreSQL Global Development Group`
`5`	`5`	`*`
`6`		`- * $PostgreSQL: pgsql/src/bin/psql/input.c,v 1.62 2007/01/05 22:19:49 momjian Exp $`
	`6`	`+ * $PostgreSQL: pgsql/src/bin/psql/input.c,v 1.63 2007/11/28 09:17:46 petere Exp $`
`7`	`7`	`*/`
`8`	`8`	`#include"postgres_fe.h"`
`9`	`9`
`@@ -147,7 +147,7 @@ pg_send_history(PQExpBuffer history_buf)`
`147`	`147`	`* gets_fromFile`
`148`	`148`	`*`
`149`	`149`	`* Gets a line of noninteractive input from a file (which could be stdin).`
`150`		`- * The result is a malloc'd string.`
	`150`	`+ * The result is a malloc'd string, or NULL on EOF or input error.`
`151`	`151`	`*`
`152`	`152`	`* Caller must have set up sigint_interrupt_jmp before calling.`
`153`	`153`	`*`
`@@ -179,9 +179,16 @@ gets_fromFile(FILE *source)`
`179`	`179`	`/* Disable SIGINT again */`
`180`	`180`	`sigint_interrupt_enabled= false;`
`181`	`181`
`182`		`-/* EOF? */`
	`182`	`+/* EOF or error? */`
`183`	`183`	`if (result==NULL)`
	`184`	`+{`
	`185`	`+if (ferror(source))`
	`186`	`+{`
	`187`	`+psql_error("could not read from input file: %s\n",strerror(errno));`
	`188`	`+returnNULL;`
	`189`	`+}`
`184`	`190`	`break;`
	`191`	`+}`
`185`	`192`
`186`	`193`	`appendPQExpBufferStr(buffer,line);`
`187`	`194`

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`*`
`4`	`4`	`* Copyright (c) 2000-2007, PostgreSQL Global Development Group`
`5`	`5`	`*`
`6`		`- * $PostgreSQL: pgsql/src/bin/psql/mainloop.c,v 1.85 2007/01/05 22:19:49 momjian Exp $`
	`6`	`+ * $PostgreSQL: pgsql/src/bin/psql/mainloop.c,v 1.86 2007/11/28 09:17:46 petere Exp $`
`7`	`7`	`*/`
`8`	`8`	`#include"postgres_fe.h"`
`9`	`9`	`#include"mainloop.h"`
`@@ -129,7 +129,11 @@ MainLoop(FILE *source)`
`129`	`129`	`line=gets_interactive(get_prompt(prompt_status));`
`130`	`130`	`}`
`131`	`131`	`else`
	`132`	`+{`
`132`	`133`	`line=gets_fromFile(source);`
	`134`	`+if (!line&&ferror(source))`
	`135`	`+successResult=EXIT_FAILURE;`
	`136`	`+}`
`133`	`137`
`134`	`138`	`/*`
`135`	`139`	`* query_buf holds query already accumulated. line is the malloc'd`

Comments

(0)