===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/file.c,v
retrieving revision 1.195
retrieving revision 1.196
diff -c -r1.195 -r1.196
*** src/usr.bin/cvs/file.c	2007/09/07 23:30:30	1.195
--- src/usr.bin/cvs/file.c	2007/09/09 20:24:06	1.196
***************
*** 1,4 ****
! /*	$OpenBSD: file.c,v 1.195 2007/09/07 23:30:30 tobias Exp $	*/
  /*
   * Copyright (c) 2006 Joris Vink <joris@openbsd.org>
   * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
--- 1,4 ----
! /*	$OpenBSD: file.c,v 1.196 2007/09/09 20:24:06 tobias Exp $	*/
  /*
   * Copyright (c) 2006 Joris Vink <joris@openbsd.org>
   * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
***************
*** 42,47 ****
--- 42,49 ----
  
  #define CVS_CHAR_ISMETA(c)	((c == '*') || (c == '?') || (c == '['))
  
+ extern int print_stdout;
+ 
  /*
   * Standard patterns to ignore.
   */
***************
*** 269,278 ****
  				goto next;
  			}
  		} else if (current_cvsroot->cr_method == CVS_METHOD_LOCAL) {
! 			if (stat(d, &st) == -1) {
! 				cvs_log(LP_ERRNO, "%s", d);
! 				goto next;
! 			}
  
  			cvs_get_repository_path(d, repo, MAXPATHLEN);
  			(void)xsnprintf(fpath, MAXPATHLEN, "%s/%s",
--- 271,285 ----
  				goto next;
  			}
  		} else if (current_cvsroot->cr_method == CVS_METHOD_LOCAL) {
! 			/*
! 			 * During checkout -p, do not use any locally
! 			 * available directories.
! 			 */
! 			if (cvs_cmdop != CVS_OP_CHECKOUT || !print_stdout)
! 				if (stat(d, &st) == -1) {
! 					cvs_log(LP_ERRNO, "%s", d);
! 					goto next;
! 				}
  
  			cvs_get_repository_path(d, repo, MAXPATHLEN);
  			(void)xsnprintf(fpath, MAXPATHLEN, "%s/%s",