mirror of
https://github.com/php/php-src.git
synced 2024-09-22 18:37:25 +00:00
- Fixed bug #25343 (is_dir() gives warning on FreeBSD).
This commit is contained in:
parent
a383ff01e6
commit
62d2810cfc
@ -607,7 +607,7 @@ static void php_stat(const char *filename, php_stat_len filename_length, int typ
|
||||
BG(lsb).st_mode = 0; /* mark lstat buf invalid */
|
||||
#endif
|
||||
if (VCWD_STAT(BG(CurrentStatFile), &BG(sb)) == -1) {
|
||||
if (!IS_LINK_OPERATION(type) && (!IS_EXISTS_CHECK(type) || errno != ENOENT)) { /* fileexists() test must print no error */
|
||||
if (!IS_LINK_OPERATION(type) && (!IS_EXISTS_CHECK(type) || (errno != ENOENT && errno != ENOTDIR))) { /* fileexists() test must print no error */
|
||||
php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Stat failed for %s (errno=%d - %s)", BG(CurrentStatFile), errno, strerror(errno));
|
||||
}
|
||||
efree(BG(CurrentStatFile));
|
||||
@ -623,7 +623,7 @@ static void php_stat(const char *filename, php_stat_len filename_length, int typ
|
||||
if (IS_LINK_OPERATION(type) && !BG(lsb).st_mode) {
|
||||
/* do lstat if the buffer is empty */
|
||||
if (VCWD_LSTAT(filename, &BG(lsb)) == -1) {
|
||||
if (!IS_EXISTS_CHECK(type) || errno != ENOENT) { /* fileexists() test must print no error */
|
||||
if (!IS_EXISTS_CHECK(type) || (errno != ENOENT && errno != ENOTDIR)) { /* fileexists() test must print no error */
|
||||
php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Lstat failed for %s (errno=%d - %s)", BG(CurrentStatFile), errno, strerror(errno));
|
||||
}
|
||||
RETURN_FALSE;
|
||||
|
Loading…
Reference in New Issue
Block a user