Module Name: othersrc Committed By: agc Date: Sun Jan 13 22:17:22 UTC 2013
Modified Files: othersrc/external/bsd/netdiff/bin: Makefile othersrc/external/bsd/netdiff/bin/netdiff: Makefile othersrc/external/bsd/netdiff/bin/qdiff: Makefile othersrc/external/bsd/netdiff/dist: diff.c diff_subr.c diffreg.c libnetdiff.3 netdiff.h othersrc/external/bsd/netdiff/lib: Makefile Added Files: othersrc/external/bsd/netdiff/bin/wdiff: Makefile f1 f2 othersrc/external/bsd/netdiff/dist: netwdiff.1 netwdiff.c Log Message: Add wdiff functionality, which performs a word-by-word comparison between two areas of memory, or between two files. This is accomplished using two new functions, wdiff_mem() or wdiff_file(), and results can either be retrieved by displaying them to stdout, to an output file, or by using diff_get_diffs() to retrieve the results in-memory. Internally, the two files/areas of memory are split into separate areas of memory with a word on each line, and the two areas of memory are compared using diff_mem(). Comparisons can also be made in a case-insensitive manner. In the comparison output, added text is displayed in {+ ... +} delimiters, and deleted text is shown with [- ... -] delimiters. Changes are displayed as a deletion and an addition. + Deleted text can be inhibited from display by using the -1 argument to netwdiff(1). + Added text can be inhibited from display by using the -2 argument to netwdiff(1). + Common text can be inhibited from display by using the -3 argument to netwdiff(1). (Don't blame me, these flags are the ones used by GNU wdiff.) With thanks to Thomas Klausner for the nudge to create this. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 othersrc/external/bsd/netdiff/bin/Makefile cvs rdiff -u -r1.1.1.1 -r1.2 \ othersrc/external/bsd/netdiff/bin/netdiff/Makefile cvs rdiff -u -r1.1.1.1 -r1.2 othersrc/external/bsd/netdiff/bin/qdiff/Makefile cvs rdiff -u -r0 -r1.1 othersrc/external/bsd/netdiff/bin/wdiff/Makefile \ othersrc/external/bsd/netdiff/bin/wdiff/f1 \ othersrc/external/bsd/netdiff/bin/wdiff/f2 cvs rdiff -u -r1.3 -r1.4 othersrc/external/bsd/netdiff/dist/diff.c \ othersrc/external/bsd/netdiff/dist/diffreg.c \ othersrc/external/bsd/netdiff/dist/libnetdiff.3 cvs rdiff -u -r1.4 -r1.5 othersrc/external/bsd/netdiff/dist/diff_subr.c cvs rdiff -u -r1.2 -r1.3 othersrc/external/bsd/netdiff/dist/netdiff.h cvs rdiff -u -r0 -r1.1 othersrc/external/bsd/netdiff/dist/netwdiff.1 \ othersrc/external/bsd/netdiff/dist/netwdiff.c cvs rdiff -u -r1.1.1.1 -r1.2 othersrc/external/bsd/netdiff/lib/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.