===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/rcs/rcsprog.c,v
retrieving revision 1.109
retrieving revision 1.110
diff -c -r1.109 -r1.110
*** src/usr.bin/rcs/rcsprog.c	2006/04/21 07:06:25	1.109
--- src/usr.bin/rcs/rcsprog.c	2006/04/21 14:18:26	1.110
***************
*** 1,4 ****
! /*	$OpenBSD: rcsprog.c,v 1.109 2006/04/21 07:06:25 xsa Exp $	*/
  /*
   * Copyright (c) 2005 Jean-Francois Brousseau <jfb@openbsd.org>
   * All rights reserved.
--- 1,4 ----
! /*	$OpenBSD: rcsprog.c,v 1.110 2006/04/21 14:18:26 xsa Exp $	*/
  /*
   * Copyright (c) 2005 Jean-Francois Brousseau <jfb@openbsd.org>
   * All rights reserved.
***************
*** 95,101 ****
  	time_t mtime;
  
  	if (stat(filename, &st) == -1) {
! 		cvs_log(LP_ERRNO, "failed to stat `%s'", filename);
  		return (-1);
  	}
  	mtime = (time_t)st.st_mtimespec.tv_sec;
--- 95,101 ----
  	time_t mtime;
  
  	if (stat(filename, &st) == -1) {
! 		warn("%s", filename);
  		return (-1);
  	}
  	mtime = (time_t)st.st_mtimespec.tv_sec;
***************
*** 208,216 ****
  	}
  
  	if (ret == 0)
! 		cvs_log(LP_ERR, "unknown option -%c", opt);
  	else if (ret == 1)
! 		cvs_log(LP_ERR, "missing argument for option -%c", opt);
  
  	return (ret);
  }
--- 208,216 ----
  	}
  
  	if (ret == 0)
! 		warnx("unknown option -%c", opt);
  	else if (ret == 1)
! 		warnx("missing argument for option -%c", opt);
  
  	return (ret);
  }
***************
*** 352,358 ****
  	if (stat(rcspath, &st) == -1 && !(flags & RCS_CREATE)) {
  		if (strcmp(__progname, "rcsclean") != 0 &&
  		    strcmp(__progname, "ci") != 0)
! 			cvs_log(LP_ERRNO, "%s", rcspath);
  		xfree(rcspath);
  		return (-1);
  	}
--- 352,358 ----
  	if (stat(rcspath, &st) == -1 && !(flags & RCS_CREATE)) {
  		if (strcmp(__progname, "rcsclean") != 0 &&
  		    strcmp(__progname, "ci") != 0)
! 			warn("%s", rcspath);
  		xfree(rcspath);
  		return (-1);
  	}
***************
*** 374,380 ****
  	if (new_str == NULL)
  		return;
  	if (*str != NULL)
! 		cvs_log(LP_WARN, "redefinition of revision number");
  	*str = new_str;
  }
  
--- 374,380 ----
  	if (new_str == NULL)
  		return;
  	if (*str != NULL)
! 		warnx("redefinition of revision number");
  	*str = new_str;
  }
  
***************
*** 423,429 ****
  
  	ret = -1;
  	rcs_optind = 1;
- 	cvs_log_init(LD_STD, 0);
  	SLIST_INIT(&rcs_temp_files);
  
  	cmd_argc = 0;
--- 423,428 ----
***************
*** 432,438 ****
  		ret = rcs_init(rcsinit, cmd_argv + 1,
  		    RCS_CMD_MAXARG - 1);
  		if (ret < 0) {
! 			cvs_log(LP_ERRNO, "failed to prepend RCSINIT options");
  			exit (1);
  		}
  
--- 431,437 ----
  		ret = rcs_init(rcsinit, cmd_argv + 1,
  		    RCS_CMD_MAXARG - 1);
  		if (ret < 0) {
! 			warnx("failed to prepend RCSINIT options");
  			exit (1);
  		}
  
***************
*** 526,540 ****
  		case 'k':
  			kflag = rcs_kflag_get(rcs_optarg);
  			if (RCS_KWEXP_INVAL(kflag)) {
! 				cvs_log(LP_ERR,
! 				    "invalid keyword substitution mode `%s'",
! 				    rcs_optarg);
  				exit(1);
  			}
  			break;
  		case 'L':
  			if (lkmode == RCS_LOCK_LOOSE)
! 				cvs_log(LP_WARN, "-U overriden by -L");
  			lkmode = RCS_LOCK_STRICT;
  			break;
  		case 'l':
--- 525,538 ----
  		case 'k':
  			kflag = rcs_kflag_get(rcs_optarg);
  			if (RCS_KWEXP_INVAL(kflag)) {
! 				warnx("invalid keyword substitution "
! 				    "mode `%s'", rcs_optarg);
  				exit(1);
  			}
  			break;
  		case 'L':
  			if (lkmode == RCS_LOCK_LOOSE)
! 				warnx("-U overriden by -L");
  			lkmode = RCS_LOCK_STRICT;
  			break;
  		case 'l':
***************
*** 570,576 ****
  			break;
  		case 'U':
  			if (lkmode == RCS_LOCK_STRICT)
! 				cvs_log(LP_WARN, "-L overriden by -U");
  			lkmode = RCS_LOCK_LOOSE;
  			break;
  		case 'u':
--- 568,574 ----
  			break;
  		case 'U':
  			if (lkmode == RCS_LOCK_STRICT)
! 				warnx("-L overriden by -U");
  			lkmode = RCS_LOCK_LOOSE;
  			break;
  		case 'u':
***************
*** 601,607 ****
  	argv += rcs_optind;
  
  	if (argc == 0) {
! 		cvs_log(LP_ERR, "no input file");
  		(usage)();
  		exit(1);
  	}
--- 599,605 ----
  	argv += rcs_optind;
  
  	if (argc == 0) {
! 		warnx("no input file");
  		(usage)();
  		exit(1);
  	}
***************
*** 629,650 ****
  
  		if (logstr != NULL) {
  			if ((logmsg = strchr(logstr, ':')) == NULL) {
! 				cvs_log(LP_ERR, "missing log message");
  				rcs_close(file);
  				continue;
  			}
  
  			*logmsg++ = '\0';
  			if ((logrev = rcsnum_parse(logstr)) == NULL) {
! 				cvs_log(LP_ERR,
! 				    "'%s' bad revision number", logstr);
  				rcs_close(file);
  				continue;
  			}
  
  			if (rcs_rev_setlog(file, logrev, logmsg) < 0) {
! 				cvs_log(LP_ERR,
! 				    "failed to set logmsg for '%s' to '%s'",
  				    logstr, logmsg);
  				rcs_close(file);
  				rcsnum_free(logrev);
--- 627,646 ----
  
  		if (logstr != NULL) {
  			if ((logmsg = strchr(logstr, ':')) == NULL) {
! 				warnx("missing log message");
  				rcs_close(file);
  				continue;
  			}
  
  			*logmsg++ = '\0';
  			if ((logrev = rcsnum_parse(logstr)) == NULL) {
! 				warnx("'%s' bad revision number", logstr);
  				rcs_close(file);
  				continue;
  			}
  
  			if (rcs_rev_setlog(file, logrev, logmsg) < 0) {
! 				warnx("failed to set logmsg for '%s' to '%s'",
  				    logstr, logmsg);
  				rcs_close(file);
  				rcsnum_free(logrev);
***************
*** 718,724 ****
  				rev = rcsnum_alloc();
  				rcsnum_cpy(file->rf_head, rev, 0);
  			} else if ((rev = rcsnum_parse(lrev)) == NULL) {
! 				cvs_log(LP_ERR, "unable to unlock file");
  				rcs_close(file);
  				continue;
  			}
--- 714,720 ----
  				rev = rcsnum_alloc();
  				rcsnum_cpy(file->rf_head, rev, 0);
  			} else if ((rev = rcsnum_parse(lrev)) == NULL) {
! 				warnx("unable to unlock file");
  				rcs_close(file);
  				continue;
  			}
***************
*** 744,750 ****
  				rev = rcsnum_alloc();
  				rcsnum_cpy(file->rf_head, rev, 0);
  			} else if ((rev = rcsnum_parse(urev)) == NULL) {
! 				cvs_log(LP_ERR, "unable to unlock file");
  				rcs_close(file);
  				continue;
  			}
--- 740,746 ----
  				rev = rcsnum_alloc();
  				rcsnum_cpy(file->rf_head, rev, 0);
  			} else if ((rev = rcsnum_parse(urev)) == NULL) {
! 				warnx("unable to unlock file");
  				rcs_close(file);
  				continue;
  			}
***************
*** 755,762 ****
  				    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);
  		}
  
--- 751,757 ----
  				    fpath, rev_str);
  			if (rcs_lock_remove(file, username, rev) == -1 &&
  			    !(rcsflags & QUIET))
! 				warnx("%s: warning: No locks are set.", fpath);
  			rcsnum_free(rev);
  		}
  
***************
*** 828,835 ****
  		if (rcs_sym_remove(file, symname) < 0) {
  			if (rcs_errno == RCS_ERR_NOENT &&
  			    !(rcsflags & RCSPROG_NFLAG))
! 				cvs_log(LP_WARN,
! 				    "can't delete nonexisting symbol %s", symname);
  		} else {
  			if (rcsflags & RCSPROG_NFLAG)
  				rm = 0;
--- 823,830 ----
  		if (rcs_sym_remove(file, symname) < 0) {
  			if (rcs_errno == RCS_ERR_NOENT &&
  			    !(rcsflags & RCSPROG_NFLAG))
! 				warnx("can't delete nonexisting symbol %s",
! 				    symname);
  		} else {
  			if (rcsflags & RCSPROG_NFLAG)
  				rm = 0;