Index: access/transam/xlog.c
===================================================================
RCS file: /home/alvherre/cvs/pgsql-server/src/backend/access/transam/xlog.c,v
retrieving revision 1.152
diff -c -r1.152 xlog.c
*** access/transam/xlog.c	22 Jul 2004 21:09:37 -0000	1.152
--- access/transam/xlog.c	1 Aug 2004 03:43:37 -0000
***************
*** 1936,1942 ****
  		if (unlink(xlogpath) != 0)
  			ereport(FATAL,
  					(errcode_for_file_access(),
! 					 errmsg("could not remove \"%s\": %m",
  							xlogpath)));
  	}
  
--- 1936,1942 ----
  		if (unlink(xlogpath) != 0)
  			ereport(FATAL,
  					(errcode_for_file_access(),
! 					 errmsg("could not remove file \"%s\": %m",
  							xlogpath)));
  	}
  
***************
*** 3772,3778 ****
  		if (rename(recoveryPath, xlogpath) != 0)
  			ereport(FATAL,
  					(errcode_for_file_access(),
! 					 errmsg("could not rename \"%s\" to \"%s\": %m",
  							recoveryPath, xlogpath)));
  		/* XXX might we need to fix permissions on the file? */
  	}
--- 3772,3778 ----
  		if (rename(recoveryPath, xlogpath) != 0)
  			ereport(FATAL,
  					(errcode_for_file_access(),
! 					 errmsg("could not rename file \"%s\" to \"%s\": %m",
  							recoveryPath, xlogpath)));
  		/* XXX might we need to fix permissions on the file? */
  	}
***************
*** 3814,3820 ****
  	if (rename(recoveryCommandFile, recoveryCommandDone) != 0)
  		ereport(FATAL,
  				(errcode_for_file_access(),
! 				 errmsg("could not rename \"%s\" to \"%s\": %m",
  						recoveryCommandFile, recoveryCommandDone)));
  
  	ereport(LOG,
--- 3814,3820 ----
  	if (rename(recoveryCommandFile, recoveryCommandDone) != 0)
  		ereport(FATAL,
  				(errcode_for_file_access(),
! 				 errmsg("could not rename file \"%s\" to \"%s\": %m",
  						recoveryCommandFile, recoveryCommandDone)));
  
  	ereport(LOG,
Index: postmaster/pgarch.c
===================================================================
RCS file: /home/alvherre/cvs/pgsql-server/src/backend/postmaster/pgarch.c,v
retrieving revision 1.2
diff -c -r1.2 pgarch.c
*** postmaster/pgarch.c	21 Jul 2004 22:31:22 -0000	1.2
--- postmaster/pgarch.c	1 Aug 2004 03:44:14 -0000
***************
*** 587,592 ****
   	if (rename(rlogready, rlogdone) < 0)
   		ereport(WARNING,
  				(errcode_for_file_access(),
! 				 errmsg("could not rename \"%s\" to \"%s\": %m",
  						rlogready, rlogdone)));
  }
--- 587,592 ----
   	if (rename(rlogready, rlogdone) < 0)
   		ereport(WARNING,
  				(errcode_for_file_access(),
! 				 errmsg("could not rename file \"%s\" to \"%s\": %m",
  						rlogready, rlogdone)));
  }
Index: postmaster/postmaster.c
===================================================================
RCS file: /home/alvherre/cvs/pgsql-server/src/backend/postmaster/postmaster.c,v
retrieving revision 1.417
diff -c -r1.417 postmaster.c
*** postmaster/postmaster.c	31 Jul 2004 00:45:33 -0000	1.417
--- postmaster/postmaster.c	1 Aug 2004 06:30:48 -0000
***************
*** 544,550 ****
  		if (!guc_pgdata)	/* Got a pgdata from the config file? */
  		{
  			write_stderr("%s does not know where to find the database system data.\n"
! 						 "This should be specified as 'pgdata' in %s%s.\n",
  						 progname, userPGDATA,
  						 user_pgconfig_is_dir ? "/postgresql.conf" : "");
  			ExitPostmaster(2);
--- 544,550 ----
  		if (!guc_pgdata)	/* Got a pgdata from the config file? */
  		{
  			write_stderr("%s does not know where to find the database system data.\n"
! 						 "This should be specified as \"pgdata\" in %s%s.\n",
  						 progname, userPGDATA,
  						 user_pgconfig_is_dir ? "/postgresql.conf" : "");
  			ExitPostmaster(2);