Changeset 3232 in MondoRescue for branches/3.2/mindi-busybox/coreutils/ln.c

Timestamp:

Jan 1, 2014, 12:47:38 AM (10 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.21.1

File:

• branches/3.2/mindi-busybox/coreutils/ln.c (modified) (5 diffs)

branches/3.2/mindi-busybox/coreutils/ln.c

@@ -12 +12 @@
 /* http://www.opengroup.org/onlinepubs/007904975/utilities/ln.html */
 
+//usage:#define ln_trivial_usage
+//usage:       "[OPTIONS] TARGET... LINK|DIR"
+//usage:#define ln_full_usage "\n\n"
+//usage:       "Create a link LINK or DIR/TARGET to the specified TARGET(s)\n"
+//usage:     "\n    -s  Make symlinks instead of hardlinks"
+//usage:     "\n    -f  Remove existing destinations"
+//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"
+//usage:       "$ ls -l /tmp/ls\n"
+//usage:       "lrwxrwxrwx    1 root     root            7 Apr 12 18:39 ls -> BusyBox*\n"
+
 #include "libbb.h"
 
@@ -17 +34 @@
 
 
-#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;
@@ -36 +55 @@
 
     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 (argc == optind + 1) {
+    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" */
         *--argv = last;
+        /* xstrdup is needed: "ln -s PATH/TO/FILE/" is equivalent to
+         * "ln -s PATH/TO/FILE/ FILE", not "ln -s PATH/TO/FILE FILE"
+         */
         last = bb_get_last_path_component_strip(xstrdup(last));
     }
@@ -51 +79 @@
 
         if (is_directory(src,
-                        (opts & LN_NODEREFERENCE) ^ LN_NODEREFERENCE,
-                        NULL)
+                        (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));
@@ -94 +125 @@
         }
 
+        if (opts & LN_VERBOSE) {
+            printf("'%s' -> '%s'\n", src, *argv);
+        }
+
         if (link_func(*argv, src) != 0) {
             bb_simple_perror_msg(src);