diff options
| author | Joris Vink <joris@cvs.openbsd.org> | 2008-02-27 22:34:05 +0000 |
|---|---|---|
| committer | Joris Vink <joris@cvs.openbsd.org> | 2008-02-27 22:34:05 +0000 |
| commit | c8955619dd8db636823797d2bd41b68bc78af8c1 (patch) | |
| tree | 0f1a922b9d1b4bb083ea6b7477f91aaa7333681d /usr.bin/cvs/import.c | |
| parent | 3d3b75f61b57504b71451e352de59d6ff8ffd6a4 (diff) | |
prevent file races
ok tobias@
Diffstat (limited to 'usr.bin/cvs/import.c')
| -rw-r--r-- | usr.bin/cvs/import.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/usr.bin/cvs/import.c b/usr.bin/cvs/import.c index 83047694576..7fe760ef03e 100644 --- a/usr.bin/cvs/import.c +++ b/usr.bin/cvs/import.c @@ -1,4 +1,4 @@ -/* $OpenBSD: import.c,v 1.84 2008/02/20 17:29:28 tobias Exp $ */ +/* $OpenBSD: import.c,v 1.85 2008/02/27 22:34:04 joris Exp $ */ /* * Copyright (c) 2006 Joris Vink <joris@openbsd.org> * @@ -359,6 +359,7 @@ import_get_rcsdiff(struct cvs_file *cf, RCSNUM *rev) { char *p1, *p2; BUF *b1, *b2; + int fd1, fd2; b2 = cvs_buf_alloc(128); @@ -366,16 +367,19 @@ import_get_rcsdiff(struct cvs_file *cf, RCSNUM *rev) b1 = cvs_buf_load_fd(cf->fd); (void)xasprintf(&p1, "%s/diff1.XXXXXXXXXX", cvs_tmpdir); - cvs_buf_write_stmp(b1, p1, NULL); + fd1 = cvs_buf_write_stmp(b1, p1, NULL); cvs_buf_free(b1); (void)xasprintf(&p2, "%s/diff2.XXXXXXXXXX", cvs_tmpdir); - rcs_rev_write_stmp(cf->file_rcs, rev, p2, RCS_KWEXP_NONE); + fd2 = rcs_rev_write_stmp(cf->file_rcs, rev, p2, RCS_KWEXP_NONE); diff_format = D_RCSDIFF; - if (cvs_diffreg(p2, p1, b2) == D_ERROR) + if (cvs_diffreg(p2, p1, fd2, fd1, b2) == D_ERROR) fatal("import_get_rcsdiff: failed to get RCS patch"); + close(fd1); + close(fd2); + (void)unlink(p1); (void)unlink(p2); |