diff options
| author |   tobias <tobias@openbsd.org> | 2008-01-10 09:54:04 +0000 |
|---|---|---|
| committer | tobias <tobias@openbsd.org> | 2008-01-10 09:54:04 +0000 |
| commit | 87d368dc8d0a9351fb79b7aecb62b8c3538d8346 (patch) | |
| tree | 9218060e56dbf8bc7339711e5937c630ade3b0b1 /usr.bin/cvs/commit.c | |
| parent | return with ENOTTY instead of EINVAL for unknown ioctl requests to trunk (diff) | |
| download | wireguard-openbsd-87d368dc8d0a9351fb79b7aecb62b8c3538d8346.tar.xz wireguard-openbsd-87d368dc8d0a9351fb79b7aecb62b8c3538d8346.zip | |
Our keyword expansion had a big flaw, due to this construction:
if (!(mode & RCS_KWEXP_NONE))
RCS_KWEXP_NONE is defined to 0, so expansion happened always.
Left shifted all RCS_KWEXP defines and looked carefully at hard-coded values
throughout the code.
Diffstat (limited to 'usr.bin/cvs/commit.c')
| -rw-r--r-- | usr.bin/cvs/commit.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/cvs/commit.c b/usr.bin/cvs/commit.c index b388e5bdbb9..d4e149deabc 100644 --- a/usr.bin/cvs/commit.c +++ b/usr.bin/cvs/commit.c @@ -1,4 +1,4 @@ -/* $OpenBSD: commit.c,v 1.116 2008/01/10 09:37:26 tobias Exp $ */ +/* $OpenBSD: commit.c,v 1.117 2008/01/10 09:54:04 tobias Exp $ */ /* * Copyright (c) 2006 Joris Vink <joris@openbsd.org> * Copyright (c) 2006 Xavier Santolaria <xsa@openbsd.org> @@ -521,7 +521,7 @@ commit_diff(struct cvs_file *cf, RCSNUM *rev, int reverse) } (void)xasprintf(&p2, "%s/diff2.XXXXXXXXXX", cvs_tmpdir); - rcs_rev_write_stmp(cf->file_rcs, rev, p2, 0); + rcs_rev_write_stmp(cf->file_rcs, rev, p2, RCS_KWEXP_NONE); if ((b2 = cvs_buf_alloc(128, BUF_AUTOEXT)) == NULL) fatal("commit_diff: failed to create diff buf"); |