mirror of
https://github.com/postgres/postgres.git
synced 2025-04-25 21:42:33 +03:00
From: Andrew Martin <martin@biochemistry.ucl.ac.uk>
psql .psqlrc file startup(Andrew)
This commit is contained in:
parent
33de29fc45
commit
b8476a09fe
@ -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)
|
|||||||
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)
|
|||||||
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)
|
||||||
{
|
{
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user