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/co.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/co.c')
| -rw-r--r-- | usr.bin/rcs/co.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/rcs/co.c b/usr.bin/rcs/co.c index 12b62905dad..3619d149de7 100644 --- a/usr.bin/rcs/co.c +++ b/usr.bin/rcs/co.c @@ -1,4 +1,4 @@ -/* $OpenBSD: co.c,v 1.109 2007/07/03 00:56:23 ray Exp $ */ +/* $OpenBSD: co.c,v 1.110 2009/02/25 23:16:20 ray Exp $ */ /* * Copyright (c) 2005 Joris Vink <joris@openbsd.org> * All rights reserved. @@ -550,7 +550,7 @@ checkout_file_has_diffs(RCSFILE *rfp, RCSNUM *frev, const char *dst) rcs_buf_empty(bp); diff_format = D_RCSDIFF; - ret = diffreg(dst, tempfile, bp, 0); + ret = diffreg(dst, tempfile, bp, D_FORCEASCII); rcs_buf_free(bp); unlink(tempfile); |