@matheusbsbs / matheus-bagliano / commits / 1b77d83cab

setup_git_directory_gently_1(): resolve symlinks in ceiling paths

longest_ancestor_length() relies on a textual comparison of directory parts to find the part of path that overlaps with one of the paths in prefix_list. But this doesn't work if any of the prefixes involves a symbolic link, because the directories will look different even though they might logically refer to the same directory. So canonicalize the paths listed in GIT_CEILING_DIRECTORIES using real_path_if_valid() before passing them to longest_ancestor_length(). (Also rename normalize_ceiling_entry() to canonicalize_ceiling_entry() to reflect the change.) path is already in canonical form, so doesn't need to be canonicalized again. This fixes some problems with using GIT_CEILING_DIRECTORIES that contains paths involving symlinks, including t4035 if run with --root set to a path involving symlinks. Please note that test t0060 is *not* changed analogously, because that would make the test suite results dependent on the contents of the local root directory. However, real_path() is already tested independently, and the "ancestor" tests cover the non-normalization aspects of longest_ancestor_length(), so coverage remains sufficient. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Jeff King <peff@peff.net>

Michael Haggerty committed Oct 28, 2012 at 17:16 UTC 1b77d83cab798668d8a54a05b3fa0262486f7dfc

1 file changed +13 -13

setup.c

+13 -13

@@ -622,24 +622,23 @@ static dev_t get_device_or_die(const char *path, const char *prefix, int prefix_

622 }

623

624 /*

625 - * A "string_list_each_func_t" function that normalizes an entry from

626 - * GIT_CEILING_DIRECTORIES or discards it if unusable.

625 + * A "string_list_each_func_t" function that canonicalizes an entry

626 + * from GIT_CEILING_DIRECTORIES using real_path_if_valid(), or

627 + * discards it if unusable.

628 */

628 -static int normalize_ceiling_entry(struct string_list_item *item, void *unused)

629 +static int canonicalize_ceiling_entry(struct string_list_item *item,

630 + void *unused)

631 {

630 - const char *ceil = item->string;

631 - int len = strlen(ceil);

632 - char buf[PATH_MAX+1];

632 + char *ceil = item->string;

633 + const char *real_path;

634

634 - if (len == 0 || len > PATH_MAX || !is_absolute_path(ceil))

635 + if (!*ceil || !is_absolute_path(ceil))

636 return 0;

636 - if (normalize_path_copy(buf, ceil) < 0)

637 + real_path = real_path_if_valid(ceil);

638 + if (!real_path)

639 return 0;

638 - len = strlen(buf);

639 - if (len > 1 && buf[len-1] == '/')

640 - buf[--len] = '\0';

640 free(item->string);

642 - item->string = xstrdup(buf);

641 + item->string = xstrdup(real_path);

642 return 1;

643 }

644

@@ -681,7 +680,8 @@ static const char *setup_git_directory_gently_1(int *nongit_ok)

680

681 if (env_ceiling_dirs) {

682 string_list_split(&ceiling_dirs, env_ceiling_dirs, PATH_SEP, -1);

684 - filter_string_list(&ceiling_dirs, 0, normalize_ceiling_entry, NULL);

683 + filter_string_list(&ceiling_dirs, 0,

684 + canonicalize_ceiling_entry, NULL);

685 ceil_offset = longest_ancestor_length(cwd, &ceiling_dirs);

686 string_list_clear(&ceiling_dirs, 0);

687 }