|
4 | 4 | *
|
5 | 5 | * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
|
6 | 6 | *
|
7 |
| - * $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.63 2006/01/05 03:01:37 momjian Exp $ |
| 7 | + * $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.64 2006/01/14 15:41:28 petere Exp $ |
8 | 8 | *
|
9 | 9 | *-------------------------------------------------------------------------
|
10 | 10 | */
|
@@ -1519,10 +1519,13 @@ main(int argc, char **argv)
|
1519 | 1519 | do_wait = false;
|
1520 | 1520 | }
|
1521 | 1521 |
|
1522 |
| - snprintf(def_postopts_file, MAXPGPATH, "%s/postmaster.opts.default", pg_data); |
1523 |
| - snprintf(postopts_file, MAXPGPATH, "%s/postmaster.opts", pg_data); |
1524 |
| - snprintf(pid_file, MAXPGPATH, "%s/postmaster.pid", pg_data); |
1525 |
| - snprintf(conf_file, MAXPGPATH, "%s/postgresql.conf", pg_data); |
| 1522 | + if (pg_data) |
| 1523 | + { |
| 1524 | + snprintf(def_postopts_file, MAXPGPATH, "%s/postmaster.opts.default", pg_data); |
| 1525 | + snprintf(postopts_file, MAXPGPATH, "%s/postmaster.opts", pg_data); |
| 1526 | + snprintf(pid_file, MAXPGPATH, "%s/postmaster.pid", pg_data); |
| 1527 | + snprintf(conf_file, MAXPGPATH, "%s/postgresql.conf", pg_data); |
| 1528 | + } |
1526 | 1529 |
|
1527 | 1530 | switch (ctl_command)
|
1528 | 1531 | {
|
|
0 commit comments