Fix for psql control-d and .psqlrc that I broke. Fix for \dT with

bmomjian · bmomjian · commit e61e4d460c40 · 1999-11-13T19:16:47.000Z
descriptions enabled.
diff --git a/src/bin/psql/describe.c b/src/bin/psql/describe.c
@@ -158,7 +158,7 @@ describeTypes(const char *name, PsqlSettings *pset)
 	descbuf[0] = '\0';
 	strcat(descbuf, "SELECT typname AS \"Type\"");
 	if (GetVariableBool(pset->vars, "description"))
-		strcat(descbuf, ", obj_description(p.oid) as \"Description\"");
+		strcat(descbuf, ", obj_description(oid) as \"Description\"");
 	strcat(descbuf, "\nFROM pg_type\n"
 		   "WHERE typrelid = 0 AND typname !~ '^_.*'\n");
 
diff --git a/src/bin/psql/mainloop.c b/src/bin/psql/mainloop.c
@@ -136,9 +136,10 @@ MainLoop(PsqlSettings *pset, FILE *source)
 		if (line == NULL)
 		{
 			if (GetVariableBool(pset->vars, "echo") && !GetVariableBool(pset->vars, "quiet"))
-				puts("EOF\n");
-			else
-				puts(""); /* put out newline */
+				puts("EOF");
+			else if (pset->cur_cmd_interactive)
+				puts(""); /* just newline */
+
 			eof = true;
 			continue;
 		}

Original file line number	Diff line number	Diff line change
`@@ -136,9 +136,10 @@ MainLoop(PsqlSettings pset, FILE source)`
`136`	`136`	`if (line == NULL)`
`137`	`137`	`{`
`138`	`138`	`if (GetVariableBool(pset->vars, "echo") && !GetVariableBool(pset->vars, "quiet"))`
`139`		`- puts("EOF\n");`
`140`		`- else`
`141`		`- puts(""); /* put out newline */`
	`139`	`+ puts("EOF");`
	`140`	`+ else if (pset->cur_cmd_interactive)`
	`141`	`+ puts(""); /* just newline */`
	`142`	`+`
`142`	`143`	`eof = true;`
`143`	`144`	`continue;`
`144`	`145`	`}`