===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/cvs.c,v
retrieving revision 1.130
retrieving revision 1.131
diff -c -r1.130 -r1.131
*** src/usr.bin/cvs/cvs.c	2007/09/02 12:13:00	1.130
--- src/usr.bin/cvs/cvs.c	2007/09/07 23:30:30	1.131
***************
*** 1,4 ****
! /*	$OpenBSD: cvs.c,v 1.130 2007/09/02 12:13:00 tobias Exp $	*/
  /*
   * Copyright (c) 2006, 2007 Joris Vink <joris@openbsd.org>
   * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
--- 1,4 ----
! /*	$OpenBSD: cvs.c,v 1.131 2007/09/07 23:30:30 tobias Exp $	*/
  /*
   * Copyright (c) 2006, 2007 Joris Vink <joris@openbsd.org>
   * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
***************
*** 157,165 ****
  	}
  
  	if ((cvs_homedir = getenv("HOME")) == NULL) {
! 		if ((pw = getpwuid(getuid())) == NULL)
! 			fatal("getpwuid failed");
! 		cvs_homedir = pw->pw_dir;
  	}
  
  	if ((envstr = getenv("TMPDIR")) != NULL)
--- 157,165 ----
  	}
  
  	if ((cvs_homedir = getenv("HOME")) == NULL) {
! 		if ((pw = getpwuid(getuid())) != NULL)
! 			cvs_homedir = pw->pw_dir;
! 
  	}
  
  	if ((envstr = getenv("TMPDIR")) != NULL)
***************
*** 184,190 ****
  	else if (!S_ISDIR(st.st_mode))
  		fatal("`%s' is not valid temporary directory", cvs_tmpdir);
  
! 	if (cvs_readrc == 1) {
  		cvs_read_rcfile();
  
  		if (cvs_defargs != NULL) {
--- 184,190 ----
  	else if (!S_ISDIR(st.st_mode))
  		fatal("`%s' is not valid temporary directory", cvs_tmpdir);
  
! 	if (cvs_readrc == 1 && cvs_homedir != NULL) {
  		cvs_read_rcfile();
  
  		if (cvs_defargs != NULL) {