===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/diff/diffdir.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -c -r1.13 -r1.14
*** src/usr.bin/diff/diffdir.c	2003/06/25 22:14:43	1.13
--- src/usr.bin/diff/diffdir.c	2003/06/26 18:19:29	1.14
***************
*** 1,4 ****
! /*	$OpenBSD: diffdir.c,v 1.13 2003/06/25 22:14:43 millert Exp $	*/
  
  /*
   * Copyright (C) Caldera International Inc.  2001-2002.
--- 1,4 ----
! /*	$OpenBSD: diffdir.c,v 1.14 2003/06/26 18:19:29 millert Exp $	*/
  
  /*
   * Copyright (C) Caldera International Inc.  2001-2002.
***************
*** 186,192 ****
  	*fpp = emalloc(MAXPATHLEN);
  	len = strlcpy(*fpp, file, MAXPATHLEN);
  	if (len >= MAXPATHLEN - 1)
! 		errx(1, "%s: %s", file, strerror(ENAMETOOLONG));
  	cp = *fpp + len - 1;
  	if (*cp == '/')
  		++cp;
--- 186,192 ----
  	*fpp = emalloc(MAXPATHLEN);
  	len = strlcpy(*fpp, file, MAXPATHLEN);
  	if (len >= MAXPATHLEN - 1)
! 		errorx("%s: %s", file, strerror(ENAMETOOLONG));
  	cp = *fpp + len - 1;
  	if (*cp == '/')
  		++cp;
***************
*** 239,248 ****
  	DIR *dirp;
  
  	dirp = opendir(cp);
! 	if (dirp == NULL) {
! 		warn("%s", cp);
! 		done(0);
! 	}
  	nitems = 0;
  	dp = emalloc(sizeof(struct dir));
  	while ((rp = readdir(dirp))) {
--- 239,246 ----
  	DIR *dirp;
  
  	dirp = opendir(cp);
! 	if (dirp == NULL)
! 		error("%s", cp);
  	nitems = 0;
  	dp = emalloc(sizeof(struct dir));
  	while ((rp = readdir(dirp))) {
***************
*** 284,295 ****
  	strlcpy(efile2, dp->d_entry, file2 + MAXPATHLEN - efile2);
  	f1 = open(file1, 0);
  	if (f1 < 0) {
! 		perror(file1);
  		return;
  	}
  	f2 = open(file2, 0);
  	if (f2 < 0) {
! 		perror(file2);
  		close(f1);
  		return;
  	}
--- 282,293 ----
  	strlcpy(efile2, dp->d_entry, file2 + MAXPATHLEN - efile2);
  	f1 = open(file1, 0);
  	if (f1 < 0) {
! 		warn("%s", file1);
  		return;
  	}
  	f2 = open(file2, 0);
  	if (f2 < 0) {
! 		warn("%s", file2);
  		close(f1);
  		return;
  	}
***************
*** 378,387 ****
  		    "%s %s", file1, file2);
  		pipe(pv);
  		pid = fork();
! 		if (pid == -1) {
! 			warnx("No more processes");
! 			done(0);
! 		}
  		if (pid == 0) {
  			close(0);
  			dup(pv[0]);
--- 376,383 ----
  		    "%s %s", file1, file2);
  		pipe(pv);
  		pid = fork();
! 		if (pid == -1)
! 			errorx("No more processes");
  		if (pid == 0) {
  			close(0);
  			dup(pv[0]);
***************
*** 389,403 ****
  			close(pv[1]);
  			execv(pr + 4, prargs);
  			execv(pr, prargs);
! 			perror(pr);
! 			done(0);
  		}
  	}
  	pid = fork();
! 	if (pid == -1) {
! 		warnx("No more processes");
! 		done(0);
! 	}
  	if (pid == 0) {
  		if (wantpr) {
  			close(1);
--- 385,396 ----
  			close(pv[1]);
  			execv(pr + 4, prargs);
  			execv(pr, prargs);
! 			errorx("%s", pr);
  		}
  	}
  	pid = fork();
! 	if (pid == -1)
! 		errorx("No more processes");
  	if (pid == 0) {
  		if (wantpr) {
  			close(1);
***************
*** 407,414 ****
  		}
  		execv(diff + 4, diffargv);
  		execv(diff, diffargv);
! 		perror(diff);
! 		done(0);
  	}
  	if (wantpr) {
  		close(pv[0]);
--- 400,406 ----
  		}
  		execv(diff + 4, diffargv);
  		execv(diff, diffargv);
! 		error("%s", diff);
  	}
  	if (wantpr) {
  		close(pv[0]);