===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/util.c,v
retrieving revision 1.144
retrieving revision 1.145
diff -c -r1.144 -r1.145
*** src/usr.bin/cvs/util.c	2008/06/10 01:00:35	1.144
--- src/usr.bin/cvs/util.c	2008/06/12 07:16:14	1.145
***************
*** 1,4 ****
! /*	$OpenBSD: util.c,v 1.144 2008/06/10 01:00:35 joris Exp $	*/
  /*
   * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
   * Copyright (c) 2005, 2006 Joris Vink <joris@openbsd.org>
--- 1,4 ----
! /*	$OpenBSD: util.c,v 1.145 2008/06/12 07:16:14 joris Exp $	*/
  /*
   * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
   * Copyright (c) 2005, 2006 Joris Vink <joris@openbsd.org>
***************
*** 44,49 ****
--- 44,50 ----
  
  extern int print_stdout;
  extern int build_dirs;
+ extern int disable_fast_checkout;
  
  /* letter -> mode type map */
  static const int cvs_modetypes[26] = {
***************
*** 364,370 ****
  	if (cvs_server_active == 0)
  		cvs_log(LP_TRACE, "cvs_unlink(%s)", path);
  
! 	if (cvs_noexec == 1)
  		return (0);
  
  	if (unlink(path) == -1 && errno != ENOENT) {
--- 365,371 ----
  	if (cvs_server_active == 0)
  		cvs_log(LP_TRACE, "cvs_unlink(%s)", path);
  
! 	if (cvs_noexec == 1 && disable_fast_checkout != 0)
  		return (0);
  
  	if (unlink(path) == -1 && errno != ENOENT) {
***************
*** 393,399 ****
  	if (cvs_server_active == 0)
  		cvs_log(LP_TRACE, "cvs_rmdir(%s)", path);
  
! 	if (cvs_noexec == 1)
  		return (0);
  
  	if ((dirp = opendir(path)) == NULL) {
--- 394,400 ----
  	if (cvs_server_active == 0)
  		cvs_log(LP_TRACE, "cvs_rmdir(%s)", path);
  
! 	if (cvs_noexec == 1 && disable_fast_checkout != 0)
  		return (0);
  
  	if ((dirp = opendir(path)) == NULL) {
***************
*** 857,863 ****
   * else, 0 or -1 if an error occur.
   */
  int
! cvs_exec(const char *prog, const char *in, int needwait)
  {
  	pid_t pid;
  	int fds[2], size, st;
--- 858,864 ----
   * else, 0 or -1 if an error occur.
   */
  int
! cvs_exec(char *prog, const char *in, int needwait)
  {
  	pid_t pid;
  	int fds[2], size, st;