emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- CONFIG_FEATURE_READLINK_FOLLOW readlink -f patch from Colin Watson <cjwatson@debian.org> on busybox mailing list 08/11/04

Browse Source
This commit is contained in:
Ned Ludd 2004-12-08 16:47:28 +00:00
parent d824853de3
commit c6fbed5dba
3 changed files with 39 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
debianutils/Config.in
View File

@ -24,6 +24,13 @@ config CONFIG_READLINK
This program reads a symbolic link and returns the name This program reads a symbolic link and returns the name
of the file it points to 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 config CONFIG_RUN_PARTS
bool "run-parts" bool "run-parts"
default n default n

24
debianutils/readlink.c
View File

@ -23,18 +23,38 @@
#include <errno.h> #include <errno.h>
#include <unistd.h> #include <unistd.h>
#include <stdlib.h> #include <stdlib.h>
#include <getopt.h>
#include "busybox.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) int readlink_main(int argc, char **argv)
{ {
char *buf = NULL; 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 */ /* no options, no getopt */
if (argc != 2) if (optind + 1 != argc)
bb_show_usage(); 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) if (!buf)
return EXIT_FAILURE; return EXIT_FAILURE;
puts(buf); puts(buf);

12
include/usage.h
View File

@ -1985,10 +1985,18 @@
"\t-s\tSet the system date and time (default).\n" \ "\t-s\tSet the system date and time (default).\n" \
"\t-p\tPrint the date and time." "\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 \ #define readlink_trivial_usage \
"" USAGE_READLINK_FOLLOW("[-f] ") "FILE"
#define readlink_full_usage \ #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 \ #define realpath_trivial_usage \
"pathname ..." "pathname ..."