Changeset 1765 in MondoRescue for branches/2.2.5/mindi-busybox/coreutils/ln.c

Timestamp:

Nov 4, 2007, 3:16:40 AM (16 years ago)

Author:

Bruno Cornec

Message:

Update to busybox 1.7.2

File:

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

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

@@ -5 +5 @@
  * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
@@ -25 +12 @@
 /* http://www.opengroup.org/onlinepubs/007904975/utilities/ln.html */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <errno.h>
-#include "busybox.h"
+#include "libbb.h"
+
+/* This is a NOEXEC applet. Be very careful! */
+
 
 #define LN_SYMLINK          1
@@ -37 +23 @@
 #define LN_SUFFIX           16
 
+int ln_main(int argc, char **argv);
 int ln_main(int argc, char **argv)
 {
@@ -44 +31 @@
     char *src_name;
     char *src;
-    char *suffix = "~";
+    char *suffix = (char*)"~";
     struct stat statbuf;
     int (*link_func)(const char *, const char *);
 
-    flag = bb_getopt_ulflags(argc, argv, "sfnbS:", &suffix);
+    flag = getopt32(argv, "sfnbS:", &suffix);
 
     if (argc == optind) {
@@ -59 +46 @@
     if (argc == optind + 1) {
         *--argv = last;
-        last = bb_get_last_path_component(bb_xstrdup(last));
+        last = bb_get_last_path_component(xstrdup(last));
     }
 
@@ -67 +54 @@
 
         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);
@@ -75 +63 @@
         }
         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);