diff -u, -e

[Mike Frysinger]

On Monday 29 June 2009 19:55:05 Cathey, Jim wrote:
> > if diff is missing a POSIX option that you require, then might as well
> > implement it in busybox.  if it's uncommon, we can easily make it into
> > a build time option defaulted to off.
>
> I'll probably regret it, but here it is.  (Patch from 1.11.1, since
> that's what we're using.  Changes are localized, however, and should
> be pretty easy to apply to current.)  The addition of -u (and by
> implication, non-dash-u traditional output by default) and -e are
> conditional options.
>
> So unless you enable FEATURE_DIFF_NONUNIFIED there should be no
> change, and it is off by default.  If you do enable it then you
> get traditional diff output by default, unless you give it -u
> (for unified) or -e (for ed-script) formatting options.  Diff
> currently accepts -u quietly, but always does -u formatting.

seems pretty straightforward to me.  if Denys doesnt take care of it before 
me, i'll try and go through it more thoroughly before merging when i get a 
chance.

> The diff we have used before had a whole raft of other formatting
> options I didn't need, and didn't implement.  (-c, -f, -D, -n)

-D/-n are not in POSIX, so be best if someone actually wanted to use those 
before we bother investing time.  -c/-f are in POSIX, so they should probably 
get merged at some point, but again if no one actually cares, easier to let 
them stay out :).
-mike
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: This is a digitally signed message part.
URL: <http://lists.busybox.net/pipermail/busybox/attachments/20090629/e2b6251b/attachment-0001.pgp>