===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/Attic/resp.c,v
retrieving revision 1.72
retrieving revision 1.73
diff -c -r1.72 -r1.73
*** src/usr.bin/cvs/Attic/resp.c	2006/03/16 08:43:43	1.72
--- src/usr.bin/cvs/Attic/resp.c	2006/04/14 02:45:35	1.73
***************
*** 1,4 ****
! /*	$OpenBSD: resp.c,v 1.72 2006/03/16 08:43:43 xsa Exp $	*/
  /*
   * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
   * All rights reserved.
--- 1,4 ----
! /*	$OpenBSD: resp.c,v 1.73 2006/04/14 02:45:35 deraadt Exp $	*/
  /*
   * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
   * All rights reserved.
***************
*** 303,309 ****
  	 * at the end of the diff command, even for successfull
  	 * diff.
  	 */
! 	if ((strlen(line) == 1) && (*line == ' '))
  		return (1);
  
  	fprintf(stderr, "%s\n", line);
--- 303,309 ----
  	 * at the end of the diff command, even for successfull
  	 * diff.
  	 */
! 	if (strlen(line) == 1 && *line == ' ')
  		return (1);
  
  	fprintf(stderr, "%s\n", line);
***************
*** 342,349 ****
  	}
  
  	if (cvs_noexec == 0) {
! 		if ((type == CVS_RESP_CLRSTATDIR) &&
! 		    (cvs_unlink(statpath) == -1)) {
  			return (-1);
  		} else if (type == CVS_RESP_SETSTATDIR) {
  			fd = open(statpath, O_CREAT|O_TRUNC|O_WRONLY, 0644);
--- 342,349 ----
  	}
  
  	if (cvs_noexec == 0) {
! 		if (type == CVS_RESP_CLRSTATDIR &&
! 		    cvs_unlink(statpath) == -1) {
  			return (-1);
  		} else if (type == CVS_RESP_SETSTATDIR) {
  			fd = open(statpath, O_CREAT|O_TRUNC|O_WRONLY, 0644);
***************
*** 642,651 ****
  	} else
  		ent->ce_mtime = time(&(ent->ce_mtime));
  
! 	if ((type == CVS_RESP_UPDEXIST) || (type == CVS_RESP_UPDATED) ||
! 	    (type == CVS_RESP_MERGED) || (type == CVS_RESP_CREATED)) {
! 		if ((cvs_ent_remove(cvs_resp_lastent, ent->ce_name, 0) < 0) &&
! 		    (type != CVS_RESP_CREATED)) {
  			cvs_log(LP_WARN, "failed to remove entry for '%s`",
  			    ent->ce_name);
  		}
--- 642,651 ----
  	} else
  		ent->ce_mtime = time(&(ent->ce_mtime));
  
! 	if (type == CVS_RESP_UPDEXIST || type == CVS_RESP_UPDATED ||
! 	    type == CVS_RESP_MERGED || type == CVS_RESP_CREATED) {
! 		if (cvs_ent_remove(cvs_resp_lastent, ent->ce_name, 0) < 0 &&
! 		    type != CVS_RESP_CREATED) {
  			cvs_log(LP_WARN, "failed to remove entry for '%s`",
  			    ent->ce_name);
  		}
***************
*** 714,721 ****
  		return (-1);
  
  	(void)cvs_ent_remove(cvs_resp_lastent, file, 0);
! 	if ((type == CVS_RESP_REMOVED) && ((unlink(fpath) == -1) &&
! 	    errno != ENOENT)) {
  		cvs_log(LP_ERRNO, "failed to unlink `%s'", file);
  		return (-1);
  	}
--- 714,721 ----
  		return (-1);
  
  	(void)cvs_ent_remove(cvs_resp_lastent, file, 0);
! 	if (type == CVS_RESP_REMOVED &&
! 	    (unlink(fpath) == -1 && errno != ENOENT)) {
  		cvs_log(LP_ERRNO, "failed to unlink `%s'", file);
  		return (-1);
  	}