===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/checkout.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -c -r1.5 -r1.6
*** src/usr.bin/cvs/checkout.c	2004/07/30 01:49:22	1.5
--- src/usr.bin/cvs/checkout.c	2004/07/30 18:14:07	1.6
***************
*** 1,4 ****
! /*	$OpenBSD: checkout.c,v 1.5 2004/07/30 01:49:22 jfb Exp $	*/
  /*
   * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
   * All rights reserved. 
--- 1,4 ----
! /*	$OpenBSD: checkout.c,v 1.6 2004/07/30 18:14:07 jfb Exp $	*/
  /*
   * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
   * All rights reserved. 
***************
*** 35,40 ****
--- 35,41 ----
  
  #include "cvs.h"
  #include "log.h"
+ #include "file.h"
  #include "proto.h"
  
  
***************
*** 50,55 ****
--- 51,57 ----
  cvs_checkout(int argc, char **argv)
  {
  	int ch;
+ 	CVSFILE *dir;
  	struct cvsroot *root;
  
  	while ((ch = getopt(argc, argv, "")) != -1) {
***************
*** 68,84 ****
  		return (EX_USAGE);
  	}
  
! 	root = cvsroot_get(".");
  	if (root->cr_method != CVS_METHOD_LOCAL) {
  		cvs_connect(root);
  	}
  
  	cvs_sendarg(root, argv[0], 0);
! 	cvs_senddir(root, ".");
  	cvs_sendreq(root, CVS_REQ_XPANDMOD, NULL);
  
  	cvs_sendarg(root, argv[0], 0);
! 	cvs_senddir(root, ".");
  	cvs_sendreq(root, CVS_REQ_CO, NULL);
  
  	return (0);
--- 70,89 ----
  		return (EX_USAGE);
  	}
  
! 	dir = cvs_file_get(".", CF_IGNORE|CF_MKADMIN);
! 	root = CVS_DIR_ROOT(dir);
  	if (root->cr_method != CVS_METHOD_LOCAL) {
  		cvs_connect(root);
  	}
  
  	cvs_sendarg(root, argv[0], 0);
! 	cvs_senddir(root, dir);
  	cvs_sendreq(root, CVS_REQ_XPANDMOD, NULL);
  
+ 	/* XXX not too sure why we have to send this arg */
+ 	cvs_sendarg(root, "-N", 0);
  	cvs_sendarg(root, argv[0], 0);
! 	cvs_senddir(root, dir);
  	cvs_sendreq(root, CVS_REQ_CO, NULL);
  
  	return (0);