home *** CD-ROM | disk | FTP | other *** search
- Comp.sources.misc: Volume 2, Issue 1
- Archive-Name: pd-diff
- Submitted-By: blarson@skat.usc.edu (Bob Larson)
-
- Here's a public domain diff with the -b and -c options. (4.2bsd style
- contex diffs.) I wasn't aware that these wern't present in all unix
- versions of diff, so I didn't think posting it was a priority. It's
- large, slow, and many of the colments are no longer true, but it does
- work. (except when it runs out of memory) The one case I know of
- where its output is incompatable with patch does seem to be pretty
- rare. No makefile is included, the 4.2bsd diff is better on the unix
- system I use. If you don't know how to compile and load a single C
- program, this probably isn't the tool for you anyway. I'd be grateful
- to anyone who cleans this up and documents it properly. It does
- appear to have been separate files at some point, I'm presenting it in
- a form similar to how I got it: mail headers and outdated documentation
- in comments and all. I just banged on it enough to get it doing what
- I wanted.
-
- ---
- Comp.Sources.Misc: Volume 2, Issue 8
- Submitted-By: <mike2@lcuxa.UUCP>
- Archive-Name: cdiff-v2
-
- After receiving Bob Larson's sources for the PD context diff program,
- I decided to accept his challenge to rewrite the documentation. In
- the process, I also ported it to TURBOC version 1.5. It probably will
- also compile in TURBOC 1.0, but since getting the update I dispensed
- with the previous version and did not try it.
-
- The code has been reorganized to strip it of the documentation that
- was built into it; that has been moved to the file cdiff.mem. Thus,
- the following shar file includes cdiff.c, cdiff.1 (man source), cdiff.mem
- (the previously built-in documentation), cdiff.doc (cdiff.1 passed
- through nroff -man for those who do not have nroff available), the
- original README, and a new TC-READ.ME. Follow the notes in TC-READ.ME
- or it will run even slower!
-
- Of course, no warranties whatsoever go with this. I merely hacked the
- code minimally. I didn't write it.
- ---
-
- Comp.sources.misc: Volume 2, Issue 59
- Submitted-By: <mike2@lcuxa.UUCP>
- Archive-Name: pd-cdiff-patch
-
- Neil Dixon uncovered a flaw in the logic of the cdiff program that
- was distributed early in January, and which was redistributed with
- changes to make it compilable in Turbo C. I've tested his patch
- both on the Unix SysVr2 version and on the PC, and have not found
- any errors. Conversely, the earlier version when compiled in MSC
- 4.0 (but, for some reason, not when compiled in TC 1.5) would
- sporadically come up with "read" errors. Since it now works in MSC as
- well as TC, I've included the appropriate ifdefs for both compilers,
- and have incorporated Neil's patch. (This was for clarity. The line
- numbers in his patch did not correspond precisely to the line numbers
- in the distributed code.) Both the patch as sent to me and the
- revised code are contained below.
-
- As before, I did not write this code. I merely ported it, and of
- course make no warranties whatsoever.
-
- ---
-
- Ok, I guess that I will add my two cents worth. Here is yet another
- repost of the public domain diff program.
-
- I have integrated some changes into the i/o portion of the code, providing
- some significant speedups. These changes were made after spending two
- evenings playging around with the profiler, attempting various fixes to
- make this beast a little faster. I completed this prior to the latest release
- of the code (the version listed immediately above).
-
- I have attempted to merge the changes provided by Mike above, but, since I do
- not have any other machines close by, I could not test them.
-
- The changes which I made are in the following areas:
-
- * modified the fgetss() and fputss() routines. These were the primary
- areas of intense activity on the system. From the source that I
- could see, these changes should be portable. After timing this
- on my 3b1, the changes make this diff run at about the same speed
- as the system diff for the files that I was using (amazing isn't it?).
-
- * Moved the defines from within the source code to within the Makefile.
-
- * Ran the code through indent. Sorry about that, but it was the only
- way that I could make sure that I got all the other patches integrated
- properly.
-
- * Cleaned up some of the comments and added a few of my own.
-
- * Made a few tweaks to make lint happier.
-
- * Modified the Makefile to allow use of shared libraries. Included
- instructions for all the defines in the system as well.
-
- Mark H. Colburn (mark@jhereg.mn.org)
-