===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/rcs/rcsprog.c,v
retrieving revision 1.107
retrieving revision 1.108
diff -c -r1.107 -r1.108
*** src/usr.bin/rcs/rcsprog.c	2006/04/18 03:35:57	1.107
--- src/usr.bin/rcs/rcsprog.c	2006/04/19 06:53:41	1.108
***************
*** 1,4 ****
! /*	$OpenBSD: rcsprog.c,v 1.107 2006/04/18 03:35:57 ray Exp $	*/
  /*
   * Copyright (c) 2005 Jean-Francois Brousseau <jfb@openbsd.org>
   * All rights reserved.
--- 1,4 ----
! /*	$OpenBSD: rcsprog.c,v 1.108 2006/04/19 06:53:41 xsa Exp $	*/
  /*
   * Copyright (c) 2005 Jean-Francois Brousseau <jfb@openbsd.org>
   * All rights reserved.
***************
*** 35,41 ****
  			"or end of file:\nNOTE: This is NOT the log message!\n"
  
  const char rcs_version[] = "OpenCVS RCS version 3.6";
- int verbose = 1;
  int pipeout = 0;
  
  int	 flags;
--- 35,40 ----
***************
*** 561,567 ****
  			orange = xstrdup(rcs_optarg);
  			break;
  		case 'q':
! 			verbose = 0;
  			break;
  		case 't':
  			descfile = rcs_optarg;
--- 560,566 ----
  			orange = xstrdup(rcs_optarg);
  			break;
  		case 'q':
! 			rcsflags |= QUIET;
  			break;
  		case 't':
  			descfile = rcs_optarg;
***************
*** 612,618 ****
  		if (rcs_statfile(argv[i], fpath, sizeof(fpath)) < 0)
  			continue;
  
! 		if (verbose == 1)
  			printf("RCS file: %s\n", fpath);
  
  		if ((file = rcs_open(fpath, flags, fmode)) == NULL)
--- 611,617 ----
  		if (rcs_statfile(argv[i], fpath, sizeof(fpath)) < 0)
  			continue;
  
! 		if (!(rcsflags & QUIET))
  			printf("RCS file: %s\n", fpath);
  
  		if ((file = rcs_open(fpath, flags, fmode)) == NULL)
***************
*** 730,736 ****
  				fatal("%s: can't lock nonexisting revision %s",
  				    fpath, rev_str);
  			if (rcs_lock_add(file, username, rev) != -1 &&
! 			    verbose == 1)
  				printf("%s locked\n", rev_str);
  			rcsnum_free(rev);
  		}
--- 729,735 ----
  				fatal("%s: can't lock nonexisting revision %s",
  				    fpath, rev_str);
  			if (rcs_lock_add(file, username, rev) != -1 &&
! 			    !(rcsflags & QUIET))
  				printf("%s locked\n", rev_str);
  			rcsnum_free(rev);
  		}
***************
*** 756,762 ****
  				fatal("%s: can't unlock nonexisting revision %s",
  				    fpath, rev_str);
  			if (rcs_lock_remove(file, username, rev) == -1 &&
! 			    verbose == 1)
  				cvs_log(LP_ERR,
  				    "%s: warning: No locks are set.", fpath);
  			rcsnum_free(rev);
--- 755,761 ----
  				fatal("%s: can't unlock nonexisting revision %s",
  				    fpath, rev_str);
  			if (rcs_lock_remove(file, username, rev) == -1 &&
! 			    !(rcsflags & QUIET))
  				cvs_log(LP_ERR,
  				    "%s: warning: No locks are set.", fpath);
  			rcsnum_free(rev);
***************
*** 784,790 ****
  		if (rcsflags & PRESERVETIME)
  			rcs_set_mtime(fpath, rcs_mtime);
  
! 		if (verbose == 1)
  			printf("done\n");
  	}
  
--- 783,789 ----
  		if (rcsflags & PRESERVETIME)
  			rcs_set_mtime(fpath, rcs_mtime);
  
! 		if (!(rcsflags & QUIET))
  			printf("done\n");
  	}