summaryrefslogtreecommitdiff
path: root/usr.bin/cvs/client.c
diff options
context:
space:
mode:
authorJoris Vink <joris@cvs.openbsd.org>2008-02-29 21:43:58 +0000
committerJoris Vink <joris@cvs.openbsd.org>2008-02-29 21:43:58 +0000
commit48a08d65744d3969e41e3c83231c81e8b663e9cd (patch)
tree7bebca6a3360fb05cd7b57ba247a1e29a6b37e4f /usr.bin/cvs/client.c
parentb20e1ca6a1bb9fb8ba25ba94a50bdbf952e6714d (diff)
handle file permissions and owners properly.
matches what gnu cvs does. fixes the fact that we couldnt update group writable files. problem report & diff testing by David Crawshaw.
Diffstat (limited to 'usr.bin/cvs/client.c')
-rw-r--r--usr.bin/cvs/client.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/usr.bin/cvs/client.c b/usr.bin/cvs/client.c
index 2f5a1b99d85..a2cdcc74fba 100644
--- a/usr.bin/cvs/client.c
+++ b/usr.bin/cvs/client.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: client.c,v 1.107 2008/02/28 20:00:56 joris Exp $ */
+/* $OpenBSD: client.c,v 1.108 2008/02/29 21:43:57 joris Exp $ */
/*
* Copyright (c) 2006 Joris Vink <joris@openbsd.org>
*
@@ -751,6 +751,7 @@ cvs_client_updated(char *data)
xfree(entry);
+ (void)unlink(fpath);
if ((fd = open(fpath, O_CREAT | O_WRONLY | O_TRUNC)) == -1)
fatal("cvs_client_updated: open: %s: %s",
fpath, strerror(errno));
@@ -828,6 +829,7 @@ cvs_client_merged(char *data)
cvs_ent_close(ent, ENT_SYNC);
xfree(entry);
+ (void)unlink(fpath);
if ((fd = open(fpath, O_CREAT | O_WRONLY | O_TRUNC)) == -1)
fatal("cvs_client_merged: open: %s: %s",
fpath, strerror(errno));