===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/checkout.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -c -r1.36 -r1.37
*** src/usr.bin/cvs/checkout.c	2005/07/08 08:24:09	1.36
--- src/usr.bin/cvs/checkout.c	2005/07/08 08:54:43	1.37
***************
*** 1,4 ****
! /*	$OpenBSD: checkout.c,v 1.36 2005/07/08 08:24:09 joris Exp $	*/
  /*
   * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
   * All rights reserved.
--- 1,4 ----
! /*	$OpenBSD: checkout.c,v 1.37 2005/07/08 08:54:43 joris Exp $	*/
  /*
   * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
   * All rights reserved.
***************
*** 81,87 ****
  
  static char *date, *tag, *koptstr, *tgtdir, *rcsid;
  static int statmod = 0;
! static int shorten = 1;
  static int usehead = 0;
  static int kflag = RCS_KWEXP_DEFAULT;
  
--- 81,87 ----
  
  static char *date, *tag, *koptstr, *tgtdir, *rcsid;
  static int statmod = 0;
! static int shorten = 0;
  static int usehead = 0;
  static int kflag = RCS_KWEXP_DEFAULT;
  
***************
*** 110,115 ****
--- 110,116 ----
  			break;
  		case 'd':
  			tgtdir = optarg;
+ 			shorten = 1;
  			break;
  		case 'f':
  			usehead = 1;
***************
*** 214,219 ****
--- 215,228 ----
  	}
  
  	if (root->cr_method != CVS_METHOD_LOCAL) {
+ 		/*
+ 		 * These arguments are for the expand-modules
+ 		 * command that we send to the server before requesting
+ 		 * a checkout.
+ 		 */
+ 		for (i = 0; i < co_nmod; i++)
+ 			if (cvs_sendarg(root, co_mods[i], 0) < 0)
+ 				return (CVS_EX_PROTO);
  		if (cvs_sendreq(root, CVS_REQ_DIRECTORY, ".") < 0)
  			return (CVS_EX_PROTO);
  		if (cvs_sendln(root, root->cr_dir) < 0)