# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1438872434 -7200
# Node ID 363a4f08b701fdf2657c0dd0144aa66895473498
# Parent  4834e7392dfafbabdfeac65b4c7cd7637c9af08c
busybox/diff: add -l support (ignore links)

diff -r 4834e7392dfa -r 363a4f08b701 busybox/stuff/busybox-1.23-diff.u
--- a/busybox/stuff/busybox-1.23-diff.u	Thu Aug 06 15:43:00 2015 +0300
+++ b/busybox/stuff/busybox-1.23-diff.u	Thu Aug 06 16:47:14 2015 +0200
@@ -1,5 +1,21 @@
 --- busybox-1.23.0/editors/diff.c
 +++ busybox-1.23.0/editors/diff.c
+@@ -113,6 +113,7 @@
+ //usage:     "\n	-B	Ignore changes whose lines are all blank"
+ //usage:     "\n	-d	Try hard to find a smaller set of changes"
+ //usage:     "\n	-i	Ignore case differences"
++//usage:     "\n	-l	Ignore symbolic links"
+ //usage:     "\n	-L	Use LABEL instead of the filename in the unified header"
+ //usage:     "\n	-N	Treat absent files as empty"
+ //usage:     "\n	-q	Output only whether files differ"
+@@ -143,6 +144,7 @@
+ 	FLAG_b,
+ 	FLAG_d,
+ 	FLAG_i,
++	FLAG_l,
+ 	FLAG_L,         /* never used, handled by getopt32 */
+ 	FLAG_N,
+ 	FLAG_q,
 @@ -756,6 +756,14 @@
  		j = fread(buf1, 1, sz, fp[1]);
  		if (i != j) {
@@ -15,3 +31,23 @@
  			i = MIN(i, j);
  		}
  		if (i == 0)
+@@ -877,7 +887,9 @@
+ 		 * Using list.len to specify its length,
+ 		 * add_to_dirlist will remove it. */
+ 		list[i].len = strlen(p[i]);
+-		recursive_action(p[i], ACTION_RECURSE | ACTION_FOLLOWLINKS,
++		recursive_action(p[i],
++				(option_mask32 & FLAG(l)) ? ACTION_RECURSE :
++				ACTION_RECURSE | ACTION_FOLLOWLINKS,
+ 				add_to_dirlist, skip_dir, &list[i], 0);
+ 		/* Sort dl alphabetically.
+ 		 * GNU diff does this ignoring any number of trailing dots.
+@@ -991,7 +1003,7 @@
+ #if ENABLE_FEATURE_DIFF_LONG_OPTIONS
+ 	applet_long_options = diff_longopts;
+ #endif
+-	getopt32(argv, "abdiL:NqrsS:tTU:wupBE",
++	getopt32(argv, "abdilL:NqrsS:tTU:wupBE",
+ 			&L_arg, &s_start, &opt_U_context);
+ 	argv += optind;
+ 	while (L_arg)