summaryrefslogtreecommitdiff
path: root/legacy/busybox/0008-diff-add-support-for-no-dereference.patch
diff options
context:
space:
mode:
authorZach van Rijn <me@zv.io>2021-10-07 17:31:10 +0000
committerZach van Rijn <me@zv.io>2021-10-07 17:31:10 +0000
commitb53c023d3847f417ba79fc207de35b23d50dd7b0 (patch)
tree09475576abd09bc9a9f9c0ed6c2787aeb31ec27b /legacy/busybox/0008-diff-add-support-for-no-dereference.patch
parent461d0effc689a5b2e564b0ed1e47e268264de65c (diff)
parentff476413e30a6cf477364eeed12ed06540a8b436 (diff)
downloadpackages-b53c023d3847f417ba79fc207de35b23d50dd7b0.tar.gz
packages-b53c023d3847f417ba79fc207de35b23d50dd7b0.tar.bz2
packages-b53c023d3847f417ba79fc207de35b23d50dd7b0.tar.xz
packages-b53c023d3847f417ba79fc207de35b23d50dd7b0.zip
Merge branch '20211005-zv-remove-legacy' into 'master'
legacy/*: cleanup packages that can 'definitely go' See merge request adelie/packages!625
Diffstat (limited to 'legacy/busybox/0008-diff-add-support-for-no-dereference.patch')
-rw-r--r--legacy/busybox/0008-diff-add-support-for-no-dereference.patch63
1 files changed, 0 insertions, 63 deletions
diff --git a/legacy/busybox/0008-diff-add-support-for-no-dereference.patch b/legacy/busybox/0008-diff-add-support-for-no-dereference.patch
deleted file mode 100644
index 95063a863..000000000
--- a/legacy/busybox/0008-diff-add-support-for-no-dereference.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From d70be9891718ffb94ea9946cc3540b1b62eced77 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Fri, 25 Jul 2014 15:28:33 +0200
-Subject: [PATCH 08/11] diff: add support for --no-dereference
-
-Add flag for not following symlinks when recursing
-
-function old new delta
-.rodata 7934 7967 +33
-diff_longopts 253 270 +17
-packed_usage 1704 1720 +16
-diff_main 1665 1662 -3
-------------------------------------------------------------------------------
-(add/remove: 0/0 grow/shrink: 3/1 up/down: 66/-3) Total: 63 bytes
-
-Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
----
- editors/diff.c | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/editors/diff.c b/editors/diff.c
-index 7687518f3..f07cafb19 100644
---- a/editors/diff.c
-+++ b/editors/diff.c
-@@ -115,6 +115,9 @@
- //usage: "\n -N Treat absent files as empty"
- //usage: "\n -q Output only whether files differ"
- //usage: "\n -r Recurse"
-+//usage: IF_LONG_OPTS(
-+//usage: "\n --no-dereference Don't follow symlinks"
-+//usage: )
- //usage: "\n -S Start with FILE when comparing directories"
- //usage: "\n -T Make tabs line up by prefixing a tab when necessary"
- //usage: "\n -s Report when two files are the same"
-@@ -156,6 +159,7 @@ enum { /* Commandline flags */
- FLAG_p, /* not implemented */
- FLAG_B,
- FLAG_E, /* not implemented */
-+ FLAG_no_deref,
- };
- #define FLAG(x) (1 << FLAG_##x)
-
-@@ -869,7 +873,8 @@ static void diffdir(char *p[2], const char *s_start)
- * 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], ACTION_RECURSE |
-+ ((option_mask32 & FLAG(no_deref)) ? 0 : ACTION_FOLLOWLINKS),
- add_to_dirlist, skip_dir, &list[i], 0);
- /* Sort dl alphabetically.
- * GNU diff does this ignoring any number of trailing dots.
-@@ -966,6 +971,7 @@ static const char diff_longopts[] ALIGN1 =
- "report-identical-files\0" No_argument "s"
- "starting-file\0" Required_argument "S"
- "minimal\0" No_argument "d"
-+ "no-dereference\0" No_argument "\xff"
- ;
- #endif
-
---
-2.13.2
-