@matheusbsbs / matheus-bagliano / commits / 7d092adc8f

get_pwd_cwd(): Do not trust st_dev/st_ino blindly

10c4c88 (Allow add_path() to add non-existent directories to the path, 2008-07-21) introduced get_pwd_cwd() function in order to favor $PWD when getenv("PWD") and getcwd() refer to the same directory but are different strings (e.g. the former gives a nicer looking name via a symbolic link to an uglier looking automounted path). The function tried to determine if two directories are the same by running stat(2) on both and comparing ino/dev fields. Unfortunately, stat() does not fill any ino or dev fields in msysgit. But there is a telltale: both ino and dev are 0 when they are not filled correctly, so let's be extra cautious. This happens to fix a bug in "get-receive-pack working_directory/" when the GIT_DIR would not be set correctly due to absolute_path(".") returning the wrong value. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Acked-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Johannes Schindelin committed Jul 9, 2011 at 19:38 UTC 7d092adc8f4f54d18f5737c155d5b21e45e81a74

1 file changed +2 -1

abspath.c

+2 -1

@@ -77,7 +77,8 @@ static const char *get_pwd_cwd(void)

77 pwd = getenv("PWD");

78 if (pwd && strcmp(pwd, cwd)) {

79 stat(cwd, &cwd_stat);

80 - if (!stat(pwd, &pwd_stat) &&

80 + if ((cwd_stat.st_dev || cwd_stat.st_ino) &&

81 + !stat(pwd, &pwd_stat) &&

82 pwd_stat.st_dev == cwd_stat.st_dev &&

83 pwd_stat.st_ino == cwd_stat.st_ino) {

84 strlcpy(cwd, pwd, PATH_MAX);