===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/status.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -c -r1.6 -r1.7
*** src/usr.bin/cvs/status.c	2004/12/21 18:32:10	1.6
--- src/usr.bin/cvs/status.c	2005/01/06 20:39:27	1.7
***************
*** 1,4 ****
! /*	$OpenBSD: status.c,v 1.6 2004/12/21 18:32:10 jfb Exp $	*/
  /*
   * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
   * All rights reserved.
--- 1,4 ----
! /*	$OpenBSD: status.c,v 1.7 2005/01/06 20:39:27 jfb Exp $	*/
  /*
   * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
   * All rights reserved.
***************
*** 63,75 ****
  int
  cvs_status(int argc, char **argv)
  {
! 	int i, ch, flags;
  	struct cvsroot *root;
  
  	flags = CF_SORT|CF_IGNORE|CF_RECURSE;
  
! 	while ((ch = getopt(argc, argv, "F:flm:Rr:")) != -1) {
  		switch (ch) {
  		default:
  			return (EX_USAGE);
  		}
--- 63,85 ----
  int
  cvs_status(int argc, char **argv)
  {
! 	int i, ch, flags, verbose;
  	struct cvsroot *root;
  
+ 	verbose = 0;
  	flags = CF_SORT|CF_IGNORE|CF_RECURSE;
  
! 	while ((ch = getopt(argc, argv, "lRv")) != -1) {
  		switch (ch) {
+ 		case 'l':
+ 			flags &= ~CF_RECURSE;
+ 			break;
+ 		case 'R':
+ 			flags |= CF_RECURSE;
+ 			break;
+ 		case 'v':
+ 			verbose = 1;
+ 			break;
  		default:
  			return (EX_USAGE);
  		}
***************
*** 95,102 ****
  		return (EX_USAGE);
  	}
  
! 	if ((root->cr_method != CVS_METHOD_LOCAL) && (cvs_connect(root) < 0))
! 		return (EX_PROTOCOL);
  
  	cvs_file_examine(cvs_files, cvs_status_file, NULL);
  
--- 105,116 ----
  		return (EX_USAGE);
  	}
  
! 	if (root->cr_method != CVS_METHOD_LOCAL) {
! 		if (cvs_connect(root) < 0)
! 			return (EX_PROTOCOL);
! 		if (verbose && (cvs_sendarg(root, "-v", 0) < 0))
! 			return (EX_PROTOCOL);
! 	}
  
  	cvs_file_examine(cvs_files, cvs_status_file, NULL);