Fix psql \x by removing puts().

bmomjian · bmomjian · commit d7a06c2ac8c6 · 2005-09-22T15:51:51.000Z
Greg Sabino Mullane
diff --git a/src/bin/psql/print.c b/src/bin/psql/print.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2000-2005, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/psql/print.c,v 1.72 2005/07/18 20:57:53 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/psql/print.c,v 1.73 2005/09/22 15:51:51 momjian Exp $
  */
 #include "postgres_fe.h"
 #include "common.h"
@@ -570,7 +570,7 @@ print_aligned_vertical(const char *title, const char *const *headers,
 
 	if (cells[0] == NULL)
 	{
-		puts(_("(No rows)\n"));
+		fprintf(fout, _("(No rows)\n"));
 		return;
 	}
 
@@ -704,7 +704,7 @@ print_aligned_vertical(const char *title, const char *const *headers,
 			if (opt_align[i % col_count] == 'r' && opt_numeric_locale)
 			    format_numeric_locale(my_cell);
 			if (opt_border < 2)
-				puts(my_cell);
+				fprintf(fout, "%s\n", my_cell);
 			else
 				fprintf(fout, "%-s%*s |\n", my_cell, dwidth - cell_w[i], "");
 			free(my_cell);

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`*`
`4`	`4`	`* Copyright (c) 2000-2005, PostgreSQL Global Development Group`
`5`	`5`	`*`
`6`		`- * $PostgreSQL: pgsql/src/bin/psql/print.c,v 1.72 2005/07/18 20:57:53 momjian Exp $`
	`6`	`+ * $PostgreSQL: pgsql/src/bin/psql/print.c,v 1.73 2005/09/22 15:51:51 momjian Exp $`
`7`	`7`	`*/`
`8`	`8`	`#include "postgres_fe.h"`
`9`	`9`	`#include "common.h"`
`@@ -570,7 +570,7 @@ print_aligned_vertical(const char title, const char const *headers,`
`570`	`570`
`571`	`571`	`if (cells[0] == NULL)`
`572`	`572`	`{`
`573`		`- puts(_("(No rows)\n"));`
	`573`	`+ fprintf(fout, _("(No rows)\n"));`
`574`	`574`	`return;`
`575`	`575`	`}`
`576`	`576`
`@@ -704,7 +704,7 @@ print_aligned_vertical(const char title, const char const *headers,`
`704`	`704`	`if (opt_align[i % col_count] == 'r' && opt_numeric_locale)`
`705`	`705`	`format_numeric_locale(my_cell);`
`706`	`706`	`if (opt_border < 2)`
`707`		`- puts(my_cell);`
	`707`	`+ fprintf(fout, "%s\n", my_cell);`
`708`	`708`	`else`
`709`	`709`	`fprintf(fout, "%-s%*s \|\n", my_cell, dwidth - cell_w[i], "");`
`710`	`710`	`free(my_cell);`