diff options
Diffstat (limited to 'ext/standard/file.c')
| -rw-r--r-- | ext/standard/file.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/ext/standard/file.c b/ext/standard/file.c index 5c90b30559..c0ba71ca7b 100644 --- a/ext/standard/file.c +++ b/ext/standard/file.c @@ -262,19 +262,19 @@ PHP_MINIT_FUNCTION(file) REGISTER_LONG_CONSTANT("STREAM_IPPROTO_IP", IPPROTO_IP, CONST_CS|CONST_PERSISTENT); #endif -#ifdef IPPROTO_TCP +#if defined(IPPROTO_TCP) || defined(PHP_WIN32) REGISTER_LONG_CONSTANT("STREAM_IPPROTO_TCP", IPPROTO_TCP, CONST_CS|CONST_PERSISTENT); #endif -#ifdef IPPROTO_UDP +#if defined(IPPROTO_UDP) || defined(PHP_WIN32) REGISTER_LONG_CONSTANT("STREAM_IPPROTO_UDP", IPPROTO_UDP, CONST_CS|CONST_PERSISTENT); #endif -#ifdef IPPROTO_ICMP +#if defined(IPPROTO_ICMP) || defined(PHP_WIN32) REGISTER_LONG_CONSTANT("STREAM_IPPROTO_ICMP", IPPROTO_ICMP, CONST_CS|CONST_PERSISTENT); #endif -#ifdef IPPROTO_RAW +#if defined(IPPROTO_RAW) || defined(PHP_WIN32) REGISTER_LONG_CONSTANT("STREAM_IPPROTO_RAW", IPPROTO_RAW, CONST_CS|CONST_PERSISTENT); #endif @@ -523,7 +523,7 @@ PHP_FUNCTION(file_get_contents) size_t filename_len; zend_bool use_include_path = 0; php_stream *stream; - zend_long offset = -1; + zend_long offset = 0; zend_long maxlen = (ssize_t) PHP_STREAM_COPY_ALL; zval *zcontext = NULL; php_stream_context *context = NULL; @@ -548,14 +548,14 @@ PHP_FUNCTION(file_get_contents) RETURN_FALSE; } - if (offset > 0 && php_stream_seek(stream, offset, SEEK_SET) < 0) { + if (offset != 0 && php_stream_seek(stream, offset, ((offset > 0) ? SEEK_SET : SEEK_END)) < 0) { php_error_docref(NULL, E_WARNING, "Failed to seek to position " ZEND_LONG_FMT " in the stream", offset); php_stream_close(stream); RETURN_FALSE; } if (maxlen > INT_MAX) { - php_error_docref(NULL, E_WARNING, "maxlen truncated from %pd to %d bytes", maxlen, INT_MAX); + php_error_docref(NULL, E_WARNING, "maxlen truncated from " ZEND_LONG_FMT " to %d bytes", maxlen, INT_MAX); maxlen = INT_MAX; } if ((contents = php_stream_copy_to_mem(stream, maxlen, 0)) != NULL) { @@ -576,7 +576,7 @@ PHP_FUNCTION(file_put_contents) char *filename; size_t filename_len; zval *data; - zend_long numbytes = 0; + size_t numbytes = 0; zend_long flags = 0; zval *zcontext = NULL; php_stream_context *context = NULL; @@ -695,7 +695,7 @@ PHP_FUNCTION(file_put_contents) } php_stream_close(stream); - if (numbytes < 0) { + if (numbytes == (size_t)-1) { RETURN_FALSE; } @@ -897,7 +897,7 @@ PHPAPI PHP_FUNCTION(fclose) PHP_STREAM_TO_ZVAL(stream, res); if ((stream->flags & PHP_STREAM_FLAG_NO_FCLOSE) != 0) { - php_error_docref(NULL, E_WARNING, "%pd is not a valid stream resource", stream->res->handle); + php_error_docref(NULL, E_WARNING, "%d is not a valid stream resource", stream->res->handle); RETURN_FALSE; } |