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

ln: support -T and -v

Browse Source 
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>
This commit is contained in:
Simon B
2012-05-06 13:18:35 +02:00
committed by Denys Vlasenko
parent 556ac3633c
commit 44642d1ec1
2 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
coreutils/ln.c
View File

@@ -20,6 +20,8 @@
//usage: "\n -n Don't dereference symlinks - treat like normal file" //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 -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 -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:
//usage:#define ln_example_usage //usage:#define ln_example_usage
//usage: "$ ln -s BusyBox /tmp/ls\n" //usage: "$ ln -s BusyBox /tmp/ls\n"
@@ -31,11 +33,13 @@
/* This is a NOEXEC applet. Be very careful! */ /* This is a NOEXEC applet. Be very careful! */
#define LN_SYMLINK 1 #define LN_SYMLINK (1 << 0)
#define LN_FORCE 2 #define LN_FORCE (1 << 1)
#define LN_NODEREFERENCE 4 #define LN_NODEREFERENCE (1 << 2)
#define LN_BACKUP 8 #define LN_BACKUP (1 << 3)
#define LN_SUFFIX 16 #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) MAIN_EXTERNALLY_VISIBLE;
int ln_main(int argc, char **argv) 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 *); int (*link_func)(const char *, const char *);
opt_complementary = "-1"; /* min one arg */ opt_complementary = "-1"; /* min one arg */
opts = getopt32(argv, "sfnbS:", &suffix); opts = getopt32(argv, "sfnbS:vT", &suffix);
last = argv[argc - 1]; last = argv[argc - 1];
argv += optind; argv += optind;
argc -= optind;
if ((opts & LN_LINKFILE) && argc > 2) {
bb_error_msg_and_die("-T accepts 2 args max");
}
if (!argv[1]) { if (!argv[1]) {
/* "ln PATH/TO/FILE" -> "ln PATH/TO/FILE FILE" */ /* "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 (opts & LN_NODEREFERENCE) ^ LN_NODEREFERENCE
) )
) { ) {
if (opts & LN_LINKFILE) {
bb_error_msg_and_die("'%s' is a directory", src);
}
src_name = xstrdup(*argv); src_name = xstrdup(*argv);
src = concat_path_file(src, bb_get_last_path_component_strip(src_name)); src = concat_path_file(src, bb_get_last_path_component_strip(src_name));
free(src_name); free(src_name);
@@ -112,6 +124,10 @@ int ln_main(int argc, char **argv)
link_func = symlink; link_func = symlink;
} }
if (opts & LN_VERBOSE) {
printf("'%s' -> '%s'\n", src, *argv);
}
if (link_func(*argv, src) != 0) { if (link_func(*argv, src) != 0) {
bb_simple_perror_msg(src); bb_simple_perror_msg(src);
status = EXIT_FAILURE; status = EXIT_FAILURE;

2
libbb/remove_file.c
View File

@@ -33,7 +33,7 @@ int FAST_FUNC remove_file(const char *path, int flags)
int status = 0; int status = 0;
if (!(flags & FILEUTILS_RECUR)) { if (!(flags & FILEUTILS_RECUR)) {
bb_error_msg("%s: is a directory", path); bb_error_msg("'%s' is a directory", path);
return -1; return -1;
} }