===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/rcs/rcsclean.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -c -r1.37 -r1.38
*** src/usr.bin/rcs/rcsclean.c	2006/04/19 06:53:41	1.37
--- src/usr.bin/rcs/rcsclean.c	2006/04/21 14:18:26	1.38
***************
*** 1,4 ****
! /*	$OpenBSD: rcsclean.c,v 1.37 2006/04/19 06:53:41 xsa Exp $	*/
  /*
   * Copyright (c) 2005 Joris Vink <joris@openbsd.org>
   * All rights reserved.
--- 1,4 ----
! /*	$OpenBSD: rcsclean.c,v 1.38 2006/04/21 14:18:26 xsa Exp $	*/
  /*
   * Copyright (c) 2005 Joris Vink <joris@openbsd.org>
   * All rights reserved.
***************
*** 52,59 ****
  		case 'k':
  			kflag = rcs_kflag_get(rcs_optarg);
  			if (RCS_KWEXP_INVAL(kflag)) {
! 				cvs_log(LP_ERR,
! 				    "invalid RCS keyword expansion mode");
  				(usage)();
  				exit(1);
  			}
--- 52,58 ----
  		case 'k':
  			kflag = rcs_kflag_get(rcs_optarg);
  			if (RCS_KWEXP_INVAL(kflag)) {
! 				warnx("invalid RCS keyword expansion mode");
  				(usage)();
  				exit(1);
  			}
***************
*** 98,104 ****
  
  	if (argc == 0) {
  		if ((dirp = opendir(".")) == NULL) {
! 			cvs_log(LP_ERRNO, "failed to open directory '.'");
  			(usage)();
  			exit(1);
  		}
--- 97,103 ----
  
  	if (argc == 0) {
  		if ((dirp = opendir(".")) == NULL) {
! 			warn("opendir");
  			(usage)();
  			exit(1);
  		}
***************
*** 109,115 ****
  			rcsclean_file(dp->d_name, rev_str);
  		}
  
! 		closedir(dirp);
  	} else
  		for (i = 0; i < argc; i++)
  			rcsclean_file(argv[i], rev_str);
--- 108,114 ----
  			rcsclean_file(dp->d_name, rev_str);
  		}
  
! 		(void)closedir(dirp);
  	} else
  		for (i = 0; i < argc; i++)
  			rcsclean_file(argv[i], rev_str);
***************
*** 153,169 ****
  	if (rev_str == NULL)
  		rev = file->rf_head;
  	else if ((rev = rcs_getrevnum(rev_str, file)) == NULL) {
! 		cvs_log(LP_ERR, "%s: Symbolic name `%s' is undefined.",
! 		    fpath, rev_str);
  		goto out;
  	}
  
  	if ((b1 = rcs_getrev(file, rev)) == NULL) {
! 		cvs_log(LP_ERR, "failed to get needed revision");
  		goto out;
  	}
  	if ((b2 = cvs_buf_load(fname, 0)) == NULL) {
! 		cvs_log(LP_ERRNO, "failed to load '%s'", fname);
  		goto out;
  	}
  
--- 152,167 ----
  	if (rev_str == NULL)
  		rev = file->rf_head;
  	else if ((rev = rcs_getrevnum(rev_str, file)) == NULL) {
! 		warnx("%s: Symbolic name `%s' is undefined.", fpath, rev_str);
  		goto out;
  	}
  
  	if ((b1 = rcs_getrev(file, rev)) == NULL) {
! 		warnx("failed to get needed revision");
  		goto out;
  	}
  	if ((b2 = cvs_buf_load(fname, 0)) == NULL) {
! 		warnx("failed to load `%s'", fname);
  		goto out;
  	}