Index: src/bin/psql/command.c
===================================================================
RCS file: /cvsroot/pgsql/src/bin/psql/command.c,v
retrieving revision 1.161
diff -c -c -r1.161 command.c
*** src/bin/psql/command.c	12 Feb 2006 04:04:32 -0000	1.161
--- src/bin/psql/command.c	3 Mar 2006 23:38:05 -0000
***************
*** 753,760 ****
  
  		expand_tilde(&fname);
  		/* This scrolls off the screen when using /dev/tty */
  		success = saveHistory(fname ? fname : "/dev/tty");
! 
  		if (success && !quiet && fname)
  			printf(gettext("Wrote history to file \"%s/%s\".\n"),
  				   pset.dirname ? pset.dirname : ".", fname);
--- 753,763 ----
  
  		expand_tilde(&fname);
  		/* This scrolls off the screen when using /dev/tty */
+ #ifndef WIN32
  		success = saveHistory(fname ? fname : "/dev/tty");
! #else
! 		success = saveHistory(fname ? fname : stderr);
! #endif
  		if (success && !quiet && fname)
  			printf(gettext("Wrote history to file \"%s/%s\".\n"),
  				   pset.dirname ? pset.dirname : ".", fname);
Index: src/port/sprompt.c
===================================================================
RCS file: /cvsroot/pgsql/src/port/sprompt.c,v
retrieving revision 1.12
diff -c -c -r1.12 sprompt.c
*** src/port/sprompt.c	15 Oct 2005 02:49:51 -0000	1.12
--- src/port/sprompt.c	3 Mar 2006 23:38:06 -0000
***************
*** 40,47 ****
  {
  	int			length;
  	char	   *destination;
! 	FILE	   *termin,
! 			   *termout;
  
  #ifdef HAVE_TERMIOS_H
  	struct termios t_orig,
--- 40,47 ----
  {
  	int			length;
  	char	   *destination;
! 	FILE	   *termin = NULL,
! 			   *termout = NULL;
  
  #ifdef HAVE_TERMIOS_H
  	struct termios t_orig,
***************
*** 63,70 ****
--- 63,76 ----
  	 * Do not try to collapse these into one "w+" mode file. Doesn't work on
  	 * some platforms (eg, HPUX 10.20).
  	 */
+ #ifndef WIN32
+ 	/*
+ 	 *	Some win32 platforms actually have a /dev/tty file, but it isn't
+ 	 *	a device file, and it doesn't work as expected, so we avoid trying.
+ 	 */
  	termin = fopen("/dev/tty", "r");
  	termout = fopen("/dev/tty", "w");
+ #endif
  	if (!termin || !termout)
  	{
  		if (termin)