|
7 | 7 | * |
8 | 8 | * |
9 | 9 | * IDENTIFICATION |
10 | | - * $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.36 1996/11/30 03:41:20 momjian Exp $ |
| 10 | + * $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.37 1996/12/01 20:28:39 momjian Exp $ |
11 | 11 | * |
12 | 12 | *------------------------------------------------------------------------- |
13 | 13 | */ |
|
41 | 41 | #endif |
42 | 42 | #endif |
43 | 43 |
|
| 44 | +#definePROMPT "=> " |
| 45 | + |
44 | 46 | #defineMAX_QUERY_BUFFER 20000 |
45 | 47 |
|
46 | 48 | #defineCOPYBUFSIZ 8192 |
@@ -789,7 +791,7 @@ do_connect(const char *new_dbname, PsqlSettings * settings) |
789 | 791 | PQfinish(olddb); |
790 | 792 | free(settings->prompt); |
791 | 793 | settings->prompt=malloc(strlen(PQdb(settings->db))+10); |
792 | | -sprintf(settings->prompt,"%s=> ",PQdb(settings->db)); |
| 794 | +sprintf(settings->prompt,"%s%s ",PQdb(settings->db),PROMPT); |
793 | 795 | } |
794 | 796 | } |
795 | 797 | } |
@@ -1243,7 +1245,6 @@ MainLoop(PsqlSettings * settings, FILE * source) |
1243 | 1245 | char*query_start; |
1244 | 1246 |
|
1245 | 1247 | interactive= ((source==stdin)&& !settings->notty); |
1246 | | -#definePROMPT "=> " |
1247 | 1248 | if (interactive) { |
1248 | 1249 | if (settings->prompt) |
1249 | 1250 | free(settings->prompt); |
@@ -1272,13 +1273,14 @@ MainLoop(PsqlSettings * settings, FILE * source) |
1272 | 1273 | line=strdup(query); |
1273 | 1274 | query[0]='\0'; |
1274 | 1275 | }else { |
1275 | | -sprintf(settings->prompt,"%s%s",PQdb(settings->db),PROMPT); |
1276 | | -if (in_quote) |
1277 | | -settings->prompt[strlen(settings->prompt)-3]='\''; |
1278 | | -elseif (query[0]!='\0'&& !querySent) |
1279 | | -settings->prompt[strlen(settings->prompt)-3]='-'; |
1280 | | -else |
1281 | | -settings->prompt[strlen(settings->prompt)-3]='='; |
| 1276 | +if (interactive&& !settings->quiet) { |
| 1277 | +if (in_quote) |
| 1278 | +settings->prompt[strlen(settings->prompt)-3]='\''; |
| 1279 | +elseif (query[0]!='\0'&& !querySent) |
| 1280 | +settings->prompt[strlen(settings->prompt)-3]='-'; |
| 1281 | +else |
| 1282 | +settings->prompt[strlen(settings->prompt)-3]='='; |
| 1283 | + } |
1282 | 1284 | line=GetNextLine(settings->prompt,source); |
1283 | 1285 | if (interactive&&settings->useReadline&&line!=NULL) |
1284 | 1286 | add_history(line);/* save non-empty lines in history */ |
|