diff options
| author |   joris <joris@openbsd.org> | 2007-01-12 17:25:33 +0000 |
|---|---|---|
| committer | joris <joris@openbsd.org> | 2007-01-12 17:25:33 +0000 |
| commit | 4d33f394bde440ca59c3d7dc025166a62b648857 (patch) | |
| tree | 06eaff39b39048b2b43f57e0a492a1ed24ace608 /usr.bin/cvs/diff3.c | |
| parent | spacing (diff) | |
| download | wireguard-openbsd-4d33f394bde440ca59c3d7dc025166a62b648857.tar.xz wireguard-openbsd-4d33f394bde440ca59c3d7dc025166a62b648857.zip | |
complete binary support for opencvs,
adding/importing binary files now works too
partially taken from openrcs
Diffstat (limited to 'usr.bin/cvs/diff3.c')
| -rw-r--r-- | usr.bin/cvs/diff3.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/usr.bin/cvs/diff3.c b/usr.bin/cvs/diff3.c index 8dc97f1f011..cde14172d0e 100644 --- a/usr.bin/cvs/diff3.c +++ b/usr.bin/cvs/diff3.c @@ -1,4 +1,4 @@ -/* $OpenBSD: diff3.c,v 1.30 2007/01/11 17:44:18 niallo Exp $ */ +/* $OpenBSD: diff3.c,v 1.31 2007/01/12 17:25:33 joris Exp $ */ /* * Copyright (C) Caldera International Inc. 2001-2002. @@ -72,7 +72,7 @@ static const char copyright[] = #ifndef lint static const char rcsid[] = - "$OpenBSD: diff3.c,v 1.30 2007/01/11 17:44:18 niallo Exp $"; + "$OpenBSD: diff3.c,v 1.31 2007/01/12 17:25:33 joris Exp $"; #endif /* not lint */ #include "includes.h" @@ -228,9 +228,6 @@ cvs_diff3(RCSFILE *rf, char *workfile, int workfd, RCSNUM *rev1, goto out; } - cvs_buf_putc(diffb, '\0'); - cvs_buf_putc(b1, '\0'); - plen = cvs_buf_len(diffb); patch = cvs_buf_release(diffb); dlen = cvs_buf_len(b1); |