===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/watch.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -c -r1.9 -r1.10
*** src/usr.bin/cvs/watch.c	2005/12/30 02:03:28	1.9
--- src/usr.bin/cvs/watch.c	2005/12/31 13:27:51	1.10
***************
*** 1,4 ****
! /*	$OpenBSD: watch.c,v 1.9 2005/12/30 02:03:28 joris Exp $	*/
  /*
   * Copyright (c) 2005 Xavier Santolaria <xsa@openbsd.org>
   * Copyright (c) 2005 Moritz Jodeit <moritz@openbsd.org>
--- 1,4 ----
! /*	$OpenBSD: watch.c,v 1.10 2005/12/31 13:27:51 xsa Exp $	*/
  /*
   * Copyright (c) 2005 Xavier Santolaria <xsa@openbsd.org>
   * Copyright (c) 2005 Moritz Jodeit <moritz@openbsd.org>
***************
*** 114,127 ****
  			 * Only `watch add | remove' support the -a option.
  			 * Check which command has been issued.
  			 */
! 			if (watchreq != CVS_REQ_WATCH_ADD &&
! 			    watchreq != CVS_REQ_WATCH_REMOVE)
  				return (CVS_EX_USAGE);
! 			if (strcmp(optarg, "commit") != 0 &&
! 			    strcmp(optarg, "edit") != 0 &&
! 			    strcmp(optarg, "unedit") != 0 &&
! 			    strcmp(optarg, "all") != 0 &&
! 			    strcmp(optarg, "none") != 0)
  				return (CVS_EX_USAGE);
  			aoptstr = xstrdup(optarg);
  			break;
--- 114,127 ----
  			 * Only `watch add | remove' support the -a option.
  			 * Check which command has been issued.
  			 */
! 			if ((watchreq != CVS_REQ_WATCH_ADD) &&
! 			    (watchreq != CVS_REQ_WATCH_REMOVE))
  				return (CVS_EX_USAGE);
! 			if ((strcmp(optarg, "commit") != 0) &&
! 			    (strcmp(optarg, "edit") != 0) &&
! 			    (strcmp(optarg, "unedit") != 0) &&
! 			    (strcmp(optarg, "all") != 0) &&
! 			    (strcmp(optarg, "none") != 0))
  				return (CVS_EX_USAGE);
  			aoptstr = xstrdup(optarg);
  			break;
***************
*** 149,156 ****
  cvs_watch_pre_exec(struct cvsroot *root)
  {
  	if (root->cr_method != CVS_METHOD_LOCAL) {
! 		if (watchreq != CVS_REQ_WATCH_ADD &&
! 		    watchreq != CVS_REQ_WATCH_REMOVE)
  			return (CVS_EX_OK);
  
  		if (aoptstr == NULL || strcmp(aoptstr, "all") == 0) {
--- 149,156 ----
  cvs_watch_pre_exec(struct cvsroot *root)
  {
  	if (root->cr_method != CVS_METHOD_LOCAL) {
! 		if ((watchreq != CVS_REQ_WATCH_ADD) &&
! 		    (watchreq != CVS_REQ_WATCH_REMOVE))
  			return (CVS_EX_OK);
  
  		if (aoptstr == NULL || strcmp(aoptstr, "all") == 0) {