aboutsummaryrefslogtreecommitdiff
path: root/debianutils
diff options
context:
space:
mode:
authorGravatar Denis Vlasenko <vda.linux@googlemail.com>2007-06-12 08:12:33 +0000
committerGravatar Denis Vlasenko <vda.linux@googlemail.com>2007-06-12 08:12:33 +0000
commitcc5e090f12fb4e3834fb1a55bc91d7618af8ce78 (patch)
tree34813e8836287c21cb893ab7d3aee666db415d62 /debianutils
parentaa198dd39cad6cb41fbf6c8b64301b581a9ba206 (diff)
downloadbusybox-cc5e090f12fb4e3834fb1a55bc91d7618af8ce78.tar.gz
busybox-cc5e090f12fb4e3834fb1a55bc91d7618af8ce78.tar.bz2
move several applets to more correct ex-project. No code changes.
Diffstat (limited to 'debianutils')
-rw-r--r--debianutils/Config.in14
-rw-r--r--debianutils/Kbuild11
-rw-r--r--debianutils/readlink.c50
3 files changed, 5 insertions, 70 deletions
diff --git a/debianutils/Config.in b/debianutils/Config.in
index c49197666..50ccac803 100644
--- a/debianutils/Config.in
+++ b/debianutils/Config.in
@@ -17,20 +17,6 @@ config PIPE_PROGRESS
help
Display a dot to indicate pipe activity.
-config READLINK
- bool "readlink"
- default n
- help
- This program reads a symbolic link and returns the name
- of the file it points to
-
-config FEATURE_READLINK_FOLLOW
- bool "Enable canonicalization by following all symlinks (-f)"
- default n
- depends on READLINK
- help
- Enable the readlink option (-f).
-
config RUN_PARTS
bool "run-parts"
default n
diff --git a/debianutils/Kbuild b/debianutils/Kbuild
index 99df6a536..bcf6126ad 100644
--- a/debianutils/Kbuild
+++ b/debianutils/Kbuild
@@ -5,9 +5,8 @@
# Licensed under the GPL v2, see the file LICENSE in this tarball.
lib-y:=
-lib-$(CONFIG_MKTEMP) += mktemp.o
-lib-$(CONFIG_PIPE_PROGRESS) += pipe_progress.o
-lib-$(CONFIG_READLINK) += readlink.o
-lib-$(CONFIG_RUN_PARTS) += run_parts.o
-lib-$(CONFIG_START_STOP_DAEMON) += start_stop_daemon.o
-lib-$(CONFIG_WHICH) += which.o
+lib-$(CONFIG_MKTEMP) += mktemp.o
+lib-$(CONFIG_PIPE_PROGRESS) += pipe_progress.o
+lib-$(CONFIG_RUN_PARTS) += run_parts.o
+lib-$(CONFIG_START_STOP_DAEMON) += start_stop_daemon.o
+lib-$(CONFIG_WHICH) += which.o
diff --git a/debianutils/readlink.c b/debianutils/readlink.c
deleted file mode 100644
index d454cbf19..000000000
--- a/debianutils/readlink.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/* vi: set sw=4 ts=4: */
-/*
- * Mini readlink implementation for busybox
- *
- * Copyright (C) 2000,2001 Matt Kraai <kraai@alumni.carnegiemellon.edu>
- *
- * Licensed under GPL v2 or later, see file LICENSE in this tarball for details.
- */
-
-#include <getopt.h>
-
-#include "libbb.h"
-
-int readlink_main(int argc, char **argv);
-int readlink_main(int argc, char **argv)
-{
- char *buf;
- char *fname;
-
- USE_FEATURE_READLINK_FOLLOW(
- unsigned opt;
- /* We need exactly one non-option argument. */
- opt_complementary = "=1";
- opt = getopt32(argc, argv, "f");
- fname = argv[optind];
- )
- SKIP_FEATURE_READLINK_FOLLOW(
- const unsigned opt = 0;
- if (argc != 2) bb_show_usage();
- fname = argv[1];
- )
-
- /* compat: coreutils readlink reports errors silently via exit code */
- logmode = LOGMODE_NONE;
-
- if (opt) {
- buf = realpath(fname, bb_common_bufsiz1);
- } else {
- buf = xmalloc_readlink_or_warn(fname);
- }
-
- if (!buf)
- return EXIT_FAILURE;
- puts(buf);
-
- if (ENABLE_FEATURE_CLEAN_UP && !opt)
- free(buf);
-
- fflush_stdout_and_exit(EXIT_SUCCESS);
-}