ln: --relative: fix updating of existing symlinks

Don't dereference an existing symlink being replaced.
I.E. generate the symlink relative to the symlink's containing dir,
rather than to some arbitrary place it points to.

* src/ln.c (convert_abs_rel): Don't consider the final component
of the symlink name when canonicalizing, as we want to avoid
dereferencing the final component.
* tests/ln/relative.sh: Add a test case.
* NEWS: Mention the fix.
Resolves http://bugs.gnu.org/14116
This commit is contained in:
Rémy Lefevre authored and Pádraig Brady committed 2013-04-04 02:46:35 +01:00
1 parent 20d7bce0f7
commit e52293aa7f
3 files changed
+17 -6

No files matched your search

+4
View File
@@ -9,6 +9,10 @@ GNU coreutils NEWS -*- outline -*-
permissions.
[This bug was present in "the beginning".]
ln --relative now updates existing symlinks correctly. Previously it based
the relative link on the dereferenced path of an existing link.
[This bug was introduced when --relative was added in coreutils-8.16.]
** New features
join accepts a new option: --zero-terminated (-z). As with the sort,uniq
+8 -6
View File
@@ -132,22 +132,24 @@ target_directory_operand (char const *file)
static char *
convert_abs_rel (const char *from, const char *target)
{
char *realtarget = canonicalize_filename_mode (target, CAN_MISSING);
/* Get dirname to generate paths relative to. We don't resolve
the full TARGET as the last component could be an existing symlink. */
char *targetdir = dir_name (target);
char *realdest = canonicalize_filename_mode (targetdir, CAN_MISSING);
char *realfrom = canonicalize_filename_mode (from, CAN_MISSING);
/* Write to a PATH_MAX buffer. */
char *relative_from = xmalloc (PATH_MAX);
/* Get dirname to generate paths relative to. */
realtarget[dir_len (realtarget)] = '\0';
if (!relpath (realfrom, realtarget, relative_from, PATH_MAX))
if (!relpath (realfrom, realdest, relative_from, PATH_MAX))
{
free (relative_from);
relative_from = NULL;
}
free (realtarget);
free (targetdir);
free (realdest);
free (realfrom);
return relative_from ? relative_from : xstrdup (from);
+5
View File
@@ -29,4 +29,9 @@ test $(readlink usr/bin/foo) = '../lib/foo/foo' || fail=1
ln -sr usr/bin/foo usr/lib/foo/link-to-foo
test $(readlink usr/lib/foo/link-to-foo) = 'foo' || fail=1
# Correctly update an existing link, which was broken in <= 8.21
ln -s dir1/dir2/f existing_link
ln -srf here existing_link
test $(readlink existing_link) = 'here' || fail=1
Exit $fail