Xref: news2.mv.net comp.os.msdos.djgpp:2665
From: jjk AT lbvrtda DOT logica DOT com (JJ Keijser)
Newsgroups: comp.os.msdos.djgpp
Subject: Re: RCS5.7 DOS and binary files
Date: Fri, 12 Apr 96 11:28:25 GMT
Organization: Logica BV
Lines: 50
Message-ID: <4klb80$fc4@romeo.logica.co.uk>
References: <Pine DOT SUN DOT 3 DOT 91 DOT 960411114400 DOT 27524R AT is>
NNTP-Posting-Host: 158.234.122.115
To: djgpp AT delorie DOT com
DJ-Gateway: from newsgroup comp.os.msdos.djgpp

In article <Pine DOT SUN DOT 3 DOT 91 DOT 960411114400 DOT 27524R AT is>,
   Eli Zaretskii <eliz AT is DOT elta DOT co DOT il> wrote:
>
>On Thu, 11 Apr 1996, Christopher Heng wrote:
>
>> >  rcs -i -kb binfile.doc
>> >  ci binfile.doc
>> >and check it out again
>> >  co -l binfile.doc
>> >This works fine. But when I make a change and want to update the file ci 
>> >returns with
>> >  'Unexpected EOF from diff command'
>> >The diff command I'm using is the DJGPP v2 diff util (diffutils 2.7) which 
>> >should be able to handle binaries...
>
>Can you tell what command-line options get passed to Diff by `ci'?  Diff 
>can handle binary files, but it only prints that they are different.  
>Diffutils 2.7 don't support creating something like context diffs for 
>binary files, AFAIK.  What does RCS expect from Diff in the case of 
>binary files?
>
The sources for the DOS version are the same as for the Unix version (apart 
from some patches, I believe). The UNIX version works beautifully and it uses 
the same Diff utils (v2.7); The UNIX version passes 
	diff -an
to /usr/local/bin/diff.

I just checked the patches and no patches were made to ci.c, which contains 
the update code. Perhaps I should recompile the lot and see what happens.

Also, with the DJGPP diff I get
	Binary files bin1 and bin2 differ
when I type
	diff -n bin1 bin2
while the Unix diff (exact same command line) gives me a long long list of 
differences...

Any ideas?

JJ


----------------------------------------------------------
  Jan Just (JJ) Keijser
  SMTP: jjk AT lbvrtda DOT logica DOT com
  X400: C=GB A=ATTMAIL P=Logica O=LBV OU1=LBVRTDA S=JJK
  I prefer clear blue skies over a bunch of clouds any day
  My views are my own...
                    flames > /dev/null 2>&1
----------------------------------------------------------