I've noticed that \i filename in 6.0beta prints the input file double-spaced.
Here is a trivial patch to get back the 1.09 behavior; it just removes trailing newlines before printing the line out with a newline rather than after... Thomas Lockhart
This commit is contained in:
parent
0567d7edb0
commit
ce02ccf43d
@ -7,7 +7,7 @@
|
|||||||
*
|
*
|
||||||
*
|
*
|
||||||
* IDENTIFICATION
|
* IDENTIFICATION
|
||||||
* $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.46 1997/01/05 23:46:17 scrappy Exp $
|
* $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.47 1997/01/10 20:52:32 momjian Exp $
|
||||||
*
|
*
|
||||||
*-------------------------------------------------------------------------
|
*-------------------------------------------------------------------------
|
||||||
*/
|
*/
|
||||||
@ -1289,12 +1289,12 @@ MainLoop(PsqlSettings * settings, FILE * source)
|
|||||||
printf("EOF\n"); /* Goes on prompt line */
|
printf("EOF\n"); /* Goes on prompt line */
|
||||||
eof = true;
|
eof = true;
|
||||||
} else {
|
} else {
|
||||||
if (!interactive && !settings->singleStep && !settings->quiet)
|
|
||||||
fprintf(stderr, "%s\n", line);
|
|
||||||
|
|
||||||
/* remove whitespaces on the right, incl. \n's */
|
/* remove whitespaces on the right, incl. \n's */
|
||||||
line = rightTrim(line);
|
line = rightTrim(line);
|
||||||
|
|
||||||
|
if (!interactive && !settings->singleStep && !settings->quiet)
|
||||||
|
fprintf(stderr, "%s\n", line);
|
||||||
|
|
||||||
if (line[0] == '\0') {
|
if (line[0] == '\0') {
|
||||||
free(line);
|
free(line);
|
||||||
continue;
|
continue;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user