com php-src: fixed "struct stat" usage in main, cli and ext/standard: ext/standard/basic_functions.c ext/standard/iptc.c ex t/standard/link.c
ext/standard/link_win32.c ext/s tandard/pageinfo.c ext/standard/php_fopen_wrapper.c main/SAPI.c main/SAPI.h main/main.c main/php_i ni.c
main/php_streams.h sapi/cgi/cgi_main.c sap i/cli/php_cli_server.c

From: Date: Wed, 13 Nov 2013 11:39:12 +0000
Subject: com php-src: fixed "struct stat" usage in main, cli and ext/standard: ext/standard/basic_functions.c ext/standard/iptc.c ex t/standard/link.c
ext/standard/link_win32.c ext/s tandard/pageinfo.c ext/standard/php_fopen_wrapper.c main/SAPI.c main/SAPI.h main/main.c main/php_i ni.c
main/php_streams.h sapi/cgi/cgi_main.c sap i/cli/php_cli_server.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-73947@lists.php.net to get a copy of this message
Commit: 15bb12b269ddb0751c2e9b232dd0b5dd5999bdad Author: Anatol Belski <ab@php.net> Wed, 13 Nov 2013 12:39:12 +0100 Parents: 468b2923ca1f80e45a46e957b93cd62da6328780 Branches: str_size_and_int64 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=15bb12b269ddb0751c2e9b232dd0b5dd5999bdad Log: fixed "struct stat" usage in main, cli and ext/standard Changed paths: M ext/standard/basic_functions.c M ext/standard/iptc.c M ext/standard/link.c M ext/standard/link_win32.c M ext/standard/pageinfo.c M ext/standard/php_fopen_wrapper.c M main/SAPI.c M main/SAPI.h M main/main.c M main/php_ini.c M main/php_streams.h M sapi/cgi/cgi_main.c M sapi/cli/php_cli_server.c

diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index 036d786..da21462 100644 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -5901,7 +5901,7 @@ static void php_simple_ini_parser_cb(zval *arg1, zval *arg2, zval *arg3, int cal } if (!(Z_STRSIZE_P(arg1) > 1 && Z_STRVAL_P(arg1)[0] == '0') && is_numeric_string(Z_STRVAL_P(arg1), Z_STRSIZE_P(arg1), NULL, NULL, 0) == IS_LONG) { - ulong key = (ulong) zend_atol(Z_STRVAL_P(arg1), Z_STRSIZE_P(arg1)); + php_uint_t key = (php_uint_t) zend_atol(Z_STRVAL_P(arg1), Z_STRSIZE_P(arg1)); if (zend_hash_index_find(Z_ARRVAL_P(arr), key, (void **) &find_hash) == FAILURE) { ALLOC_ZVAL(hash); INIT_PZVAL(hash); diff --git a/ext/standard/iptc.c b/ext/standard/iptc.c index 4ae38d0..7b85f5e 100644 --- a/ext/standard/iptc.c +++ b/ext/standard/iptc.c @@ -184,7 +184,7 @@ PHP_FUNCTION(iptcembed) unsigned int marker, done = 0; int inx; unsigned char *spoolbuf = NULL, *poi = NULL; - struct stat sb; + php_stat_t sb; zend_bool written = 0; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "SP|i", &iptcdata, &iptcdata_len, &jpeg_file, &jpeg_file_len, &spool) != SUCCESS) { @@ -201,7 +201,7 @@ PHP_FUNCTION(iptcembed) } if (spool < 2) { - fstat(fileno(fp), &sb); + php_fstat(fileno(fp), &sb); poi = spoolbuf = safe_emalloc(1, iptcdata_len + sizeof(psheader) + sb.st_size + 1024, 1); memset(poi, 0, iptcdata_len + sizeof(psheader) + sb.st_size + 1024 + 1); diff --git a/ext/standard/link.c b/ext/standard/link.c index 80ca52b..906c462 100644 --- a/ext/standard/link.c +++ b/ext/standard/link.c @@ -87,7 +87,7 @@ PHP_FUNCTION(linkinfo) char *link; char *dirname; zend_str_size link_len, dir_len; - struct stat sb; + php_stat_t sb; int ret; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "P", &link, &link_len) == FAILURE) { diff --git a/ext/standard/link_win32.c b/ext/standard/link_win32.c index b368f99..31be99b 100644 --- a/ext/standard/link_win32.c +++ b/ext/standard/link_win32.c @@ -88,7 +88,7 @@ PHP_FUNCTION(linkinfo) { char *link; zend_str_size_int link_len; - struct stat sb; + php_stat_t sb; int ret; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "P", &link, &link_len) == FAILURE) { diff --git a/ext/standard/pageinfo.c b/ext/standard/pageinfo.c index 6add726..e280d6c 100644 --- a/ext/standard/pageinfo.c +++ b/ext/standard/pageinfo.c @@ -59,7 +59,7 @@ */ PHPAPI void php_statpage(TSRMLS_D) { - struct stat *pstat; + php_stat_t *pstat; pstat = sapi_get_stat(TSRMLS_C); diff --git a/ext/standard/php_fopen_wrapper.c b/ext/standard/php_fopen_wrapper.c index 31fc21b..0b4b7fc 100644 --- a/ext/standard/php_fopen_wrapper.c +++ b/ext/standard/php_fopen_wrapper.c @@ -379,9 +379,9 @@ php_stream * php_stream_url_wrap_php(php_stream_wrapper *wrapper, const char *pa #if defined(S_IFSOCK) && !defined(WIN32) && !defined(__BEOS__) do { - struct stat st; + php_stat_t st; memset(&st, 0, sizeof(st)); - if (fstat(fd, &st) == 0 && (st.st_mode & S_IFMT) == S_IFSOCK) { + if (php_fstat(fd, &st) == 0 && (st.st_mode & S_IFMT) == S_IFSOCK) { stream = php_stream_sock_open_from_socket(fd, NULL); if (stream) { stream->ops = &php_stream_socket_ops; diff --git a/main/SAPI.c b/main/SAPI.c index 8652211..3cf7204 100644 --- a/main/SAPI.c +++ b/main/SAPI.c @@ -999,7 +999,7 @@ SAPI_API int sapi_flush(TSRMLS_D) } } -SAPI_API struct stat *sapi_get_stat(TSRMLS_D) +SAPI_API zend_stat_t *sapi_get_stat(TSRMLS_D) { if (sapi_module.get_stat) { return sapi_module.get_stat(TSRMLS_C); diff --git a/main/SAPI.h b/main/SAPI.h index 6138cae..faef411 100644 --- a/main/SAPI.h +++ b/main/SAPI.h @@ -123,7 +123,7 @@ typedef struct _sapi_globals_struct { int64_t read_post_bytes; unsigned char post_read; unsigned char headers_sent; - struct stat global_stat; + zend_stat_t global_stat; char *default_mimetype; char *default_charset; HashTable *rfc1867_uploaded_files; @@ -199,7 +199,7 @@ SAPI_API int sapi_register_treat_data(void (*treat_data)(int arg, char *str, zva SAPI_API int sapi_register_input_filter(unsigned int (*input_filter)(int arg, char *var, char **val, zend_str_size_uint val_len, zend_str_size_uint *new_val_len TSRMLS_DC), unsigned int (*input_filter_init)(TSRMLS_D) TSRMLS_DC); SAPI_API int sapi_flush(TSRMLS_D); -SAPI_API struct stat *sapi_get_stat(TSRMLS_D); +SAPI_API zend_stat_t *sapi_get_stat(TSRMLS_D); SAPI_API char *sapi_getenv(char *name, size_t name_len TSRMLS_DC); SAPI_API char *sapi_get_default_content_type(TSRMLS_D); @@ -228,7 +228,7 @@ struct _sapi_module_struct { zend_str_size_int (*ub_write)(const char *str, zend_str_size_uint str_length TSRMLS_DC); void (*flush)(void *server_context); - struct stat *(*get_stat)(TSRMLS_D); + zend_stat_t *(*get_stat)(TSRMLS_D); char *(*getenv)(char *name, size_t name_len TSRMLS_DC); void (*sapi_error)(int type, const char *error_msg, ...); diff --git a/main/main.c b/main/main.c index 7816bdf..2aab9f4 100644 --- a/main/main.c +++ b/main/main.c @@ -279,7 +279,7 @@ static void php_binary_init(TSRMLS_D) if ((envpath = getenv("PATH")) != NULL) { char *search_dir, search_path[MAXPATHLEN]; char *last = NULL; - struct stat s; + php_stat_t s; path = estrdup(envpath); search_dir = php_strtok_r(path, ":", &last); @@ -1205,7 +1205,7 @@ static void php_error_cb(int type, const char *error_filename, const zend_str_si */ PHPAPI char *php_get_current_user(TSRMLS_D) { - struct stat *pstat; + php_stat_t *pstat; if (SG(request_info).current_user) { return SG(request_info).current_user; diff --git a/main/php_ini.c b/main/php_ini.c index eeaddce..4207980 100644 --- a/main/php_ini.c +++ b/main/php_ini.c @@ -551,7 +551,7 @@ int php_init_config(TSRMLS_D) /* Check if php_ini_file_name is a file and can be opened */ if (php_ini_file_name && php_ini_file_name[0]) { - struct stat statbuf; + php_stat_t statbuf; if (!VCWD_STAT(php_ini_file_name, &statbuf)) { if (!((statbuf.st_mode & S_IFMT) == S_IFDIR)) { @@ -624,7 +624,7 @@ int php_init_config(TSRMLS_D) if (!sapi_module.php_ini_ignore && php_ini_scanned_path_len) { struct dirent **namelist; int ndir, i; - struct stat sb; + php_stat_t sb; char ini_file[MAXPATHLEN]; char *p; zend_file_handle fh2; @@ -736,7 +736,7 @@ void php_ini_register_extensions(TSRMLS_D) */ PHPAPI int php_parse_user_ini_file(const char *dirname, char *ini_filename, HashTable *target_hash TSRMLS_DC) { - struct stat sb; + php_stat_t sb; char ini_file[MAXPATHLEN]; zend_file_handle fh; diff --git a/main/php_streams.h b/main/php_streams.h index d6381c5..c41b884 100644 --- a/main/php_streams.h +++ b/main/php_streams.h @@ -105,9 +105,11 @@ typedef struct _php_stream_filter php_stream_filter; #ifdef _WIN64 # define php_fstat _fstat64 +# define php_stat_fn _stat64 typedef struct __stat64 php_stat_t; #else # define php_fstat fstat +# define php_stat_fn stat typedef struct stat php_stat_t; #endif diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c index 3ffdc1e..d574c38 100644 --- a/sapi/cgi/cgi_main.c +++ b/sapi/cgi/cgi_main.c @@ -1189,7 +1189,7 @@ static void init_request_info(fcgi_request *request TSRMLS_DC) #endif if (CGIG(fix_pathinfo)) { - struct stat st; + php_stat_t st; char *real_path = NULL; char *env_redirect_url = CGI_GETENV("REDIRECT_URL"); char *env_document_root = CGI_GETENV("DOCUMENT_ROOT"); diff --git a/sapi/cli/php_cli_server.c b/sapi/cli/php_cli_server.c index 456e592..a00e86e 100644 --- a/sapi/cli/php_cli_server.c +++ b/sapi/cli/php_cli_server.c @@ -137,7 +137,7 @@ typedef struct php_cli_server_request { size_t content_len; const char *ext; size_t ext_len; - struct stat sb; + php_stat_t sb; } php_cli_server_request; typedef struct php_cli_server_chunk { @@ -1332,7 +1332,7 @@ static void php_cli_server_request_dtor(php_cli_server_request *req) /* {{{ */ static void php_cli_server_request_translate_vpath(php_cli_server_request *request, const char *document_root, size_t document_root_len) /* {{{ */ { - struct stat sb; + php_stat_t sb; static const char *index_files[] = { "index.php", "index.html", NULL }; char *buf = safe_pemalloc(1, request->vpath_len, 1 + document_root_len + 1 + sizeof("index.html"), 1); char *p = buf, *prev_path = NULL, *q, *vpath; @@ -1369,7 +1369,7 @@ static void php_cli_server_request_translate_vpath(php_cli_server_request *reque *p = '\0'; q = p; while (q > buf) { - if (!stat(buf, &sb)) { + if (!php_stat_fn(buf, &sb)) { if (sb.st_mode & S_IFDIR) { const char **file = index_files; if (q[-1] != DEFAULT_SLASH) { @@ -1378,7 +1378,7 @@ static void php_cli_server_request_translate_vpath(php_cli_server_request *reque while (*file) { size_t l = strlen(*file); memmove(q, *file, l + 1); - if (!stat(buf, &sb) && (sb.st_mode & S_IFREG)) { + if (!php_stat_fn(buf, &sb) && (sb.st_mode & S_IFREG)) { q += l; break; } @@ -2411,9 +2411,9 @@ int do_cli_server(int argc, char **argv TSRMLS_DC) /* {{{ */ } if (document_root) { - struct stat sb; + php_stat_t sb; - if (stat(document_root, &sb)) { + if (php_stat_fn(document_root, &sb)) { fprintf(stderr, "Directory %s does not exist.\n", document_root); return 1; }
« previous php.cvs (#73947) next »