X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=coreutils%2Fln.c;h=eb7171959cbe62b479753124fb817eda6df90309;hb=eab40e58858d01372b5d74b7330be2d7b1c7fc75;hp=231a3bf0383e447f89fcf1bd74572e3eb59feeb7;hpb=f24e1f40e032e99cf57a05730e7632b825d3016d;p=oweals%2Fbusybox.git diff --git a/coreutils/ln.c b/coreutils/ln.c index 231a3bf03..eb7171959 100644 --- a/coreutils/ln.c +++ b/coreutils/ln.c @@ -11,7 +11,10 @@ /* BB_AUDIT GNU options missing: -d, -F, -i, and -v. */ /* http://www.opengroup.org/onlinepubs/007904975/utilities/ln.html */ -#include "busybox.h" +#include "libbb.h" + +/* This is a NOEXEC applet. Be very careful! */ + #define LN_SYMLINK 1 #define LN_FORCE 2 @@ -19,6 +22,7 @@ #define LN_BACKUP 8 #define LN_SUFFIX 16 +int ln_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; int ln_main(int argc, char **argv) { int status = EXIT_SUCCESS; @@ -26,11 +30,11 @@ int ln_main(int argc, char **argv) char *last; char *src_name; char *src; - char *suffix = "~"; + char *suffix = (char*)"~"; struct stat statbuf; int (*link_func)(const char *, const char *); - flag = getopt32(argc, argv, "sfnbS:", &suffix); + flag = getopt32(argv, "sfnbS:", &suffix); if (argc == optind) { bb_show_usage(); @@ -41,7 +45,7 @@ int ln_main(int argc, char **argv) if (argc == optind + 1) { *--argv = last; - last = bb_get_last_path_component(xstrdup(last)); + last = bb_get_last_path_component_strip(xstrdup(last)); } do { @@ -50,16 +54,17 @@ int ln_main(int argc, char **argv) if (is_directory(src, (flag & LN_NODEREFERENCE) ^ LN_NODEREFERENCE, - NULL)) { + NULL) + ) { src_name = xstrdup(*argv); - src = concat_path_file(src, bb_get_last_path_component(src_name)); + src = concat_path_file(src, bb_get_last_path_component_strip(src_name)); free(src_name); src_name = src; } if (!(flag & LN_SYMLINK) && stat(*argv, &statbuf)) { // coreutils: "ln dangling_symlink new_hardlink" works if (lstat(*argv, &statbuf) || !S_ISLNK(statbuf.st_mode)) { - bb_perror_msg("%s", *argv); + bb_simple_perror_msg(*argv); status = EXIT_FAILURE; free(src_name); continue; @@ -70,7 +75,7 @@ int ln_main(int argc, char **argv) char *backup; backup = xasprintf("%s%s", src, suffix); if (rename(src, backup) < 0 && errno != ENOENT) { - bb_perror_msg("%s", src); + bb_simple_perror_msg(src); status = EXIT_FAILURE; free(backup); continue; @@ -92,7 +97,7 @@ int ln_main(int argc, char **argv) } if (link_func(*argv, src) != 0) { - bb_perror_msg("%s", src); + bb_simple_perror_msg(src); status = EXIT_FAILURE; }