=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/server.c,v retrieving revision 1.47 retrieving revision 1.48 diff -c -r1.47 -r1.48 *** src/usr.bin/cvs/server.c 2007/01/03 22:28:30 1.47 --- src/usr.bin/cvs/server.c 2007/01/13 15:29:34 1.48 *************** *** 1,4 **** ! /* $OpenBSD: server.c,v 1.47 2007/01/03 22:28:30 joris Exp $ */ /* * Copyright (c) 2006 Joris Vink * --- 1,4 ---- ! /* $OpenBSD: server.c,v 1.48 2007/01/13 15:29:34 joris Exp $ */ /* * Copyright (c) 2006 Joris Vink * *************** *** 346,352 **** void cvs_server_modified(char *data) { - BUF *bp; int fd; size_t flen; mode_t fmode; --- 346,351 ---- *************** *** 364,371 **** fatal("cvs_server_modified: %s", errstr); xfree(len); - bp = cvs_remote_receive_file(flen); - fpath = xmalloc(MAXPATHLEN); if (cvs_path_cat(server_currentdir, data, fpath, MAXPATHLEN) >= MAXPATHLEN) --- 363,368 ---- *************** *** 374,388 **** if ((fd = open(fpath, O_WRONLY | O_CREAT | O_TRUNC)) == -1) fatal("cvs_server_modified: %s: %s", fpath, strerror(errno)); ! if (cvs_buf_write_fd(bp, fd) == -1) ! fatal("cvs_server_modified: failed to write file '%s'", fpath); if (fchmod(fd, 0600) == -1) fatal("cvs_server_modified: failed to set file mode"); xfree(fpath); (void)close(fd); - cvs_buf_free(bp); } void --- 371,383 ---- if ((fd = open(fpath, O_WRONLY | O_CREAT | O_TRUNC)) == -1) fatal("cvs_server_modified: %s: %s", fpath, strerror(errno)); ! cvs_remote_receive_file(fd, flen); if (fchmod(fd, 0600) == -1) fatal("cvs_server_modified: failed to set file mode"); xfree(fpath); (void)close(fd); } void