diff options
| author |   joris <joris@openbsd.org> | 2006-06-28 17:59:06 +0000 |
|---|---|---|
| committer | joris <joris@openbsd.org> | 2006-06-28 17:59:06 +0000 |
| commit | 2d02866c0fe596d65aba54cb90ee6addc62383f6 (patch) | |
| tree | 255ee29722ac43d5e4a0aaeb86f1c4be5d3b445e /usr.bin/cvs/commit.c | |
| parent | pobeda preved; from form (diff) | |
| download | wireguard-openbsd-2d02866c0fe596d65aba54cb90ee6addc62383f6.tar.xz wireguard-openbsd-2d02866c0fe596d65aba54cb90ee6addc62383f6.zip | |
do not fail when we are trying to commit a newly added file when the CVS/*,t
file is not present for the file.
spotted and tested by reyk@
okay xsa@
Diffstat (limited to 'usr.bin/cvs/commit.c')
| -rw-r--r-- | usr.bin/cvs/commit.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/usr.bin/cvs/commit.c b/usr.bin/cvs/commit.c index b237be90963..fd065e4de09 100644 --- a/usr.bin/cvs/commit.c +++ b/usr.bin/cvs/commit.c @@ -1,4 +1,4 @@ -/* $OpenBSD: commit.c,v 1.75 2006/06/19 05:05:17 joris Exp $ */ +/* $OpenBSD: commit.c,v 1.76 2006/06/28 17:59:06 joris Exp $ */ /* * Copyright (c) 2006 Joris Vink <joris@openbsd.org> * Copyright (c) 2006 Xavier Santolaria <xsa@openbsd.org> @@ -383,7 +383,7 @@ static void commit_desc_set(struct cvs_file *cf) { BUF *bp; - int l; + int l, fd; char *desc_path, *desc; desc_path = xmalloc(MAXPATHLEN); @@ -392,16 +392,18 @@ commit_desc_set(struct cvs_file *cf) if (l == -1 || l >= MAXPATHLEN) fatal("commit_desc_set: overflow"); - if ((bp = cvs_buf_load(desc_path, BUF_AUTOEXT)) == NULL) { + if ((fd = open(desc_path, O_RDONLY)) == -1) { xfree(desc_path); return; } + cvs_buf_load_fd(fd, BUF_AUTOEXT); cvs_buf_putc(bp, '\0'); desc = cvs_buf_release(bp); rcs_desc_set(cf->file_rcs, desc); + (void)close(fd); (void)cvs_unlink(desc_path); xfree(desc); |