===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/rcs/rcsdiff.c,v
retrieving revision 1.62
retrieving revision 1.63
diff -c -r1.62 -r1.63
*** src/usr.bin/rcs/rcsdiff.c	2006/05/08 09:48:12	1.62
--- src/usr.bin/rcs/rcsdiff.c	2006/05/08 09:59:09	1.63
***************
*** 1,4 ****
! /*	$OpenBSD: rcsdiff.c,v 1.62 2006/05/08 09:48:12 xsa Exp $	*/
  /*
   * Copyright (c) 2005 Joris Vink <joris@openbsd.org>
   * All rights reserved.
--- 1,4 ----
! /*	$OpenBSD: rcsdiff.c,v 1.63 2006/05/08 09:59:09 xsa Exp $	*/
  /*
   * Copyright (c) 2005 Joris Vink <joris@openbsd.org>
   * All rights reserved.
***************
*** 48,61 ****
  	status = D_SAME;
  
  	if (strlcpy(diffargs, "diff", sizeof(diffargs)) >= sizeof(diffargs))
! 		errx(1, "diffargs too long");
  
  	while ((ch = rcs_getopt(argc, argv, "ck:nqr:TuVx::z::")) != -1) {
  		switch (ch) {
  		case 'c':
  			if (strlcat(diffargs, " -c", sizeof(diffargs)) >=
  			    sizeof(diffargs))
! 				errx(1, "diffargs too long");
  			diff_format = D_CONTEXT;
  			break;
  		case 'k':
--- 48,61 ----
  	status = D_SAME;
  
  	if (strlcpy(diffargs, "diff", sizeof(diffargs)) >= sizeof(diffargs))
! 		errx(D_ERROR, "diffargs too long");
  
  	while ((ch = rcs_getopt(argc, argv, "ck:nqr:TuVx::z::")) != -1) {
  		switch (ch) {
  		case 'c':
  			if (strlcat(diffargs, " -c", sizeof(diffargs)) >=
  			    sizeof(diffargs))
! 				errx(D_ERROR, "diffargs too long");
  			diff_format = D_CONTEXT;
  			break;
  		case 'k':
***************
*** 69,75 ****
  		case 'n':
  			if (strlcat(diffargs, " -n", sizeof(diffargs)) >=
  			    sizeof(diffargs))
! 				errx(1, "diffargs too long");
  			diff_format = D_RCSDIFF;
  			break;
  		case 'q':
--- 69,75 ----
  		case 'n':
  			if (strlcat(diffargs, " -n", sizeof(diffargs)) >=
  			    sizeof(diffargs))
! 				errx(D_ERROR, "diffargs too long");
  			diff_format = D_RCSDIFF;
  			break;
  		case 'q':
***************
*** 86,92 ****
  		case 'u':
  			if (strlcat(diffargs, " -u", sizeof(diffargs)) >=
  			    sizeof(diffargs))
! 				errx(1, "diffargs too long");
  			diff_format = D_UNIFIED;
  			break;
  		case 'V':
--- 86,92 ----
  		case 'u':
  			if (strlcat(diffargs, " -u", sizeof(diffargs)) >=
  			    sizeof(diffargs))
! 				errx(D_ERROR, "diffargs too long");
  			diff_format = D_UNIFIED;
  			break;
  		case 'V':
***************
*** 128,138 ****
  
  		if (rev_str1 != NULL) {
  			if ((rev1 = rcs_getrevnum(rev_str1, file)) == NULL)
! 				errx(1, "bad revision number");
  		}
  		if (rev_str2 != NULL) {
  			if ((rev2 = rcs_getrevnum(rev_str2, file)) == NULL)
! 				errx(1, "bad revision number");
  		}
  
  		if (!(flags & QUIET)) {
--- 128,138 ----
  
  		if (rev_str1 != NULL) {
  			if ((rev1 = rcs_getrevnum(rev_str1, file)) == NULL)
! 				errx(D_ERROR, "bad revision number");
  		}
  		if (rev_str2 != NULL) {
  			if ((rev2 = rcs_getrevnum(rev_str2, file)) == NULL)
! 				errx(D_ERROR, "bad revision number");
  		}
  
  		if (!(flags & QUIET)) {
***************
*** 223,229 ****
  
  	/* XXX - GNU uses GMT */
  	if (fstat(fd, &st) == -1)
! 		err(1, "%s", filename);
  
  	tb = gmtime(&st.st_mtime);
  	t = mktime(tb);
--- 223,229 ----
  
  	/* XXX - GNU uses GMT */
  	if (fstat(fd, &st) == -1)
! 		err(D_ERROR, "%s", filename);
  
  	tb = gmtime(&st.st_mtime);
  	t = mktime(tb);