===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/remove.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -c -r1.8 -r1.9
*** src/usr.bin/cvs/remove.c	2005/04/18 21:02:50	1.8
--- src/usr.bin/cvs/remove.c	2005/04/19 15:36:39	1.9
***************
*** 1,4 ****
! /*	$OpenBSD: remove.c,v 1.8 2005/04/18 21:02:50 jfb Exp $	*/
  /*
   * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
   * Copyright (c) 2004 Xavier Santolaria <xsa@openbsd.org>
--- 1,4 ----
! /*	$OpenBSD: remove.c,v 1.9 2005/04/19 15:36:39 xsa Exp $	*/
  /*
   * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
   * Copyright (c) 2004 Xavier Santolaria <xsa@openbsd.org>
***************
*** 32,38 ****
  #include <stdio.h>
  #include <stdlib.h>
  #include <string.h>
- #include <libgen.h>
  #include <unistd.h>
  
  #include "cvs.h"
--- 32,37 ----
***************
*** 69,76 ****
--- 68,77 ----
  			force_remove = 1;
  			break;
  		case 'l':
+ 			cvs_remove.file_flags &= ~CF_RECURSE;
  			break;
  		case 'R':
+ 			cvs_remove.file_flags |= CF_RECURSE;
  			break;
  		default:
  			return (CVS_EX_USAGE);
***************
*** 113,119 ****
  	cvs_file_getpath(cf, fpath, sizeof(fpath));
  
  	if (root->cr_method != CVS_METHOD_LOCAL) {
! 		ret = cvs_sendentry(root, cf);
  	} else {
  		/* if -f option is used, physically remove the file */
  		if (force_remove == 1) {
--- 114,123 ----
  	cvs_file_getpath(cf, fpath, sizeof(fpath));
  
  	if (root->cr_method != CVS_METHOD_LOCAL) {
! 		if (cvs_sendentry(root, cf) < 0) {
! 			return (CVS_EX_PROTO);
! 		}
! 
  	} else {
  		/* if -f option is used, physically remove the file */
  		if (force_remove == 1) {