mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-24 18:34:21 +08:00
Code Issues Packages Projects Releases Wiki Activity
0855c0b603
php-src/main/user_streams.c

864 lines
22 KiB
C
Raw Normal View History

Implement user-space streams. There's probably room for improvement, docs will following some time this week.
2002-03-19 11:51:01 +08:00
/*
+----------------------------------------------------------------------+
| PHP Version 4 |
+----------------------------------------------------------------------+
Bump year.
2002-12-31 23:59:15 +08:00
| Copyright (c) 1997-2003 The PHP Group |
Implement user-space streams. There's probably room for improvement, docs will following some time this week.
2002-03-19 11:51:01 +08:00
+----------------------------------------------------------------------+
| This source file is subject to version 2.02 of the PHP license, |
| that is bundled with this package in the file LICENSE, and is |
| available at through the world-wide-web at |
| http://www.php.net/license/2_02.txt. |
| If you did not receive a copy of the PHP license and are unable to |
| obtain it through the world-wide-web, please send a note to |
| license@php.net so we can mail you a copy immediately. |
+----------------------------------------------------------------------+
| Authors: |
| Wez Furlong (wez@thebrainroom.com) |
+----------------------------------------------------------------------+
touch.
2002-05-05 01:41:03 +08:00
*/
Implement user-space streams. There's probably room for improvement, docs will following some time this week.
2002-03-19 11:51:01 +08:00
these are case sensitive
2002-05-05 01:42:58 +08:00
/* $Id$ */
add $id:$ line
2002-05-05 01:39:05 +08:00
Implement user-space streams. There's probably room for improvement, docs will following some time this week.
2002-03-19 11:51:01 +08:00
#include "php.h"
#include "php_globals.h"
Fix segfault in wrapper error log mechanism when errors are logged on second and subsequent events. Implement very simple recursion protection for user streams written like this: class urlEncodeStream { var $fp = NULL; function stream_open($path, $mode, $options, &$opened_path) { $this->fp = fopen($path, $mode); // <-- this recurses infinitely return is_resource($this->fp); } } file_register_wrapper('urlencode', 'urlEncodeStream'); $fp = fopen('urlencode:///tmp/outputfile.txt', 'w'); Noticed by: Yasuo.
2002-09-26 20:12:27 +08:00
#include "ext/standard/file.h"
Implement user-space streams. There's probably room for improvement, docs will following some time this week.
2002-03-19 11:51:01 +08:00
static int le_protocols;
struct php_user_stream_wrapper {
char * protoname;
char * classname;
zend_class_entry *ce;
php_stream_wrapper wrapper;
};
Fix declarations (Thanks Sebastian)
2002-04-11 20:13:17 +08:00
static php_stream *user_wrapper_opener(php_stream_wrapper *wrapper, char *filename, char *mode, int options, char **opened_path, php_stream_context *context STREAMS_DC TSRMLS_DC);
Allow user streams/wrappers to implement fstat(), opendir() and stat().
2002-09-28 21:05:47 +08:00
static int user_wrapper_stat_url(php_stream_wrapper *wrapper, char *url, php_stream_statbuf *ssb TSRMLS_DC);
static php_stream *user_wrapper_opendir(php_stream_wrapper *wrapper, char *filename, char *mode,
int options, char **opened_path, php_stream_context *context STREAMS_DC TSRMLS_DC);
Phase 1 of wrapper OO cleanup. # Collecting underpants
2002-03-25 02:05:49 +08:00
static php_stream_wrapper_ops user_stream_wops = {
user_wrapper_opener,
Allow user streams/wrappers to implement fstat(), opendir() and stat().
2002-09-28 21:05:47 +08:00
NULL, /* close - the streams themselves know how */
NULL, /* stat - the streams themselves know how */
user_wrapper_stat_url,
user_wrapper_opendir,
"user-space"
Phase 1 of wrapper OO cleanup. # Collecting underpants
2002-03-25 02:05:49 +08:00
};
Implement user-space streams. There's probably room for improvement, docs will following some time this week.
2002-03-19 11:51:01 +08:00
static void stream_wrapper_dtor(zend_rsrc_list_entry *rsrc TSRMLS_DC)
{
struct php_user_stream_wrapper * uwrap = (struct php_user_stream_wrapper*)rsrc->ptr;
php_unregister_url_stream_wrapper(uwrap->protoname TSRMLS_CC);
efree(uwrap->protoname);
efree(uwrap->classname);
efree(uwrap);
}
register some constants for user streams
2002-03-19 22:35:55 +08:00
PHP_MINIT_FUNCTION(user_streams)
Implement user-space streams. There's probably room for improvement, docs will following some time this week.
2002-03-19 11:51:01 +08:00
{
le_protocols = zend_register_list_destructors_ex(stream_wrapper_dtor, NULL, "stream factory", 0);
register some constants for user streams
2002-03-19 22:35:55 +08:00
if (le_protocols == FAILURE)
return FAILURE;
REGISTER_LONG_CONSTANT("STREAM_USE_PATH", USE_PATH, CONST_CS|CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("STREAM_IGNORE_URL", IGNORE_URL, CONST_CS|CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("STREAM_ENFORCE_SAFE_MODE", ENFORCE_SAFE_MODE, CONST_CS|CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("STREAM_REPORT_ERRORS", REPORT_ERRORS, CONST_CS|CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("STREAM_MUST_SEEK", STREAM_MUST_SEEK, CONST_CS|CONST_PERSISTENT);
return SUCCESS;
Implement user-space streams. There's probably room for improvement, docs will following some time this week.
2002-03-19 11:51:01 +08:00
}
struct _php_userstream_data {
struct php_user_stream_wrapper * wrapper;
zval * object;
};
typedef struct _php_userstream_data php_userstream_data_t;
/* names of methods */
#define USERSTREAM_OPEN "stream_open"
#define USERSTREAM_CLOSE "stream_close"
#define USERSTREAM_READ "stream_read"
#define USERSTREAM_WRITE "stream_write"
#define USERSTREAM_FLUSH "stream_flush"
#define USERSTREAM_SEEK "stream_seek"
#define USERSTREAM_TELL "stream_tell"
#define USERSTREAM_EOF "stream_eof"
Allow user streams/wrappers to implement fstat(), opendir() and stat().
2002-09-28 21:05:47 +08:00
#define USERSTREAM_STAT "stream_stat"
#define USERSTREAM_STATURL "url_stat"
#define USERSTREAM_DIR_OPEN "dir_opendir"
#define USERSTREAM_DIR_READ "dir_readdir"
#define USERSTREAM_DIR_REWIND "dir_rewinddir"
#define USERSTREAM_DIR_CLOSE "dir_closedir"
/* {{{ class should have methods like these:
Implement user-space streams. There's probably room for improvement, docs will following some time this week.
2002-03-19 11:51:01 +08:00
Revise buffer/seek code a little. Tidy up user streams even more. Make test case quite aggressive.
2002-09-23 21:22:10 +08:00
function stream_open($path, $mode, $options, &$opened_path)
{
return true/false;
}
function stream_read($count)
{
return false on error;
else return string;
}
function stream_write($data)
{
return false on error;
else return count written;
}
function stream_close()
{
}
function stream_flush()
{
return true/false;
}
function stream_seek($offset, $whence)
{
return true/false;
}
function stream_tell()
{
return (int)$position;
}
function stream_eof()
{
return true/false;
}
Allow user streams/wrappers to implement fstat(), opendir() and stat().
2002-09-28 21:05:47 +08:00
function stream_stat()
{
return array( just like that returned by fstat() );
}
function url_stat(string $url)
{
return array( just like that returned by stat() );
}
function dir_opendir(string $url, int $options)
{
return true / false;
}
function dir_readdir()
{
return string next filename in dir ;
}
function dir_closedir()
{
release dir related resources;
}
function dir_rewinddir()
{
reset to start of dir list;
}
Implement read buffering in streams. Eliminate similar code from network.c. Implement fgets equivalent at the streams level, which can detect the mac, dos and unix line endings and handle them appropriately. The default behaviour is unix (and dos) line endings. An ini option to control this behaviour will follow. # Don't forget to make clean! # I've done some testing but would appreciate feedback from # people with scripts/extensions that seek around a lot.
2002-09-23 09:47:04 +08:00
Allow user streams/wrappers to implement fstat(), opendir() and stat().
2002-09-28 21:05:47 +08:00
}}} **/
Implement user-space streams. There's probably room for improvement, docs will following some time this week.
2002-03-19 11:51:01 +08:00
Fix declarations (Thanks Sebastian)
2002-04-11 20:13:17 +08:00
static php_stream *user_wrapper_opener(php_stream_wrapper *wrapper, char *filename, char *mode, int options, char **opened_path, php_stream_context *context STREAMS_DC TSRMLS_DC)
Implement user-space streams. There's probably room for improvement, docs will following some time this week.
2002-03-19 11:51:01 +08:00
{
Phase 1 of wrapper OO cleanup. # Collecting underpants
2002-03-25 02:05:49 +08:00
struct php_user_stream_wrapper *uwrap = (struct php_user_stream_wrapper*)wrapper->abstract;
Implement user-space streams. There's probably room for improvement, docs will following some time this week.
2002-03-19 11:51:01 +08:00
php_userstream_data_t *us;
zval *zfilename, *zmode, *zopened, *zoptions, *zretval = NULL, *zfuncname;
zval **args[4];
int call_result;
php_stream *stream = NULL;
Streams are all tracked as resources now. Add some logic that will help track down leaks when debug is enabled.
2002-03-20 22:21:30 +08:00
Allow user streams/wrappers to implement fstat(), opendir() and stat().
2002-09-28 21:05:47 +08:00
/* Try to catch bad usage without preventing flexibility */
Fix segfault in wrapper error log mechanism when errors are logged on second and subsequent events. Implement very simple recursion protection for user streams written like this: class urlEncodeStream { var $fp = NULL; function stream_open($path, $mode, $options, &$opened_path) { $this->fp = fopen($path, $mode); // <-- this recurses infinitely return is_resource($this->fp); } } file_register_wrapper('urlencode', 'urlEncodeStream'); $fp = fopen('urlencode:///tmp/outputfile.txt', 'w'); Noticed by: Yasuo.
2002-09-26 20:12:27 +08:00
if (FG(user_stream_current_filename) != NULL && strcmp(filename, FG(user_stream_current_filename)) == 0) {
php_stream_wrapper_log_error(wrapper, options TSRMLS_CC, "infinite recursion prevented");
return NULL;
}
FG(user_stream_current_filename) = filename;
Implement user-space streams. There's probably room for improvement, docs will following some time this week.
2002-03-19 11:51:01 +08:00
us = emalloc(sizeof(*us));
us->wrapper = uwrap;
/* create an instance of our class */
ALLOC_ZVAL(us->object);
object_init_ex(us->object, uwrap->ce);
ZVAL_REFCOUNT(us->object) = 1;
PZVAL_IS_REF(us->object) = 1;
/* call it's stream_open method - set up params first */
MAKE_STD_ZVAL(zfilename);
ZVAL_STRING(zfilename, filename, 1);
args[0] = &zfilename;
MAKE_STD_ZVAL(zmode);
ZVAL_STRING(zmode, mode, 1);
args[1] = &zmode;
MAKE_STD_ZVAL(zoptions);
ZVAL_LONG(zoptions, options);
args[2] = &zoptions;
MAKE_STD_ZVAL(zopened);
ZVAL_REFCOUNT(zopened) = 1;
PZVAL_IS_REF(zopened) = 1;
ZVAL_NULL(zopened);
args[3] = &zopened;
MAKE_STD_ZVAL(zfuncname);
ZVAL_STRING(zfuncname, USERSTREAM_OPEN, 1);
call_result = call_user_function_ex(NULL,
&us->object,
zfuncname,
&zretval,
4, args,
0, NULL TSRMLS_CC);
Tidy up some user stream code. Add a small test case (not yet complete).
2002-09-18 18:15:40 +08:00
if (call_result == SUCCESS && zretval != NULL && zval_is_true(zretval)) {
Implement user-space streams. There's probably room for improvement, docs will following some time this week.
2002-03-19 11:51:01 +08:00
/* the stream is now open! */
stream = php_stream_alloc_rel(&php_stream_userspace_ops, us, 0, mode);
/* if the opened path is set, copy it out */
if (Z_TYPE_P(zopened) == IS_STRING && opened_path) {
*opened_path = estrndup(Z_STRVAL_P(zopened), Z_STRLEN_P(zopened));
}
Make file_get_wrapper_data return the underlying PHP object for user-space streams.
2002-03-19 21:42:25 +08:00
/* set wrapper data to be a reference to our object */
stream->wrapperdata = us->object;
zval_add_ref(&stream->wrapperdata);
Implement user-space streams. There's probably room for improvement, docs will following some time this week.
2002-03-19 11:51:01 +08:00
} else {
Tidy up some user stream code. Add a small test case (not yet complete).
2002-09-18 18:15:40 +08:00
php_stream_wrapper_log_error(wrapper, options TSRMLS_CC, "\"%s::" USERSTREAM_OPEN "\" call failed",
us->wrapper->classname);
Implement user-space streams. There's probably room for improvement, docs will following some time this week.
2002-03-19 11:51:01 +08:00
}
/* destroy everything else */
Tidy up some user stream code. Add a small test case (not yet complete).
2002-09-18 18:15:40 +08:00
if (stream == NULL) {
zval_ptr_dtor(&us->object);
efree(us);
}
Implement user-space streams. There's probably room for improvement, docs will following some time this week.
2002-03-19 11:51:01 +08:00
if (zretval)
zval_ptr_dtor(&zretval);
zval_ptr_dtor(&zfuncname);
zval_ptr_dtor(&zopened);
zval_ptr_dtor(&zoptions);
zval_ptr_dtor(&zmode);
zval_ptr_dtor(&zfilename);
Fix segfault in wrapper error log mechanism when errors are logged on second and subsequent events. Implement very simple recursion protection for user streams written like this: class urlEncodeStream { var $fp = NULL; function stream_open($path, $mode, $options, &$opened_path) { $this->fp = fopen($path, $mode); // <-- this recurses infinitely return is_resource($this->fp); } } file_register_wrapper('urlencode', 'urlEncodeStream'); $fp = fopen('urlencode:///tmp/outputfile.txt', 'w'); Noticed by: Yasuo.
2002-09-26 20:12:27 +08:00
FG(user_stream_current_filename) = NULL;
Implement user-space streams. There's probably room for improvement, docs will following some time this week.
2002-03-19 11:51:01 +08:00
return stream;
}
Allow user streams/wrappers to implement fstat(), opendir() and stat().
2002-09-28 21:05:47 +08:00
static php_stream *user_wrapper_opendir(php_stream_wrapper *wrapper, char *filename, char *mode,
int options, char **opened_path, php_stream_context *context STREAMS_DC TSRMLS_DC)
{
struct php_user_stream_wrapper *uwrap = (struct php_user_stream_wrapper*)wrapper->abstract;
php_userstream_data_t *us;
zval *zfilename, *zoptions, *zretval = NULL, *zfuncname;
zval **args[2];
int call_result;
php_stream *stream = NULL;
/* Try to catch bad usage without preventing flexibility */
if (FG(user_stream_current_filename) != NULL && strcmp(filename, FG(user_stream_current_filename)) == 0) {
php_stream_wrapper_log_error(wrapper, options TSRMLS_CC, "infinite recursion prevented");
return NULL;
}
FG(user_stream_current_filename) = filename;
us = emalloc(sizeof(*us));
us->wrapper = uwrap;
/* create an instance of our class */
ALLOC_ZVAL(us->object);
object_init_ex(us->object, uwrap->ce);
ZVAL_REFCOUNT(us->object) = 1;
PZVAL_IS_REF(us->object) = 1;
/* call it's dir_open method - set up params first */
MAKE_STD_ZVAL(zfilename);
ZVAL_STRING(zfilename, filename, 1);
args[0] = &zfilename;
MAKE_STD_ZVAL(zoptions);
ZVAL_LONG(zoptions, options);
args[1] = &zoptions;
MAKE_STD_ZVAL(zfuncname);
ZVAL_STRING(zfuncname, USERSTREAM_DIR_OPEN, 1);
call_result = call_user_function_ex(NULL,
&us->object,
zfuncname,
&zretval,
2, args,
0, NULL TSRMLS_CC);
if (call_result == SUCCESS && zretval != NULL && zval_is_true(zretval)) {
/* the stream is now open! */
stream = php_stream_alloc_rel(&php_stream_userspace_dir_ops, us, 0, mode);
/* set wrapper data to be a reference to our object */
stream->wrapperdata = us->object;
zval_add_ref(&stream->wrapperdata);
} else {
php_stream_wrapper_log_error(wrapper, options TSRMLS_CC, "\"%s::" USERSTREAM_DIR_OPEN "\" call failed",
us->wrapper->classname);
}
/* destroy everything else */
if (stream == NULL) {
zval_ptr_dtor(&us->object);
efree(us);
}
if (zretval)
zval_ptr_dtor(&zretval);
zval_ptr_dtor(&zfuncname);
zval_ptr_dtor(&zoptions);
zval_ptr_dtor(&zfilename);
FG(user_stream_current_filename) = NULL;
return stream;
}
Rename streams functions to fit with naming conventions, adding aliases for old functions where required. Make use of recent changes to chunk size and timeout setting code.
2002-09-29 06:14:21 +08:00
/* {{{ proto bool stream_register_wrapper(string protocol, string classname)
Implement user-space streams. There's probably room for improvement, docs will following some time this week.
2002-03-19 11:51:01 +08:00
Registers a custom URL protocol handler class */
Rename streams functions to fit with naming conventions, adding aliases for old functions where required. Make use of recent changes to chunk size and timeout setting code.
2002-09-29 06:14:21 +08:00
PHP_FUNCTION(stream_register_wrapper)
Implement user-space streams. There's probably room for improvement, docs will following some time this week.
2002-03-19 11:51:01 +08:00
{
char *protocol, *classname;
int protocol_len, classname_len;
struct php_user_stream_wrapper * uwrap;
int rsrc_id;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss", &protocol, &protocol_len, &classname, &classname_len) == FAILURE) {
RETURN_FALSE;
}
uwrap = (struct php_user_stream_wrapper *)ecalloc(1, sizeof(*uwrap));
uwrap->protoname = estrndup(protocol, protocol_len);
uwrap->classname = estrndup(classname, classname_len);
Phase 1 of wrapper OO cleanup. # Collecting underpants
2002-03-25 02:05:49 +08:00
uwrap->wrapper.wops = &user_stream_wops;
uwrap->wrapper.abstract = uwrap;
Implement user-space streams. There's probably room for improvement, docs will following some time this week.
2002-03-19 11:51:01 +08:00
zend_str_tolower(uwrap->classname, classname_len);
rsrc_id = ZEND_REGISTER_RESOURCE(NULL, uwrap, le_protocols);
if (zend_hash_find(EG(class_table), uwrap->classname, classname_len + 1, (void**)&uwrap->ce) == SUCCESS) {
Fix ZE2 build.
2002-03-29 09:19:02 +08:00
#ifdef ZEND_ENGINE_2
Implement user-space streams. There's probably room for improvement, docs will following some time this week.
2002-03-19 11:51:01 +08:00
uwrap->ce = *(zend_class_entry**)uwrap->ce;
#endif
if (php_register_url_stream_wrapper(protocol, &uwrap->wrapper TSRMLS_CC) == SUCCESS) {
RETURN_TRUE;
}
} else {
use php_error_docref()
2002-08-26 02:45:02 +08:00
php_error_docref(NULL TSRMLS_CC, E_WARNING, "class '%s' is undefined",
Implement user-space streams. There's probably room for improvement, docs will following some time this week.
2002-03-19 11:51:01 +08:00
classname);
}
zend_list_delete(rsrc_id);
RETURN_FALSE;
}
/* }}} */
static size_t php_userstreamop_write(php_stream *stream, const char *buf, size_t count TSRMLS_DC)
{
zval func_name;
zval *retval = NULL;
int call_result;
php_userstream_data_t *us = (php_userstream_data_t *)stream->abstract;
zval **args[1];
zval zbuff, *zbufptr;
size_t didwrite = 0;
assert(us != NULL);
ZVAL_STRINGL(&func_name, USERSTREAM_WRITE, sizeof(USERSTREAM_WRITE)-1, 0);
ZVAL_STRINGL(&zbuff, (char*)buf, count, 0);
zbufptr = &zbuff;
args[0] = &zbufptr;
call_result = call_user_function_ex(NULL,
&us->object,
&func_name,
&retval,
1, args,
0, NULL TSRMLS_CC);
Tidy up some user stream code. Add a small test case (not yet complete).
2002-09-18 18:15:40 +08:00
didwrite = 0;
if (call_result == SUCCESS && retval != NULL) {
Allow user streams/wrappers to implement fstat(), opendir() and stat().
2002-09-28 21:05:47 +08:00
convert_to_long(retval);
Implement user-space streams. There's probably room for improvement, docs will following some time this week.
2002-03-19 11:51:01 +08:00
didwrite = Z_LVAL_P(retval);
Revise buffer/seek code a little. Tidy up user streams even more. Make test case quite aggressive.
2002-09-23 21:22:10 +08:00
} else if (call_result == FAILURE) {
Allow user streams/wrappers to implement fstat(), opendir() and stat().
2002-09-28 21:05:47 +08:00
php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s::" USERSTREAM_WRITE " is not implemented!",
Revise buffer/seek code a little. Tidy up user streams even more. Make test case quite aggressive.
2002-09-23 21:22:10 +08:00
us->wrapper->classname);
Tidy up some user stream code. Add a small test case (not yet complete).
2002-09-18 18:15:40 +08:00
}
avoid possible buffer overruns when write returns a value larger than the buffer
2002-03-19 21:44:38 +08:00
/* don't allow strange buffer overruns due to bogus return */
if (didwrite > count) {
Allow user streams/wrappers to implement fstat(), opendir() and stat().
2002-09-28 21:05:47 +08:00
php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s::" USERSTREAM_WRITE " wrote %d bytes more data than requested (%d written, %d max)",
make buffer length warnings more verbose
2002-03-20 00:56:53 +08:00
us->wrapper->classname,
didwrite - count, didwrite, count);
avoid possible buffer overruns when write returns a value larger than the buffer
2002-03-19 21:44:38 +08:00
didwrite = count;
}
Implement user-space streams. There's probably room for improvement, docs will following some time this week.
2002-03-19 11:51:01 +08:00
if (retval)
zval_ptr_dtor(&retval);
return didwrite;
}
static size_t php_userstreamop_read(php_stream *stream, char *buf, size_t count TSRMLS_DC)
{
zval func_name;
zval *retval = NULL;
zval **args[1];
int call_result;
size_t didread = 0;
php_userstream_data_t *us = (php_userstream_data_t *)stream->abstract;
This seems to resolve the issues with fgets. I've moved EOF detection into the streams layer; a stream reader implementation should set stream->eof when it detects EOF. Fixed test for user streams - it still fails but that is due to an output buffering bug.
2002-10-05 18:35:13 +08:00
zval *zcount;
Implement user-space streams. There's probably room for improvement, docs will following some time this week.
2002-03-19 11:51:01 +08:00
assert(us != NULL);
This seems to resolve the issues with fgets. I've moved EOF detection into the streams layer; a stream reader implementation should set stream->eof when it detects EOF. Fixed test for user streams - it still fails but that is due to an output buffering bug.
2002-10-05 18:35:13 +08:00
ZVAL_STRINGL(&func_name, USERSTREAM_READ, sizeof(USERSTREAM_READ)-1, 0);
Implement user-space streams. There's probably room for improvement, docs will following some time this week.
2002-03-19 11:51:01 +08:00
This seems to resolve the issues with fgets. I've moved EOF detection into the streams layer; a stream reader implementation should set stream->eof when it detects EOF. Fixed test for user streams - it still fails but that is due to an output buffering bug.
2002-10-05 18:35:13 +08:00
MAKE_STD_ZVAL(zcount);
ZVAL_LONG(zcount, count);
args[0] = &zcount;
call_result = call_user_function_ex(NULL,
Implement user-space streams. There's probably room for improvement, docs will following some time this week.
2002-03-19 11:51:01 +08:00
&us->object,
&func_name,
&retval,
This seems to resolve the issues with fgets. I've moved EOF detection into the streams layer; a stream reader implementation should set stream->eof when it detects EOF. Fixed test for user streams - it still fails but that is due to an output buffering bug.
2002-10-05 18:35:13 +08:00
1, args,
0, NULL TSRMLS_CC);
Revise buffer/seek code a little. Tidy up user streams even more. Make test case quite aggressive.
2002-09-23 21:22:10 +08:00
This seems to resolve the issues with fgets. I've moved EOF detection into the streams layer; a stream reader implementation should set stream->eof when it detects EOF. Fixed test for user streams - it still fails but that is due to an output buffering bug.
2002-10-05 18:35:13 +08:00
if (call_result == SUCCESS && retval != NULL) {
convert_to_string(retval);
didread = Z_STRLEN_P(retval);
if (didread > count) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s::" USERSTREAM_READ " - read %d bytes more data than requested (%d read, %d max) - excess data will be lost",
us->wrapper->classname, didread - count, didread, count);
didread = count;
Revise buffer/seek code a little. Tidy up user streams even more. Make test case quite aggressive.
2002-09-23 21:22:10 +08:00
}
This seems to resolve the issues with fgets. I've moved EOF detection into the streams layer; a stream reader implementation should set stream->eof when it detects EOF. Fixed test for user streams - it still fails but that is due to an output buffering bug.
2002-10-05 18:35:13 +08:00
if (didread > 0)
memcpy(buf, Z_STRVAL_P(retval), didread);
} else if (call_result == FAILURE) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s::" USERSTREAM_READ " is not implemented!",
us->wrapper->classname);
}
zval_ptr_dtor(&zcount);
Implement user-space streams. There's probably room for improvement, docs will following some time this week.
2002-03-19 11:51:01 +08:00
Fix leak, and avoid initialization problems where retval is re-used within a function.
2002-10-15 09:57:19 +08:00
if (retval) {
This seems to resolve the issues with fgets. I've moved EOF detection into the streams layer; a stream reader implementation should set stream->eof when it detects EOF. Fixed test for user streams - it still fails but that is due to an output buffering bug.
2002-10-05 18:35:13 +08:00
zval_ptr_dtor(&retval);
Fix leak, and avoid initialization problems where retval is re-used within a function.
2002-10-15 09:57:19 +08:00
retval = NULL;
}
This seems to resolve the issues with fgets. I've moved EOF detection into the streams layer; a stream reader implementation should set stream->eof when it detects EOF. Fixed test for user streams - it still fails but that is due to an output buffering bug.
2002-10-05 18:35:13 +08:00
/* since the user stream has no way of setting the eof flag directly, we need to ask it if we hit eof */
ZVAL_STRINGL(&func_name, USERSTREAM_EOF, sizeof(USERSTREAM_EOF)-1, 0);
call_result = call_user_function_ex(NULL,
&us->object,
&func_name,
&retval,
0, NULL, 0, NULL TSRMLS_CC);
Fix stream_eof result interpretation (and thus the user-streams test).
2002-10-14 08:16:02 +08:00
if (call_result == SUCCESS && retval != NULL && zval_is_true(retval)) {
stream->eof = 1;
} else if (call_result == FAILURE) {
php_error_docref(NULL TSRMLS_CC, E_WARNING,
"%s::" USERSTREAM_EOF " is not implemented! Assuming EOF",
us->wrapper->classname);
This seems to resolve the issues with fgets. I've moved EOF detection into the streams layer; a stream reader implementation should set stream->eof when it detects EOF. Fixed test for user streams - it still fails but that is due to an output buffering bug.
2002-10-05 18:35:13 +08:00
stream->eof = 1;
Implement user-space streams. There's probably room for improvement, docs will following some time this week.
2002-03-19 11:51:01 +08:00
}
This seems to resolve the issues with fgets. I've moved EOF detection into the streams layer; a stream reader implementation should set stream->eof when it detects EOF. Fixed test for user streams - it still fails but that is due to an output buffering bug.
2002-10-05 18:35:13 +08:00
Fix leak, and avoid initialization problems where retval is re-used within a function.
2002-10-15 09:57:19 +08:00
if (retval) {
zval_ptr_dtor(&retval);
retval = NULL;
}
Implement user-space streams. There's probably room for improvement, docs will following some time this week.
2002-03-19 11:51:01 +08:00
return didread;
}
static int php_userstreamop_close(php_stream *stream, int close_handle TSRMLS_DC)
{
zval func_name;
zval *retval = NULL;
php_userstream_data_t *us = (php_userstream_data_t *)stream->abstract;
assert(us != NULL);
ZVAL_STRINGL(&func_name, USERSTREAM_CLOSE, sizeof(USERSTREAM_CLOSE)-1, 0);
call_result is set but never used
2002-05-05 01:32:01 +08:00
call_user_function_ex(NULL,
Implement user-space streams. There's probably room for improvement, docs will following some time this week.
2002-03-19 11:51:01 +08:00
&us->object,
&func_name,
&retval,
0, NULL, 0, NULL TSRMLS_CC);
if (retval)
zval_ptr_dtor(&retval);
zval_ptr_dtor(&us->object);
efree(us);
return 0;
}
static int php_userstreamop_flush(php_stream *stream TSRMLS_DC)
{
zval func_name;
zval *retval = NULL;
int call_result;
php_userstream_data_t *us = (php_userstream_data_t *)stream->abstract;
assert(us != NULL);
ZVAL_STRINGL(&func_name, USERSTREAM_FLUSH, sizeof(USERSTREAM_FLUSH)-1, 0);
call_result = call_user_function_ex(NULL,
&us->object,
&func_name,
&retval,
0, NULL, 0, NULL TSRMLS_CC);
if (call_result == SUCCESS && retval != NULL && zval_is_true(retval))
call_result = 0;
else
call_result = -1;
if (retval)
zval_ptr_dtor(&retval);
return call_result;
}
Implement read buffering in streams. Eliminate similar code from network.c. Implement fgets equivalent at the streams level, which can detect the mac, dos and unix line endings and handle them appropriately. The default behaviour is unix (and dos) line endings. An ini option to control this behaviour will follow. # Don't forget to make clean! # I've done some testing but would appreciate feedback from # people with scripts/extensions that seek around a lot.
2002-09-23 09:47:04 +08:00
static int php_userstreamop_seek(php_stream *stream, off_t offset, int whence, off_t *newoffs TSRMLS_DC)
Implement user-space streams. There's probably room for improvement, docs will following some time this week.
2002-03-19 11:51:01 +08:00
{
zval func_name;
zval *retval = NULL;
Implement read buffering in streams. Eliminate similar code from network.c. Implement fgets equivalent at the streams level, which can detect the mac, dos and unix line endings and handle them appropriately. The default behaviour is unix (and dos) line endings. An ini option to control this behaviour will follow. # Don't forget to make clean! # I've done some testing but would appreciate feedback from # people with scripts/extensions that seek around a lot.
2002-09-23 09:47:04 +08:00
int call_result, ret;
Implement user-space streams. There's probably room for improvement, docs will following some time this week.
2002-03-19 11:51:01 +08:00
php_userstream_data_t *us = (php_userstream_data_t *)stream->abstract;
Implement read buffering in streams. Eliminate similar code from network.c. Implement fgets equivalent at the streams level, which can detect the mac, dos and unix line endings and handle them appropriately. The default behaviour is unix (and dos) line endings. An ini option to control this behaviour will follow. # Don't forget to make clean! # I've done some testing but would appreciate feedback from # people with scripts/extensions that seek around a lot.
2002-09-23 09:47:04 +08:00
zval **args[2];
zval *zoffs, *zwhence;
Implement user-space streams. There's probably room for improvement, docs will following some time this week.
2002-03-19 11:51:01 +08:00
assert(us != NULL);
Implement read buffering in streams. Eliminate similar code from network.c. Implement fgets equivalent at the streams level, which can detect the mac, dos and unix line endings and handle them appropriately. The default behaviour is unix (and dos) line endings. An ini option to control this behaviour will follow. # Don't forget to make clean! # I've done some testing but would appreciate feedback from # people with scripts/extensions that seek around a lot.
2002-09-23 09:47:04 +08:00
ZVAL_STRINGL(&func_name, USERSTREAM_SEEK, sizeof(USERSTREAM_SEEK)-1, 0);
Implement user-space streams. There's probably room for improvement, docs will following some time this week.
2002-03-19 11:51:01 +08:00
Implement read buffering in streams. Eliminate similar code from network.c. Implement fgets equivalent at the streams level, which can detect the mac, dos and unix line endings and handle them appropriately. The default behaviour is unix (and dos) line endings. An ini option to control this behaviour will follow. # Don't forget to make clean! # I've done some testing but would appreciate feedback from # people with scripts/extensions that seek around a lot.
2002-09-23 09:47:04 +08:00
MAKE_STD_ZVAL(zoffs);
ZVAL_LONG(zoffs, offset);
args[0] = &zoffs;
MAKE_STD_ZVAL(zwhence);
ZVAL_LONG(zwhence, whence);
args[1] = &zwhence;
call_result = call_user_function_ex(NULL,
Implement user-space streams. There's probably room for improvement, docs will following some time this week.
2002-03-19 11:51:01 +08:00
&us->object,
&func_name,
&retval,
Implement read buffering in streams. Eliminate similar code from network.c. Implement fgets equivalent at the streams level, which can detect the mac, dos and unix line endings and handle them appropriately. The default behaviour is unix (and dos) line endings. An ini option to control this behaviour will follow. # Don't forget to make clean! # I've done some testing but would appreciate feedback from # people with scripts/extensions that seek around a lot.
2002-09-23 09:47:04 +08:00
2, args,
0, NULL TSRMLS_CC);
Implement user-space streams. There's probably room for improvement, docs will following some time this week.
2002-03-19 11:51:01 +08:00
Implement read buffering in streams. Eliminate similar code from network.c. Implement fgets equivalent at the streams level, which can detect the mac, dos and unix line endings and handle them appropriately. The default behaviour is unix (and dos) line endings. An ini option to control this behaviour will follow. # Don't forget to make clean! # I've done some testing but would appreciate feedback from # people with scripts/extensions that seek around a lot.
2002-09-23 09:47:04 +08:00
zval_ptr_dtor(&zoffs);
zval_ptr_dtor(&zwhence);
Implement user-space streams. There's probably room for improvement, docs will following some time this week.
2002-03-19 11:51:01 +08:00
Revise buffer/seek code a little. Tidy up user streams even more. Make test case quite aggressive.
2002-09-23 21:22:10 +08:00
if (call_result == FAILURE) {
/* stream_seek is not implemented, so disable seeks for this stream */
stream->flags |= PHP_STREAM_FLAG_NO_SEEK;
/* there should be no retval to clean up */
Fixed possible memory leaks.
2002-10-15 10:05:27 +08:00
if (retval)
zval_ptr_dtor(&retval);
Revise buffer/seek code a little. Tidy up user streams even more. Make test case quite aggressive.
2002-09-23 21:22:10 +08:00
return -1;
} else if (call_result == SUCCESS && retval != NULL && zval_is_true(retval)) {
ret = 0;
} else {
Implement read buffering in streams. Eliminate similar code from network.c. Implement fgets equivalent at the streams level, which can detect the mac, dos and unix line endings and handle them appropriately. The default behaviour is unix (and dos) line endings. An ini option to control this behaviour will follow. # Don't forget to make clean! # I've done some testing but would appreciate feedback from # people with scripts/extensions that seek around a lot.
2002-09-23 09:47:04 +08:00
ret = -1;
Revise buffer/seek code a little. Tidy up user streams even more. Make test case quite aggressive.
2002-09-23 21:22:10 +08:00
}
Fix leak, and avoid initialization problems where retval is re-used within a function.
2002-10-15 09:57:19 +08:00
if (retval) {
Revise buffer/seek code a little. Tidy up user streams even more. Make test case quite aggressive.
2002-09-23 21:22:10 +08:00
zval_ptr_dtor(&retval);
Fix leak, and avoid initialization problems where retval is re-used within a function.
2002-10-15 09:57:19 +08:00
retval = NULL;
}
Implement user-space streams. There's probably room for improvement, docs will following some time this week.
2002-03-19 11:51:01 +08:00
Implement read buffering in streams. Eliminate similar code from network.c. Implement fgets equivalent at the streams level, which can detect the mac, dos and unix line endings and handle them appropriately. The default behaviour is unix (and dos) line endings. An ini option to control this behaviour will follow. # Don't forget to make clean! # I've done some testing but would appreciate feedback from # people with scripts/extensions that seek around a lot.
2002-09-23 09:47:04 +08:00
/* now determine where we are */
ZVAL_STRINGL(&func_name, USERSTREAM_TELL, sizeof(USERSTREAM_TELL)-1, 0);
Implement user-space streams. There's probably room for improvement, docs will following some time this week.
2002-03-19 11:51:01 +08:00
Tidy up some user stream code. Add a small test case (not yet complete).
2002-09-18 18:15:40 +08:00
call_result = call_user_function_ex(NULL,
Implement read buffering in streams. Eliminate similar code from network.c. Implement fgets equivalent at the streams level, which can detect the mac, dos and unix line endings and handle them appropriately. The default behaviour is unix (and dos) line endings. An ini option to control this behaviour will follow. # Don't forget to make clean! # I've done some testing but would appreciate feedback from # people with scripts/extensions that seek around a lot.
2002-09-23 09:47:04 +08:00
&us->object,
&func_name,
&retval,
0, NULL, 0, NULL TSRMLS_CC);
Implement user-space streams. There's probably room for improvement, docs will following some time this week.
2002-03-19 11:51:01 +08:00
Implement read buffering in streams. Eliminate similar code from network.c. Implement fgets equivalent at the streams level, which can detect the mac, dos and unix line endings and handle them appropriately. The default behaviour is unix (and dos) line endings. An ini option to control this behaviour will follow. # Don't forget to make clean! # I've done some testing but would appreciate feedback from # people with scripts/extensions that seek around a lot.
2002-09-23 09:47:04 +08:00
if (call_result == SUCCESS && retval != NULL && Z_TYPE_P(retval) == IS_LONG)
*newoffs = Z_LVAL_P(retval);
Revise buffer/seek code a little. Tidy up user streams even more. Make test case quite aggressive.
2002-09-23 21:22:10 +08:00
else
Allow user streams/wrappers to implement fstat(), opendir() and stat().
2002-09-28 21:05:47 +08:00
php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s::" USERSTREAM_TELL " is not implemented!",
us->wrapper->classname);
Fix leak, and avoid initialization problems where retval is re-used within a function.
2002-10-15 09:57:19 +08:00
Allow user streams/wrappers to implement fstat(), opendir() and stat().
2002-09-28 21:05:47 +08:00
if (retval)
zval_ptr_dtor(&retval);
Fix leak, and avoid initialization problems where retval is re-used within a function.
2002-10-15 09:57:19 +08:00
Allow user streams/wrappers to implement fstat(), opendir() and stat().
2002-09-28 21:05:47 +08:00
return 0;
}
/* parse the return value from one of the stat functions and store the
* relevant fields into the statbuf provided */
static int statbuf_from_array(zval *array, php_stream_statbuf *ssb TSRMLS_DC)
{
zval *elem;
#define STAT_PROP_ENTRY(name) \
if (SUCCESS == zend_hash_find(Z_ARRVAL_P(array), #name, sizeof(#name), (void**)&elem)) { \
convert_to_long(elem); \
ssb->sb.st_##name = Z_LVAL_P(elem); \
}
STAT_PROP_ENTRY(dev);
STAT_PROP_ENTRY(ino);
STAT_PROP_ENTRY(mode);
STAT_PROP_ENTRY(nlink);
STAT_PROP_ENTRY(uid);
STAT_PROP_ENTRY(gid);
#if HAVE_ST_RDEV
STAT_PROP_ENTRY(rdev);
#endif
STAT_PROP_ENTRY(size);
A new file added and some old files modified for NetWare.
2003-01-03 20:48:14 +08:00
#if defined(NETWARE) && defined(CLIB_STAT_PATCH)
STAT_PROP_ENTRY(atime.tv_sec);
STAT_PROP_ENTRY(mtime.tv_sec);
STAT_PROP_ENTRY(ctime.tv_sec);
#else
Allow user streams/wrappers to implement fstat(), opendir() and stat().
2002-09-28 21:05:47 +08:00
STAT_PROP_ENTRY(atime);
STAT_PROP_ENTRY(mtime);
STAT_PROP_ENTRY(ctime);
A new file added and some old files modified for NetWare.
2003-01-03 20:48:14 +08:00
#endif
Allow user streams/wrappers to implement fstat(), opendir() and stat().
2002-09-28 21:05:47 +08:00
#ifdef HAVE_ST_BLKSIZE
STAT_PROP_ENTRY(blksize);
#endif
#ifdef HAVE_ST_BLOCKS
STAT_PROP_ENTRY(blocks);
#endif
#undef STAT_PROP_ENTRY
return SUCCESS;
}
static int php_userstreamop_stat(php_stream *stream, php_stream_statbuf *ssb TSRMLS_DC)
{
zval func_name;
zval *retval = NULL;
int call_result;
php_userstream_data_t *us = (php_userstream_data_t *)stream->abstract;
int ret = -1;
ZVAL_STRINGL(&func_name, USERSTREAM_STAT, sizeof(USERSTREAM_STAT)-1, 0);
call_result = call_user_function_ex(NULL,
&us->object,
&func_name,
&retval,
0, NULL, 0, NULL TSRMLS_CC);
if (call_result == SUCCESS && retval != NULL && Z_TYPE_P(retval) == IS_ARRAY) {
if (SUCCESS == statbuf_from_array(retval, ssb TSRMLS_CC))
ret = 0;
} else {
if (call_result == FAILURE) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s::" USERSTREAM_STAT " is not implemented!",
us->wrapper->classname);
}
}
Fixed possible memory leaks.
2002-10-15 10:05:27 +08:00
if (retval)
zval_ptr_dtor(&retval);
Allow user streams/wrappers to implement fstat(), opendir() and stat().
2002-09-28 21:05:47 +08:00
return ret;
}
static int user_wrapper_stat_url(php_stream_wrapper *wrapper, char *url, php_stream_statbuf *ssb TSRMLS_DC)
{
struct php_user_stream_wrapper *uwrap = (struct php_user_stream_wrapper*)wrapper->abstract;
zval *zfilename, *zfuncname, *zretval;
zval **args[1];
int call_result;
zval *object;
int ret = -1;
/* create an instance of our class */
ALLOC_ZVAL(object);
object_init_ex(object, uwrap->ce);
ZVAL_REFCOUNT(object) = 1;
PZVAL_IS_REF(object) = 1;
/* call the stat_url method */
/* call it's stream_open method - set up params first */
MAKE_STD_ZVAL(zfilename);
ZVAL_STRING(zfilename, url, 1);
args[0] = &zfilename;
MAKE_STD_ZVAL(zfuncname);
ZVAL_STRING(zfuncname, USERSTREAM_STATURL, 1);
call_result = call_user_function_ex(NULL,
&object,
zfuncname,
&zretval,
1, args,
0, NULL TSRMLS_CC);
if (call_result == SUCCESS && zretval != NULL && Z_TYPE_P(zretval) == IS_ARRAY) {
/* We got the info we needed */
if (SUCCESS == statbuf_from_array(zretval, ssb TSRMLS_CC))
ret = 0;
} else {
if (call_result == FAILURE) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s::" USERSTREAM_STATURL " is not implemented!",
uwrap->classname);
}
}
/* clean up */
zval_ptr_dtor(&object);
if (zretval)
zval_ptr_dtor(&zretval);
zval_ptr_dtor(&zfuncname);
zval_ptr_dtor(&zfilename);
return ret;
}
static size_t php_userstreamop_readdir(php_stream *stream, char *buf, size_t count TSRMLS_DC)
{
zval func_name;
zval *retval = NULL;
int call_result;
size_t didread = 0;
php_userstream_data_t *us = (php_userstream_data_t *)stream->abstract;
php_stream_dirent *ent = (php_stream_dirent*)buf;
/* avoid problems if someone mis-uses the stream */
if (count != sizeof(php_stream_dirent))
return 0;
ZVAL_STRINGL(&func_name, USERSTREAM_DIR_READ, sizeof(USERSTREAM_DIR_READ)-1, 0);
call_result = call_user_function_ex(NULL,
&us->object,
&func_name,
&retval,
0, NULL,
0, NULL TSRMLS_CC);
if (call_result == SUCCESS && retval != NULL && Z_TYPE_P(retval) != IS_BOOL) {
convert_to_string(retval);
PHP_STRLCPY(ent->d_name, Z_STRVAL_P(retval), sizeof(ent->d_name), Z_STRLEN_P(retval));
didread = sizeof(php_stream_dirent);
} else if (call_result == FAILURE) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s::" USERSTREAM_DIR_READ " is not implemented!",
Revise buffer/seek code a little. Tidy up user streams even more. Make test case quite aggressive.
2002-09-23 21:22:10 +08:00
us->wrapper->classname);
Allow user streams/wrappers to implement fstat(), opendir() and stat().
2002-09-28 21:05:47 +08:00
}
if (retval)
zval_ptr_dtor(&retval);
return didread;
}
static int php_userstreamop_closedir(php_stream *stream, int close_handle TSRMLS_DC)
{
zval func_name;
zval *retval = NULL;
php_userstream_data_t *us = (php_userstream_data_t *)stream->abstract;
assert(us != NULL);
Implement read buffering in streams. Eliminate similar code from network.c. Implement fgets equivalent at the streams level, which can detect the mac, dos and unix line endings and handle them appropriately. The default behaviour is unix (and dos) line endings. An ini option to control this behaviour will follow. # Don't forget to make clean! # I've done some testing but would appreciate feedback from # people with scripts/extensions that seek around a lot.
2002-09-23 09:47:04 +08:00
Allow user streams/wrappers to implement fstat(), opendir() and stat().
2002-09-28 21:05:47 +08:00
ZVAL_STRINGL(&func_name, USERSTREAM_DIR_CLOSE, sizeof(USERSTREAM_DIR_CLOSE)-1, 0);
call_user_function_ex(NULL,
&us->object,
&func_name,
&retval,
0, NULL, 0, NULL TSRMLS_CC);
Implement user-space streams. There's probably room for improvement, docs will following some time this week.
2002-03-19 11:51:01 +08:00
if (retval)
Implement read buffering in streams. Eliminate similar code from network.c. Implement fgets equivalent at the streams level, which can detect the mac, dos and unix line endings and handle them appropriately. The default behaviour is unix (and dos) line endings. An ini option to control this behaviour will follow. # Don't forget to make clean! # I've done some testing but would appreciate feedback from # people with scripts/extensions that seek around a lot.
2002-09-23 09:47:04 +08:00
zval_ptr_dtor(&retval);
Allow user streams/wrappers to implement fstat(), opendir() and stat().
2002-09-28 21:05:47 +08:00
zval_ptr_dtor(&us->object);
Implement user-space streams. There's probably room for improvement, docs will following some time this week.
2002-03-19 11:51:01 +08:00
Allow user streams/wrappers to implement fstat(), opendir() and stat().
2002-09-28 21:05:47 +08:00
efree(us);
Implement user-space streams. There's probably room for improvement, docs will following some time this week.
2002-03-19 11:51:01 +08:00
return 0;
}
Allow user streams/wrappers to implement fstat(), opendir() and stat().
2002-09-28 21:05:47 +08:00
static int php_userstreamop_rewinddir(php_stream *stream, off_t offset, int whence, off_t *newoffs TSRMLS_DC)
{
zval func_name;
zval *retval = NULL;
php_userstream_data_t *us = (php_userstream_data_t *)stream->abstract;
ZVAL_STRINGL(&func_name, USERSTREAM_DIR_REWIND, sizeof(USERSTREAM_DIR_REWIND)-1, 0);
call_user_function_ex(NULL,
&us->object,
&func_name,
&retval,
0, NULL, 0, NULL TSRMLS_CC);
if (retval)
zval_ptr_dtor(&retval);
return 0;
}
Implement user-space streams. There's probably room for improvement, docs will following some time this week.
2002-03-19 11:51:01 +08:00
php_stream_ops php_stream_userspace_ops = {
php_userstreamop_write, php_userstreamop_read,
php_userstreamop_close, php_userstreamop_flush,
Phase 3 of OO wrapper cleanup # What was phase 2?
2002-03-28 08:49:00 +08:00
"user-space",
Implement read buffering in streams. Eliminate similar code from network.c. Implement fgets equivalent at the streams level, which can detect the mac, dos and unix line endings and handle them appropriately. The default behaviour is unix (and dos) line endings. An ini option to control this behaviour will follow. # Don't forget to make clean! # I've done some testing but would appreciate feedback from # people with scripts/extensions that seek around a lot.
2002-09-23 09:47:04 +08:00
php_userstreamop_seek,
Implement user-space streams. There's probably room for improvement, docs will following some time this week.
2002-03-19 11:51:01 +08:00
NULL, /* cast */
Allow user streams/wrappers to implement fstat(), opendir() and stat().
2002-09-28 21:05:47 +08:00
php_userstreamop_stat, /* stat */
NULL /* set_option */
};
php_stream_ops php_stream_userspace_dir_ops = {
NULL, /* write */
php_userstreamop_readdir,
php_userstreamop_closedir,
NULL, /* flush */
"user-space-dir",
php_userstreamop_rewinddir,
NULL, /* cast */
Implement read buffering in streams. Eliminate similar code from network.c. Implement fgets equivalent at the streams level, which can detect the mac, dos and unix line endings and handle them appropriately. The default behaviour is unix (and dos) line endings. An ini option to control this behaviour will follow. # Don't forget to make clean! # I've done some testing but would appreciate feedback from # people with scripts/extensions that seek around a lot.
2002-09-23 09:47:04 +08:00
NULL, /* stat */
NULL /* set_option */
Implement user-space streams. There's probably room for improvement, docs will following some time this week.
2002-03-19 11:51:01 +08:00
};
Reference in New Issue Copy Permalink