Index: pg_ctl.c
===================================================================
RCS file: /projects/cvsroot/pgsql/src/bin/pg_ctl/pg_ctl.c,v
retrieving revision 1.63
diff -c -r1.63 pg_ctl.c
*** pg_ctl.c	5 Jan 2006 03:01:37 -0000	1.63
--- pg_ctl.c	14 Jan 2006 13:51:36 -0000
***************
*** 1519,1528 ****
  		do_wait = false;
  	}
  
! 	snprintf(def_postopts_file, MAXPGPATH, "%s/postmaster.opts.default", pg_data);
! 	snprintf(postopts_file, MAXPGPATH, "%s/postmaster.opts", pg_data);
! 	snprintf(pid_file, MAXPGPATH, "%s/postmaster.pid", pg_data);
! 	snprintf(conf_file, MAXPGPATH, "%s/postgresql.conf", pg_data);
  
  	switch (ctl_command)
  	{
--- 1519,1531 ----
  		do_wait = false;
  	}
  
!     if (pg_data != NULL)
!     {
!         snprintf(def_postopts_file, MAXPGPATH, "%s/postmaster.opts.default", pg_data);
!         snprintf(postopts_file, MAXPGPATH, "%s/postmaster.opts", pg_data);
!         snprintf(pid_file, MAXPGPATH, "%s/postmaster.pid", pg_data);
!         snprintf(conf_file, MAXPGPATH, "%s/postgresql.conf", pg_data);
!     }
  
  	switch (ctl_command)
  	{