Index: src/bin/psql/command.c
===================================================================
RCS file: /cvsroot/pgsql/src/bin/psql/command.c,v
retrieving revision 1.152
diff -c -c -r1.152 command.c
*** src/bin/psql/command.c	14 Aug 2005 18:49:30 -0000	1.152
--- src/bin/psql/command.c	20 Sep 2005 18:43:41 -0000
***************
*** 1314,1320 ****
   * process_file
   *
   * Read commands from filename and then them to the main processing loop
!  * Handler for \i, but can be used for other things as well.
   */
  int
  process_file(char *filename)
--- 1314,1321 ----
   * process_file
   *
   * Read commands from filename and then them to the main processing loop
!  * Handler for \i, but can be used for other things as well.  Returns
!  * MainLoop() error code.
   */
  int
  process_file(char *filename)
***************
*** 1324,1330 ****
  	char	   *oldfilename;
  
  	if (!filename)
! 		return false;
  
  	canonicalize_path(filename);
  	fd = fopen(filename, PG_BINARY_R);
--- 1325,1331 ----
  	char	   *oldfilename;
  
  	if (!filename)
! 		return EXIT_FAILURE;
  
  	canonicalize_path(filename);
  	fd = fopen(filename, PG_BINARY_R);
***************
*** 1332,1338 ****
  	if (!fd)
  	{
  		psql_error("%s: %s\n", filename, strerror(errno));
! 		return false;
  	}
  
  	oldfilename = pset.inputfile;
--- 1333,1339 ----
  	if (!fd)
  	{
  		psql_error("%s: %s\n", filename, strerror(errno));
! 		return EXIT_FAILURE;
  	}
  
  	oldfilename = pset.inputfile;
Index: src/bin/psql/startup.c
===================================================================
RCS file: /cvsroot/pgsql/src/bin/psql/startup.c,v
retrieving revision 1.122
diff -c -c -r1.122 startup.c
*** src/bin/psql/startup.c	5 Sep 2005 18:05:13 -0000	1.122
--- src/bin/psql/startup.c	20 Sep 2005 18:43:41 -0000
***************
*** 690,698 ****
  	sprintf(psqlrc, "%s-%s", filename, PG_VERSION);
  
  	if (access(psqlrc, R_OK) == 0)
! 		process_file(psqlrc);
  	else if (access(filename, R_OK) == 0)
! 		process_file(filename);
  	free(psqlrc);
  }
  
--- 690,698 ----
  	sprintf(psqlrc, "%s-%s", filename, PG_VERSION);
  
  	if (access(psqlrc, R_OK) == 0)
! 		(void)process_file(psqlrc);
  	else if (access(filename, R_OK) == 0)
! 		(void)process_file(filename);
  	free(psqlrc);
  }