Index: src/bin/psql/command.c
===================================================================
RCS file: /cvsroot/pgsql/src/bin/psql/command.c,v
retrieving revision 1.211
diff -c -c -r1.211 command.c
*** src/bin/psql/command.c	22 Nov 2009 05:20:41 -0000	1.211
--- src/bin/psql/command.c	30 Nov 2009 13:47:17 -0000
***************
*** 1691,1698 ****
  	if (!filename)
  		return EXIT_FAILURE;
  
! 	canonicalize_path(filename);
! 	fd = fopen(filename, PG_BINARY_R);
  
  	if (!fd)
  	{
--- 1691,1703 ----
  	if (!filename)
  		return EXIT_FAILURE;
  
! 	if (strcmp(filename, "-") != 0)
! 	{
! 		canonicalize_path(filename);
! 		fd = fopen(filename, PG_BINARY_R);
! 	}
! 	else
! 		fd = stdin;
  
  	if (!fd)
  	{
Index: src/bin/psql/startup.c
===================================================================
RCS file: /cvsroot/pgsql/src/bin/psql/startup.c,v
retrieving revision 1.156
diff -c -c -r1.156 startup.c
*** src/bin/psql/startup.c	5 Apr 2009 04:19:58 -0000	1.156
--- src/bin/psql/startup.c	30 Nov 2009 13:47:17 -0000
***************
*** 225,231 ****
  	/*
  	 * process file given by -f
  	 */
! 	if (options.action == ACT_FILE && strcmp(options.action_string, "-") != 0)
  	{
  		if (!options.no_psqlrc)
  			process_psqlrc(argv[0]);
--- 225,231 ----
  	/*
  	 * process file given by -f
  	 */
! 	if (options.action == ACT_FILE)
  	{
  		if (!options.no_psqlrc)
  			process_psqlrc(argv[0]);