diff options
Diffstat (limited to 'src/backend/utils')
| -rw-r--r-- | src/backend/utils/init/globals.c | 4 | ||||
| -rw-r--r-- | src/backend/utils/misc/trace.c | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/backend/utils/init/globals.c b/src/backend/utils/init/globals.c index 60dabd605d..2c7e3999dc 100644 --- a/src/backend/utils/init/globals.c +++ b/src/backend/utils/init/globals.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/init/globals.c,v 1.25 1998/08/25 21:24:10 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/init/globals.c,v 1.26 1998/10/16 06:05:16 momjian Exp $ * * NOTES * Globals used all over the place should be declared here and not @@ -46,7 +46,7 @@ int MyProcPid; struct Port *MyProcPort; long MyCancelKey; -char *DataDir; +char *DataDir = NULL; /* * The PGDATA directory user says to use, or defaults to via environment diff --git a/src/backend/utils/misc/trace.c b/src/backend/utils/misc/trace.c index 8adbb075be..0f58a122dd 100644 --- a/src/backend/utils/misc/trace.c +++ b/src/backend/utils/misc/trace.c @@ -339,6 +339,11 @@ read_pg_options(SIGNAL_ARGS) char *s, *p; + if (!DataDir) { + fprintf(stderr, "read_pg_options: DataDir not defined\n"); + return; + } + sprintf(buffer, "%s/%s", DataDir, "pg_options"); if ((fd = open(buffer, O_RDONLY)) < 0) return; |