cmdedit: small optimizations

[oweals/busybox.git] / coreutils / ln.c

diff --git a/coreutils/ln.c b/coreutils/ln.c
index 54ced0b89f58096f2c1989f77bdfa3cdf6255987..231a3bf0383e447f89fcf1bd74572e3eb59feeb7 100644 (file)
--- a/coreutils/ln.c
+++ b/coreutils/ln.c
@@ -11,10 +11,6 @@
 /* BB_AUDIT GNU options missing: -d, -F, -i, and -v. */
 /* http://www.opengroup.org/onlinepubs/007904975/utilities/ln.html */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <errno.h>
 #include "busybox.h"
 
 #define LN_SYMLINK          1
@@ -34,7 +30,7 @@ int ln_main(int argc, char **argv)
        struct stat statbuf;
        int (*link_func)(const char *, const char *);
 
-       flag = bb_getopt_ulflags(argc, argv, "sfnbS:", &suffix);
+       flag = getopt32(argc, argv, "sfnbS:", &suffix);
 
        if (argc == optind) {
                bb_show_usage();
@@ -45,7 +41,7 @@ int ln_main(int argc, char **argv)
 
        if (argc == optind + 1) {
                *--argv = last;
-               last = bb_get_last_path_component(bb_xstrdup(last));
+               last = bb_get_last_path_component(xstrdup(last));
        }
 
        do {
@@ -53,36 +49,39 @@ int ln_main(int argc, char **argv)
                src = last;
 
                if (is_directory(src,
-                                                (flag & LN_NODEREFERENCE) ^ LN_NODEREFERENCE,
-                                                NULL)) {
-                       src_name = bb_xstrdup(*argv);
+                               (flag & LN_NODEREFERENCE) ^ LN_NODEREFERENCE,
+                               NULL)) {
+                       src_name = xstrdup(*argv);
                        src = concat_path_file(src, bb_get_last_path_component(src_name));
                        free(src_name);
                        src_name = src;
                }
                if (!(flag & LN_SYMLINK) && stat(*argv, &statbuf)) {
-                       bb_perror_msg("%s", *argv);
-                       status = EXIT_FAILURE;
-                       free(src_name);
-                       continue;
+                       // coreutils: "ln dangling_symlink new_hardlink" works
+                       if (lstat(*argv, &statbuf) || !S_ISLNK(statbuf.st_mode)) {
+                               bb_perror_msg("%s", *argv);
+                               status = EXIT_FAILURE;
+                               free(src_name);
+                               continue;
+                       }
                }
 
                if (flag & LN_BACKUP) {
-                               char *backup;
-                               backup = bb_xasprintf("%s%s", src, suffix);
-                               if (rename(src, backup) < 0 && errno != ENOENT) {
-                                               bb_perror_msg("%s", src);
-                                               status = EXIT_FAILURE;
-                                               free(backup);
-                                               continue;
-                               }
+                       char *backup;
+                       backup = xasprintf("%s%s", src, suffix);
+                       if (rename(src, backup) < 0 && errno != ENOENT) {
+                               bb_perror_msg("%s", src);
+                               status = EXIT_FAILURE;
                                free(backup);
-                               /*
-                                * When the source and dest are both hard links to the same
-                                * inode, a rename may succeed even though nothing happened.
-                                * Therefore, always unlink().
-                                */
-                               unlink(src);
+                               continue;
+                       }
+                       free(backup);
+                       /*
+                        * When the source and dest are both hard links to the same
+                        * inode, a rename may succeed even though nothing happened.
+                        * Therefore, always unlink().
+                        */
+                       unlink(src);
                } else if (flag & LN_FORCE) {
                        unlink(src);
                }