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

diff --git a/src/bin/psql/psql.c b/src/bin/psql/psql.c
index 683f7663455ca9fee8dd12005d03456d58b25d71..9c5bf7efaab44f4b08fab2ff0a2fbd3774c8bd88 100644 (file)
--- a/src/bin/psql/psql.c
+++ b/src/bin/psql/psql.c
@@ -7,7 +7,7 @@
  *
  *
  * 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 */
            eof = true;
        } else {
-           if (!interactive && !settings->singleStep && !settings->quiet)
-               fprintf(stderr, "%s\n", line);
-
            /* remove whitespaces on the right, incl. \n's */
            line = rightTrim(line);
 
+           if (!interactive && !settings->singleStep && !settings->quiet)
+               fprintf(stderr, "%s\n", line);
+
            if (line[0] == '\0') {
                free(line);
                continue;