Commite8a72c0

committed

Prevent simple_prompt() from locking up in a tight loop at stdin EOF.

1 parent0a829cb commite8a72c0Copy full SHA for e8a72c0

File tree

-4

lines changed

-4

lines changed

Lines changed: 6 additions & 4 deletions

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/common.c,v 1.25 2000/11/13 23:37:53 momjian Exp $`
	`6`	`+ * $Header: /cvsroot/pgsql/src/bin/psql/common.c,v 1.26 2000/11/27 01:28:40 tgl Exp $`
`7`	`7`	`*/`
`8`	`8`	`#include"postgres.h"`
`9`	`9`	`#include"common.h"`
`@@ -217,12 +217,14 @@ simple_prompt(const char *prompt, int maxlen, bool echo)`
`217`	`217`	`if (length>0&&destination[length-1]!='\n')`
`218`	`218`	`{`
`219`	`219`	`/* eat rest of the line */`
`220`		`-charbuf[512];`
	`220`	`+charbuf[128];`
	`221`	`+intbuflen;`
`221`	`222`
`222`	`223`	`do`
`223`	`224`	`{`
`224`		`-fgets(buf,512,stdin);`
`225`		`-}while (buf[strlen(buf)-1]!='\n');`
	`225`	`+fgets(buf,sizeof(buf),stdin);`
	`226`	`+buflen=strlen(buf);`
	`227`	`+}while (buflen>0&&buf[buflen-1]!='\n');`
`226`	`228`	`}`
`227`	`229`
`228`	`230`	`if (length>0&&destination[length-1]=='\n')`

Comments

(0)