diff options
| author | Ray Lai <ray@cvs.openbsd.org> | 2009-02-25 23:16:21 +0000 |
|---|---|---|
| committer | Ray Lai <ray@cvs.openbsd.org> | 2009-02-25 23:16:21 +0000 |
| commit | 184bf0c4485793e104c9bf4074197d14c4589a6d (patch) | |
| tree | 462f08c7cc5babc436484fe630c80054d6708ba6 /usr.bin/rcs/rcs.c | |
| parent | 66c5025e30b2accbce550b2b478ce012e9da04a1 (diff) | |
Checking if a file is ASCII should only be done when diffing, because
the non-ASCII characters could be printed to the screen. For
checking in files, checking out files, merging files, and removing
revisions of files, we do so regardless of whether the files are
ASCII or binary.
Fixes PR6031.
OK joris and deraadt.
Diffstat (limited to 'usr.bin/rcs/rcs.c')
| -rw-r--r-- | usr.bin/rcs/rcs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/rcs/rcs.c b/usr.bin/rcs/rcs.c index 9b5864ffeb3..eadf7b576c6 100644 --- a/usr.bin/rcs/rcs.c +++ b/usr.bin/rcs/rcs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rcs.c,v 1.52 2009/02/15 13:40:33 joris Exp $ */ +/* $OpenBSD: rcs.c,v 1.53 2009/02/25 23:16:20 ray Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> * All rights reserved. @@ -1472,7 +1472,7 @@ rcs_rev_remove(RCSFILE *rf, RCSNUM *rev) rcs_buf_free(prevbuf); diff_format = D_RCSDIFF; - if (diffreg(path_tmp1, path_tmp2, newdiff, 0) == D_ERROR) + if (diffreg(path_tmp1, path_tmp2, newdiff, D_FORCEASCII) == D_ERROR) errx(1, "diffreg failed"); newdeltatext = newdiff; |