Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/coreutils/ln.c

Timestamp:

Feb 25, 2011, 9:26:54 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.18.3 to avoid problems with the tar command which is now failing on recent versions with busybox 1.7.3

File:

• branches/2.2.9/mindi-busybox/coreutils/ln.c (modified) (7 diffs)

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

@@ -5 +5 @@
  * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
@@ -23 +23 @@
 #define LN_SUFFIX           16
 
-int ln_main(int argc, char **argv);
+int ln_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int ln_main(int argc, char **argv)
 {
     int status = EXIT_SUCCESS;
-    int flag;
+    int opts;
     char *last;
     char *src_name;
@@ -35 +35 @@
     int (*link_func)(const char *, const char *);
 
-    flag = getopt32(argv, "sfnbS:", &suffix);
-
-    if (argc == optind) {
-        bb_show_usage();
-    }
+    opt_complementary = "-1"; /* min one arg */
+    opts = getopt32(argv, "sfnbS:", &suffix);
 
     last = argv[argc - 1];
@@ -46 +43 @@
     if (argc == optind + 1) {
         *--argv = last;
-        last = bb_get_last_path_component(xstrdup(last));
+        last = bb_get_last_path_component_strip(xstrdup(last));
     }
 
@@ -54 +51 @@
 
         if (is_directory(src,
-                        (flag & LN_NODEREFERENCE) ^ LN_NODEREFERENCE,
+                        (opts & LN_NODEREFERENCE) ^ LN_NODEREFERENCE,
                         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)) {
+        if (!(opts & 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);
@@ -72 +69 @@
         }
 
-        if (flag & LN_BACKUP) {
+        if (opts & LN_BACKUP) {
             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);
@@ -88 +85 @@
              */
             unlink(src);
-        } else if (flag & LN_FORCE) {
+        } else if (opts & LN_FORCE) {
             unlink(src);
         }
 
         link_func = link;
-        if (flag & LN_SYMLINK) {
+        if (opts & LN_SYMLINK) {
             link_func = symlink;
         }
 
         if (link_func(*argv, src) != 0) {
-            bb_perror_msg("%s", src);
+            bb_simple_perror_msg(src);
             status = EXIT_FAILURE;
         }