diff options
Diffstat (limited to 'meta/packages/busybox/busybox-1.01/readlink.patch')
-rw-r--r-- | meta/packages/busybox/busybox-1.01/readlink.patch | 85 |
1 files changed, 0 insertions, 85 deletions
diff --git a/meta/packages/busybox/busybox-1.01/readlink.patch b/meta/packages/busybox/busybox-1.01/readlink.patch deleted file mode 100644 index 0c5431085a..0000000000 --- a/meta/packages/busybox/busybox-1.01/readlink.patch +++ /dev/null @@ -1,85 +0,0 @@ -diff -p -u -r1.7 Config.in ---- busybox-1.00/debianutils/Config.in 15 Mar 2004 08:28:24 -0000 1.7 -+++ busybox-1.00-patched/debianutils/Config.in 16 Nov 2004 11:46:41 -0000 -@@ -24,6 +24,13 @@ config CONFIG_READLINK - This program reads a symbolic link and returns the name - of the file it points to - -+config CONFIG_FEATURE_READLINK_FOLLOW -+ bool " Enable canonicalization by following all symlinks (-f)" -+ default n -+ depends on CONFIG_READLINK -+ help -+ Enable the readlink option (-f). -+ - config CONFIG_RUN_PARTS - bool "run-parts" - default n -diff -p -u -r1.2 readlink.c ---- busybox-1.00/debianutils/readlink.c 19 Mar 2003 09:11:41 -0000 1.2 -+++ busybox-1.00-patched/debianutils/readlink.c 16 Nov 2004 11:46:41 -0000 -@@ -23,18 +23,38 @@ - #include <errno.h> - #include <unistd.h> - #include <stdlib.h> -+#include <getopt.h> - #include "busybox.h" - -+#ifdef CONFIG_FEATURE_READLINK_FOLLOW -+# define READLINK_FOLLOW "f" -+# define READLINK_FLAG_f (1 << 0) -+#else -+# define READLINK_FOLLOW "" -+#endif -+ -+static const char readlink_options[] = READLINK_FOLLOW; -+ - int readlink_main(int argc, char **argv) - { - char *buf = NULL; -+ unsigned long opt = bb_getopt_ulflags(argc, argv, readlink_options); -+#ifdef CONFIG_FEATURE_READLINK_FOLLOW -+ RESERVE_CONFIG_BUFFER(resolved_path, PATH_MAX); -+#endif - - /* no options, no getopt */ - -- if (argc != 2) -+ if (optind + 1 != argc) - bb_show_usage(); - -- buf = xreadlink(argv[1]); -+#ifdef CONFIG_FEATURE_READLINK_FOLLOW -+ if (opt & READLINK_FLAG_f) { -+ buf = realpath(argv[optind], resolved_path); -+ } else -+#endif -+ buf = xreadlink(argv[optind]); -+ - if (!buf) - return EXIT_FAILURE; - puts(buf); -diff -p -u -r1.222 usage.h ---- busybox-1.00/include/usage.h 14 Sep 2004 16:23:56 -0000 1.222 -+++ busybox-1.00-patched/include/usage.h 16 Nov 2004 11:46:42 -0000 -@@ -1985,10 +1985,18 @@ - "\t-s\tSet the system date and time (default).\n" \ - "\t-p\tPrint the date and time." - -+#ifdef CONFIG_FEATURE_READLINK_FOLLOW -+#define USAGE_READLINK_FOLLOW(a) a -+#else -+#define USAGE_READLINK_FOLLOW(a) -+#endif -+ - #define readlink_trivial_usage \ -- "" -+ USAGE_READLINK_FOLLOW("[-f] ") "FILE" - #define readlink_full_usage \ -- "Displays the value of a symbolic link." -+ "Displays the value of a symbolic link." \ -+ USAGE_READLINK_FOLLOW("\n\nOptions:\n" \ -+ "\t-f\tcanonicalize by following all symlinks") - - #define realpath_trivial_usage \ - "pathname ..." |