- new applet diff. Rob Sullivan writes:

Here's my attempt at a mini diff applet - it's adapted from the code at
http://www.openbsd.org/cgi-bin/cvsweb/src/usr.bin/diff/, and only supports
unified diffs.

I've busyboxified everything to a reasonable degree, so I think the code is
suitable enough to be included, but there's still a fair bit of cleaning up
to be done.
This commit is contained in:
Bernhard Reutner-Fischer 2006-04-06 08:11:08 +00:00
parent e11a01cc34
commit 8f7d389700
5 changed files with 1331 additions and 0 deletions

View file

@ -453,6 +453,26 @@
"Filesystem 1k-blocks Used Available Use% Mounted on\n" \
"/dev/sda3 8690864 8553540 137324 98% /\n"
#define diff_trivial_usage \
"[-abdiNqrTstw] [-S FILE] [-U LINES] FILE1 FILE2"
#define diff_full_usage \
"Compare files line by line and output the differences between them.\n" \
"This diff implementation only supports unified diffs.\n\n" \
"Options:\n" \
"\t-a\tTreat all files as text\n" \
"\t-b\tIgnore changes in the amount of whitespace\n" \
"\t-d\tTry hard to find a smaller set of changes\n" \
"\t-i\tIgnore case differences\n" \
"\t-N\tTreat absent files as empty\n" \
"\t-q\tOutput only whether files differ\n" \
"\t-r\tRecursively compare any subdirectories\n" \
"\t-S\tStart with FILE when comparing directories\n" \
"\t-T\tMake tabs line up by prefixing a tab when necessary\n" \
"\t-s\tReport when two files are the same\n" \
"\t-t\tExpand tabs to spaces in output\n" \
"\t-U\tOutput LINES lines of context\n" \
"\t-w\tIgnore all whitespace\n"
#define dirname_trivial_usage \
"FILENAME"
#define dirname_full_usage \