diff options
author | Dmitry Stogov <dmitry@php.net> | 2008-08-18 10:28:17 +0000 |
---|---|---|
committer | Dmitry Stogov <dmitry@php.net> | 2008-08-18 10:28:17 +0000 |
commit | 5ade84afe424b4087b3403c6718b1148b2be3a9a (patch) | |
tree | 56d8187be0df6d36685a162d82a9953031164a96 /TSRM | |
parent | 4e1e576053b8d78a114e461a895466c6978863b7 (diff) | |
download | php-git-5ade84afe424b4087b3403c6718b1148b2be3a9a.tar.gz |
Fixed bug #45835 (include and symlinks)
Diffstat (limited to 'TSRM')
-rw-r--r-- | TSRM/tsrm_virtual_cwd.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/TSRM/tsrm_virtual_cwd.c b/TSRM/tsrm_virtual_cwd.c index 4e953b45d9..f8e761b4ba 100644 --- a/TSRM/tsrm_virtual_cwd.c +++ b/TSRM/tsrm_virtual_cwd.c @@ -587,6 +587,9 @@ static int tsrm_realpath_r(char *path, int start, int len, int *ll, time_t *t, i /* not a directory */ return -1; } else { + if (link_is_dir) { + *link_is_dir = bucket->is_dir; + } memcpy(path, bucket->realpath, bucket->realpath_len + 1); return bucket->realpath_len; } @@ -656,6 +659,9 @@ static int tsrm_realpath_r(char *path, int start, int len, int *ll, time_t *t, i return -1; } } + if (link_is_dir) { + *link_is_dir = directory; + } } else { if (save) { directory = S_ISDIR(st.st_mode); |