71 lines
2.3 KiB
Diff
71 lines
2.3 KiB
Diff
--- usr.bin/xinstall/tests/install_test.sh.orig
|
|
+++ usr.bin/xinstall/tests/install_test.sh
|
|
@@ -377,6 +377,29 @@
|
|
atf_check install -d dir1/dir2/dir3
|
|
}
|
|
|
|
+atf_test_case symbolic_link_relative_absolute_common
|
|
+symbolic_link_relative_absolute_common_head() {
|
|
+ atf_set "descr" "Verify -l rs with absolute paths having common components"
|
|
+}
|
|
+symbolic_link_relative_absolute_common_body() {
|
|
+ filename=foo.so
|
|
+ src_path=lib
|
|
+ src_path_prefixed=$PWD/$src_path
|
|
+ dest_path=$PWD/libexec/
|
|
+ src_file=$src_path_prefixed/$filename
|
|
+ dest_file=$dest_path/$filename
|
|
+
|
|
+ atf_check mkdir $src_path_prefixed $dest_path
|
|
+ atf_check touch $src_file
|
|
+ atf_check install -l sr $src_file $dest_path
|
|
+
|
|
+ dest_path_relative=$(readlink $dest_file)
|
|
+ src_path_relative="../lib/$filename"
|
|
+ if [ "$src_path_relative" != "$dest_path_relative" ]; then
|
|
+ atf_fail "unexpected symlink contents ('$src_path_relative' != '$dest_path_relative')"
|
|
+ fi
|
|
+}
|
|
+
|
|
atf_init_test_cases() {
|
|
atf_add_test_case copy_to_nonexistent
|
|
atf_add_test_case copy_to_nonexistent_safe
|
|
@@ -415,5 +438,6 @@
|
|
atf_add_test_case symbolic_link_relative_absolute_source_and_dest1
|
|
atf_add_test_case symbolic_link_relative_absolute_source_and_dest1_double_slash
|
|
atf_add_test_case symbolic_link_relative_absolute_source_and_dest2
|
|
+ atf_add_test_case symbolic_link_relative_absolute_common
|
|
atf_add_test_case mkdir_simple
|
|
}
|
|
--- usr.bin/xinstall/xinstall.c.orig
|
|
+++ usr.bin/xinstall/xinstall.c
|
|
@@ -673,7 +673,7 @@
|
|
}
|
|
|
|
if (dolink & LN_RELATIVE) {
|
|
- char *to_name_copy, *cp, *d, *s;
|
|
+ char *to_name_copy, *cp, *d, *ld, *ls, *s;
|
|
|
|
if (*from_name != '/') {
|
|
/* this is already a relative link */
|
|
@@ -709,8 +709,19 @@
|
|
free(to_name_copy);
|
|
|
|
/* Trim common path components. */
|
|
- for (s = src, d = dst; *s == *d; s++, d++)
|
|
+ ls = ld = NULL;
|
|
+ for (s = src, d = dst; *s == *d; ls = s, ld = d, s++, d++)
|
|
continue;
|
|
+ /*
|
|
+ * If we didn't end after a directory separator, then we've
|
|
+ * falsely matched the last component. For example, if one
|
|
+ * invoked install -lrs /lib/foo.so /libexec/ then the source
|
|
+ * would terminate just after the separator while the
|
|
+ * destination would terminate in the middle of 'libexec',
|
|
+ * leading to a full directory getting falsely eaten.
|
|
+ */
|
|
+ if ((ls != NULL && *ls != '/') || (ld != NULL && *ld != '/'))
|
|
+ s--, d--;
|
|
while (*s != '/')
|
|
s--, d--;
|
|
|