cvs: php4 /ext/standard file.c file.h

pollita Tue Apr 8 19:24:53 2003 EDT Modified files: /php4/ext/standard file.c file.h Log: Switch file_put_contents 'bool use_include_path' to 'int flags' to allow other options such as appending Index: php4/ext/standard/file.c diff -u php4/ext/standard/file.c:1.333 php4/ext/standard/file.c:1.334 --- php4/ext/standard/file.c:1.333 Tue Apr 8 18:10:15 2003 +++ php4/ext/standard/file.c Tue Apr 8 19:24:53 2003 @@ -21,7 +21,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: file.c,v 1.333 2003/04/08 22:10:15 pollita Exp $ */ +/* $Id: file.c,v 1.334 2003/04/08 23:24:53 pollita Exp $ */ /* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */ @@ -196,6 +196,7 @@ REGISTER_LONG_CONSTANT("FILE_USE_INCLUDE_PATH", PHP_FILE_USE_INCLUDE_PATH, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("FILE_IGNORE_NEW_LINES", PHP_FILE_IGNORE_NEW_LINES, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("FILE_SKIP_EMPTY_LINES", PHP_FILE_SKIP_EMPTY_LINES, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("FILE_APPEND", PHP_FILE_APPEND, CONST_CS | CONST_PERSISTENT); #ifdef HAVE_FNMATCH REGISTER_LONG_CONSTANT("FNM_NOESCAPE", FNM_NOESCAPE, CONST_CS | CONST_PERSISTENT); @@ -465,20 +466,19 @@ } /* }}} */ -/* {{{ proto string file_put_contents(string file, string data[, bool use_include_path[, resource context]]) +/* {{{ proto string file_put_contents(string file, string data[, int flags[, resource context]]) Write/Create a file with contents data */ PHP_FUNCTION(file_put_contents) { php_stream *stream; char *filename, *data; size_t filename_len, data_len; - int numbytes; - zend_bool use_include_path = 0; + int numbytes, flags = 0; zval *zcontext = NULL; php_stream_context *context = NULL; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|br!", &filename, &filename_len, - &data, &data_len, &use_include_path, &zcontext) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|lr!", &filename, &filename_len, + &data, &data_len, &flags, &zcontext) == FAILURE) { return; } @@ -486,8 +486,8 @@ context = zend_fetch_resource(&zcontext TSRMLS_CC, -1, "Stream-Context", NULL, 1, php_le_stream_context()); } - stream = php_stream_open_wrapper_ex(filename, "wb", - (use_include_path ? USE_PATH : 0) | ENFORCE_SAFE_MODE | REPORT_ERRORS, NULL, context); + stream = php_stream_open_wrapper_ex(filename, (flags & PHP_FILE_APPEND) ? "ab" : "wb", + ((flags & PHP_FILE_USE_INCLUDE_PATH) ? USE_PATH : 0) | ENFORCE_SAFE_MODE | REPORT_ERRORS, NULL, context); if (stream == NULL) { RETURN_FALSE; } Index: php4/ext/standard/file.h diff -u php4/ext/standard/file.h:1.81 php4/ext/standard/file.h:1.82 --- php4/ext/standard/file.h:1.81 Tue Apr 8 10:12:52 2003 +++ php4/ext/standard/file.h Tue Apr 8 19:24:53 2003 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: file.h,v 1.81 2003/04/08 14:12:52 sniper Exp $ */ +/* $Id: file.h,v 1.82 2003/04/08 23:24:53 pollita Exp $ */ /* Synced with php 3.0 revision 1.30 1999-06-16 [ssb] */ @@ -77,6 +77,7 @@ #define PHP_FILE_USE_INCLUDE_PATH 1 #define PHP_FILE_IGNORE_NEW_LINES 2 #define PHP_FILE_SKIP_EMPTY_LINES 4 +#define PHP_FILE_APPEND 8 typedef enum _php_meta_tags_token { TOK_EOF = 0,