From: Rob Landley <rob@landley.net>
Date: Wed, 22 Oct 2014 22:11:06 +0000 (-0500)
Subject: Teach ln -f to leave original target alone if link creation fails.
X-Git-Tag: upstream/0.5.2~172
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9b891d54c9fa422bb2dc87bde2b741d71441dfbb;p=platform%2Fupstream%2Ftoybox.git

Teach ln -f to leave original target alone if link creation fails.

Suggested by Ashwini Sharma, I wound up implementing it by creating the new
link at a temporary name and renaming it over the old one instead of renaming
the old file out of the way and putting it back if it failed.

(Because "mkdir -p one/one/blah && ln -sf /bin/one one" would otherwise
rename one/one out of the way and only notice it can't delete it way at the
end when recovery's darn awkward, vs create new thing and if rename fails
(including EISDIR) that's the main error path. And yes the temporary name
is in the same directory as the destination so we never rename between mounts.)

link over the old one instead of renaming the old file and renaming it back.
---

diff --git a/toys/posix/ln.c b/toys/posix/ln.c
index d8f4ce6..04b4f29 100644
--- a/toys/posix/ln.c
+++ b/toys/posix/ln.c
@@ -46,19 +46,43 @@ void ln_main(void)
 
   for (i=0; i<toys.optc; i++) {
     int rc;
-    char *try = toys.optargs[i];
+    char *oldnew, *try = toys.optargs[i];
 
     if (S_ISDIR(buf.st_mode)) new = xmprintf("%s/%s", dest, basename(try));
     else new = dest;
-    // Silently unlink the existing target (if any)
-    if (toys.optflags & FLAG_f) unlink(new);
+
+    // Force needs to unlink the existing target (if any). Do that by creating
+    // a temp version and renaming it over the old one, so we can retain the
+    // old file in cases we can't replace it (such as hardlink between mounts).
+    oldnew = new;
+    if (toys.optflags & FLAG_f) {
+      new = xmprintf("%s_XXXXXX", new);
+      rc = mkstemp(new);
+      if (rc >= 0) {
+        close(rc);
+        if (unlink(new)) perror_msg("unlink '%s'", new);
+      }
+    }
 
     rc = (toys.optflags & FLAG_s) ? symlink(try, new) : link(try, new);
+    if (toys.optflags & FLAG_f) {
+      if (!rc) {
+        int temp;
+
+        rc = rename(new, oldnew);
+        temp = errno;
+        if (rc && unlink(new)) perror_msg("unlink '%s'", new);
+        errno = temp;
+      }
+      free(new);
+      new = oldnew;
+    }
     if (rc)
-      perror_exit("cannot create %s link from '%s' to '%s'",
+      perror_msg("cannot create %s link from '%s' to '%s'",
         (toys.optflags & FLAG_s) ? "symbolic" : "hard", try, new);
-    else if (toys.optflags & FLAG_v)
-      fprintf(stderr, "'%s' -> '%s'\n", new, try);
+    else
+      if (toys.optflags & FLAG_v) fprintf(stderr, "'%s' -> '%s'\n", new, try);
+
     if (new != dest) free(new);
   }
 }