From 7980b8a5cc86d11a741ba3c196638ddf7d47f078 Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Sun, 1 Dec 1996 20:28:39 +0000
Subject: [PATCH] Fix for inclusion of new prompt output.
---
src/bin/psql/psql.c | 22 ++++++++++++----------
1 file changed, 12 insertions(+), 10 deletions(-)
diff --git a/src/bin/psql/psql.c b/src/bin/psql/psql.c
index c5e0816d1e2..7c60d22b604 100644
--- 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.36 1996/11/30 03:41:20 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.37 1996/12/01 20:28:39 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -41,6 +41,8 @@
#endif
#endif
+#define PROMPT "=> "
+
#define MAX_QUERY_BUFFER 20000
#define COPYBUFSIZ 8192
@@ -789,7 +791,7 @@ do_connect(const char *new_dbname, PsqlSettings * settings)
PQfinish(olddb);
free(settings->prompt);
settings->prompt = malloc(strlen(PQdb(settings->db)) + 10);
- sprintf(settings->prompt, "%s=> ", PQdb(settings->db));
+ sprintf(settings->prompt, "%s%s ", PQdb(settings->db), PROMPT);
}
}
}
@@ -1243,7 +1245,6 @@ MainLoop(PsqlSettings * settings, FILE * source)
char *query_start;
interactive = ((source == stdin) && !settings->notty);
-#define PROMPT "=> "
if (interactive) {
if (settings->prompt)
free(settings->prompt);
@@ -1272,13 +1273,14 @@ MainLoop(PsqlSettings * settings, FILE * source)
line = strdup(query);
query[0] = '\0';
} else {
- sprintf(settings->prompt, "%s%s", PQdb(settings->db), PROMPT);
- if (in_quote)
- settings->prompt[strlen(settings->prompt)-3] = '\'';
- else if (query[0] != '\0' && !querySent)
- settings->prompt[strlen(settings->prompt)-3] = '-';
- else
- settings->prompt[strlen(settings->prompt)-3] = '=';
+ if (interactive && !settings->quiet) {
+ if (in_quote)
+ settings->prompt[strlen(settings->prompt)-3] = '\'';
+ else if (query[0] != '\0' && !querySent)
+ settings->prompt[strlen(settings->prompt)-3] = '-';
+ else
+ settings->prompt[strlen(settings->prompt)-3] = '=';
+ }
line = GetNextLine(settings->prompt, source);
if (interactive && settings->useReadline && line != NULL)
add_history(line); /* save non-empty lines in history */
--
GitLab