Index: src/bin/psql/command.c
===================================================================
RCS file: /projects/cvsroot/pgsql/src/bin/psql/command.c,v
retrieving revision 1.164
diff -c -r1.164 command.c
*** src/bin/psql/command.c	5 Mar 2006 15:58:51 -0000	1.164
--- src/bin/psql/command.c	12 Mar 2006 01:55:09 -0000
***************
*** 247,271 ****
  											strcmp(opt2, "") == 0) ? "" : opt2,
  								 !opt3q && (strcmp(opt3, "-") == 0 ||
  											strcmp(opt3, "") == 0) ? "" : opt3,
! 								 NULL);
  		if (opt2)
  			/* gave username */
  			success = do_connect(!opt1q && (strcmp(opt1, "-") == 0 ||
  											strcmp(opt1, "") == 0) ? "" : opt1,
  								 !opt2q && (strcmp(opt2, "-") == 0 ||
  											strcmp(opt2, "") == 0) ? "" : opt2,
! 								 NULL,
! 								 NULL);
  		else if (opt1)
  			/* gave database name */
  			success = do_connect(!opt1q && (strcmp(opt1, "-") == 0 ||
  											strcmp(opt1, "") == 0) ? "" : opt1,
  								 "",
! 								 NULL,
! 								 NULL);
  		else
  			/* connect to default db as default user */
! 			success = do_connect(NULL, NULL, NULL, NULL);
  
  		free(opt1);
  		free(opt2);
--- 247,271 ----
  											strcmp(opt2, "") == 0) ? "" : opt2,
  								 !opt3q && (strcmp(opt3, "-") == 0 ||
  											strcmp(opt3, "") == 0) ? "" : opt3,
! 								 "");
  		if (opt2)
  			/* gave username */
  			success = do_connect(!opt1q && (strcmp(opt1, "-") == 0 ||
  											strcmp(opt1, "") == 0) ? "" : opt1,
  								 !opt2q && (strcmp(opt2, "-") == 0 ||
  											strcmp(opt2, "") == 0) ? "" : opt2,
! 								 "",
! 								 "");
  		else if (opt1)
  			/* gave database name */
  			success = do_connect(!opt1q && (strcmp(opt1, "-") == 0 ||
  											strcmp(opt1, "") == 0) ? "" : opt1,
  								 "",
! 								 "",
! 								 "");
  		else
  			/* connect to default db as default user */
! 			success = do_connect("", "", "", "");
  
  		free(opt1);
  		free(opt2);