Commit b8476a09 authored by Marc G. Fournier's avatar Marc G. Fournier

From: Andrew Martin <martin@biochemistry.ucl.ac.uk>

psql .psqlrc file startup(Andrew)
parent 33de29fc
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.127 1998/01/22 18:50:22 momjian Exp $ * $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.128 1998/01/23 19:21:11 scrappy Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -2417,6 +2417,8 @@ main(int argc, char **argv) ...@@ -2417,6 +2417,8 @@ main(int argc, char **argv)
bool singleSlashCmd = 0; bool singleSlashCmd = 0;
int c; int c;
char *home = NULL; /* Used to store $HOME */
MemSet(&settings, 0, sizeof settings); MemSet(&settings, 0, sizeof settings);
settings.opt.align = 1; settings.opt.align = 1;
settings.opt.header = 1; settings.opt.header = 1;
...@@ -2556,6 +2558,30 @@ main(int argc, char **argv) ...@@ -2556,6 +2558,30 @@ main(int argc, char **argv)
printf(" type \\g or terminate with semicolon to execute query\n"); printf(" type \\g or terminate with semicolon to execute query\n");
printf(" You are currently connected to the database: %s\n\n", dbname); printf(" You are currently connected to the database: %s\n\n", dbname);
} }
/*
* 20.06.97 ACRM See if we've got a /etc/psqlrc or .psqlrc file
*/
if(!access("/etc/psqlrc",R_OK))
HandleSlashCmds(&settings, "\\i /etc/psqlrc", "");
if((home = getenv("HOME"))!=NULL) {
char *psqlrc = NULL,
*line = NULL;
if((psqlrc = (char *)malloc(strlen(home) + 10))!=NULL) {
sprintf(psqlrc, "%s/.psqlrc", home);
if(!access(psqlrc, R_OK)) {
if((line = (char *)malloc(strlen(psqlrc) + 5))!=NULL) {
sprintf(line, "\\i %s", psqlrc);
HandleSlashCmds(&settings, line, "");
free(line);
}
}
free(psqlrc);
}
}
/* End of check for psqlrc files */
if (qfilename || singleSlashCmd) if (qfilename || singleSlashCmd)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment