Make --symlink idempotent

When creating symlinks specified with --symlink, check errno if creation fails. If the reason was EEXIST, check the path of the existing symlink. If it matches what was desired, continue as normal. Resolves: #549 Signed-off-by: Jakob Kaivo <[email protected]> [Anders Blomdell: use readlink_malloc()] [smcv: Squash multiple changes into one; coding style fixes] Co-authored-by: Anders Blomdell Co-authored-by: Simon McVittie <[email protected]> Signed-off-by: Simon McVittie <[email protected]>
containers · Jan 31, 2024 · 4109d59 · 4109d59
1 parent 4872aef
commit 4109d59
Showing 1 changed file with 19 additions and 1 deletion.
diff --git a/bubblewrap.c b/bubblewrap.c
@@ -1468,7 +1468,25 @@ setup_newroot (bool unshare_pid,
         case SETUP_MAKE_SYMLINK:
           assert (op->source != NULL);  /* guaranteed by the constructor */
           if (symlink (op->source, dest) != 0)
-            die_with_error ("Can't make symlink at %s", op->dest);
+            {
+              if (errno == EEXIST)
+                {
+                  cleanup_free char *existing = readlink_malloc (dest);
+                  if (existing == NULL)
+                    {
+                      if (errno == EINVAL)
+                        die ("Can't make symlink at %s: destination exists and is not a symlink", op->dest);
+                      else
+                        die_with_error ("Can't make symlink at %s: destination exists, and cannot read symlink target", op->dest);
+                    }
+
+                  if (strcmp (existing, op->source) == 0)
+                    break;
+
+                  die ("Can't make symlink at %s: existing destination is %s", op->dest, existing);
+                }
+              die_with_error ("Can't make symlink at %s", op->dest);
+            }
           break;
 
         case SETUP_SET_HOSTNAME: