===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/file.c,v
retrieving revision 1.107
retrieving revision 1.108
diff -c -r1.107 -r1.108
*** src/usr.bin/cvs/file.c	2005/07/29 00:33:55	1.107
--- src/usr.bin/cvs/file.c	2005/07/29 13:56:00	1.108
***************
*** 1,4 ****
! /*	$OpenBSD: file.c,v 1.107 2005/07/29 00:33:55 joris Exp $	*/
  /*
   * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
   * All rights reserved.
--- 1,4 ----
! /*	$OpenBSD: file.c,v 1.108 2005/07/29 13:56:00 joris Exp $	*/
  /*
   * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
   * All rights reserved.
***************
*** 453,460 ****
  		 * Load the information.
  		 */
  		cf = cvs_file_loadinfo(pcopy, flags, cb, arg, freecf);
! 		if (cf == NULL)
  			continue;
  
  		/*
  		 * If extra actions are needed, do them now.
--- 453,463 ----
  		 * Load the information.
  		 */
  		cf = cvs_file_loadinfo(pcopy, flags, cb, arg, freecf);
! 		if (cf == NULL) {
! 			if (cvs_error != CVS_EX_OK)
! 				break;
  			continue;
+ 		}
  
  		/*
  		 * If extra actions are needed, do them now.
***************
*** 567,572 ****
--- 570,576 ----
  	if (base == NULL) {
  		cvs_log(LP_ERR, "failed to obtain directory info for '%s'",
  		    parent);
+ 		cvs_error = CVS_EX_FILE;
  		goto fail;
  	}
  
***************
*** 580,586 ****
  
  	root = CVS_DIR_ROOT(base);
  	if (root == NULL) {
! 		cvs_log(LP_ERR, "no Root in base directory found");
  		goto fail;
  	}
  
--- 584,590 ----
  
  	root = CVS_DIR_ROOT(base);
  	if (root == NULL) {
! 		cvs_error = CVS_EX_BADROOT;
  		goto fail;
  	}
  
***************
*** 591,597 ****
  	if (type != DT_DIR) {
  		cf = cvs_file_lget(path, flags, base, ent);
  		if (cf == NULL) {
! 			cvs_log(LP_ERR, "failed to fetch '%s'", path);
  			goto fail;
  		}
  
--- 595,601 ----
  	if (type != DT_DIR) {
  		cf = cvs_file_lget(path, flags, base, ent);
  		if (cf == NULL) {
! 			cvs_error = CVS_EX_DATA;
  			goto fail;
  		}
  
***************
*** 627,633 ****
  		 */
  		if ((base->cf_flags & CVS_FILE_ONDISK) &&
  		    cvs_file_getdir(base, flags, cb, arg, freecf) < 0) {
! 			cvs_log(LP_ERR, "cvs_file_getdir failed");
  			goto fail;
  		}
  	}
--- 631,637 ----
  		 */
  		if ((base->cf_flags & CVS_FILE_ONDISK) &&
  		    cvs_file_getdir(base, flags, cb, arg, freecf) < 0) {
! 			cvs_error = CVS_EX_FILE;
  			goto fail;
  		}
  	}