===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/status.c,v
retrieving revision 1.67
retrieving revision 1.68
diff -c -r1.67 -r1.68
*** src/usr.bin/cvs/status.c	2006/07/07 13:01:40	1.67
--- src/usr.bin/cvs/status.c	2006/07/07 17:37:17	1.68
***************
*** 1,4 ****
! /*	$OpenBSD: status.c,v 1.67 2006/07/07 13:01:40 joris Exp $	*/
  /*
   * Copyright (c) 2006 Joris Vink <joris@openbsd.org>
   * Copyright (c) 2005, 2006 Xavier Santolaria <xsa@openbsd.org>
--- 1,4 ----
! /*	$OpenBSD: status.c,v 1.68 2006/07/07 17:37:17 joris Exp $	*/
  /*
   * Copyright (c) 2006 Joris Vink <joris@openbsd.org>
   * Copyright (c) 2005, 2006 Xavier Santolaria <xsa@openbsd.org>
***************
*** 20,27 ****
  
  #include "cvs.h"
  #include "log.h"
  
- int	cvs_status(int, char **);
  void	cvs_status_local(struct cvs_file *);
  
  static int show_sym = 0;
--- 20,27 ----
  
  #include "cvs.h"
  #include "log.h"
+ #include "remote.h"
  
  void	cvs_status_local(struct cvs_file *);
  
  static int show_sym = 0;
***************
*** 61,67 ****
  	char *arg = ".";
  	struct cvs_recursion cr;
  
! 	flags = CR_REPO | CR_RECURSE_DIRS;
  
  	while ((ch = getopt(argc, argv, cvs_cmd_status.cmd_opts)) != -1) {
  		switch (ch) {
--- 61,67 ----
  	char *arg = ".";
  	struct cvs_recursion cr;
  
! 	flags = CR_RECURSE_DIRS;
  
  	while ((ch = getopt(argc, argv, cvs_cmd_status.cmd_opts)) != -1) {
  		switch (ch) {
***************
*** 83,95 ****
  
  	cr.enterdir = NULL;
  	cr.leavedir = NULL;
! 	cr.fileproc = cvs_status_local;
  	cr.flags = flags;
  
  	if (argc > 0)
  		cvs_file_run(argc, argv, &cr);
  	else
  		cvs_file_run(1, &arg, &cr);
  
  	return (0);
  }
--- 83,113 ----
  
  	cr.enterdir = NULL;
  	cr.leavedir = NULL;
! 
! 	if (current_cvsroot->cr_method == CVS_METHOD_LOCAL) {
! 		flags |= CR_REPO;
! 		cr.fileproc = cvs_status_local;
! 	} else {
! 		if (!(flags & CR_RECURSE_DIRS))
! 			cvs_client_send_request("Argument -l");
! 		if (show_sym)
! 			cvs_client_send_request("Argument -v");
! 		cr.fileproc = cvs_client_sendfile;
! 	}
! 
  	cr.flags = flags;
  
  	if (argc > 0)
  		cvs_file_run(argc, argv, &cr);
  	else
  		cvs_file_run(1, &arg, &cr);
+ 
+ 	if (current_cvsroot->cr_method != CVS_METHOD_LOCAL) {
+ 		cvs_client_send_files(argv, argc);
+ 		cvs_client_senddir(".");
+ 		cvs_client_send_request("status");
+ 		cvs_client_get_responses();
+ 	}
  
  	return (0);
  }