aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon B <sburnet@hotmail.com>2012-05-06 13:18:35 +0200
committerDenys Vlasenko <vda.linux@googlemail.com>2012-05-06 13:18:35 +0200
commit44642d1ec15edf4a4448085849105ec93fa01ef2 (patch)
treefdc992e9609cef515c28e631d4424063034b2812
parent556ac3633ce3e7bd51c93b78827ae3874d856257 (diff)
downloadbusybox-44642d1ec15edf4a4448085849105ec93fa01ef2.tar.gz
ln: support -T and -v
function old new delta ln_main 445 524 +79 packed_usage 29182 29179 -3 Signed-off-by: Simon B <sburnet@hotmail.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--coreutils/ln.c28
-rw-r--r--libbb/remove_file.c2
2 files changed, 23 insertions, 7 deletions
diff --git a/coreutils/ln.c b/coreutils/ln.c
index 0eb3e6579..3b822e8c7 100644
--- a/coreutils/ln.c
+++ b/coreutils/ln.c
@@ -20,6 +20,8 @@
//usage: "\n -n Don't dereference symlinks - treat like normal file"
//usage: "\n -b Make a backup of the target (if exists) before link operation"
//usage: "\n -S suf Use suffix instead of ~ when making backup files"
+//usage: "\n -T 2nd arg must be a DIR"
+//usage: "\n -v Verbose"
//usage:
//usage:#define ln_example_usage
//usage: "$ ln -s BusyBox /tmp/ls\n"
@@ -31,11 +33,13 @@
/* This is a NOEXEC applet. Be very careful! */
-#define LN_SYMLINK 1
-#define LN_FORCE 2
-#define LN_NODEREFERENCE 4
-#define LN_BACKUP 8
-#define LN_SUFFIX 16
+#define LN_SYMLINK (1 << 0)
+#define LN_FORCE (1 << 1)
+#define LN_NODEREFERENCE (1 << 2)
+#define LN_BACKUP (1 << 3)
+#define LN_SUFFIX (1 << 4)
+#define LN_VERBOSE (1 << 5)
+#define LN_LINKFILE (1 << 6)
int ln_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int ln_main(int argc, char **argv)
@@ -50,10 +54,15 @@ int ln_main(int argc, char **argv)
int (*link_func)(const char *, const char *);
opt_complementary = "-1"; /* min one arg */
- opts = getopt32(argv, "sfnbS:", &suffix);
+ opts = getopt32(argv, "sfnbS:vT", &suffix);
last = argv[argc - 1];
argv += optind;
+ argc -= optind;
+
+ if ((opts & LN_LINKFILE) && argc > 2) {
+ bb_error_msg_and_die("-T accepts 2 args max");
+ }
if (!argv[1]) {
/* "ln PATH/TO/FILE" -> "ln PATH/TO/FILE FILE" */
@@ -72,6 +81,9 @@ int ln_main(int argc, char **argv)
(opts & LN_NODEREFERENCE) ^ LN_NODEREFERENCE
)
) {
+ if (opts & LN_LINKFILE) {
+ bb_error_msg_and_die("'%s' is a directory", src);
+ }
src_name = xstrdup(*argv);
src = concat_path_file(src, bb_get_last_path_component_strip(src_name));
free(src_name);
@@ -112,6 +124,10 @@ int ln_main(int argc, char **argv)
link_func = symlink;
}
+ if (opts & LN_VERBOSE) {
+ printf("'%s' -> '%s'\n", src, *argv);
+ }
+
if (link_func(*argv, src) != 0) {
bb_simple_perror_msg(src);
status = EXIT_FAILURE;
diff --git a/libbb/remove_file.c b/libbb/remove_file.c
index c6531a0b9..5b75f7f30 100644
--- a/libbb/remove_file.c
+++ b/libbb/remove_file.c
@@ -33,7 +33,7 @@ int FAST_FUNC remove_file(const char *path, int flags)
int status = 0;
if (!(flags & FILEUTILS_RECUR)) {
- bb_error_msg("%s: is a directory", path);
+ bb_error_msg("'%s' is a directory", path);
return -1;
}