diff options
Diffstat (limited to 'ext/ftp/php_ftp.c')
| -rw-r--r-- | ext/ftp/php_ftp.c | 343 |
1 files changed, 173 insertions, 170 deletions
diff --git a/ext/ftp/php_ftp.c b/ext/ftp/php_ftp.c index 9a8680ccf6..59e6f8fc61 100644 --- a/ext/ftp/php_ftp.c +++ b/ext/ftp/php_ftp.c @@ -1,6 +1,6 @@ /* +----------------------------------------------------------------------+ - | PHP Version 5 | + | PHP Version 7 | +----------------------------------------------------------------------+ | Copyright (c) 1997-2015 The PHP Group | +----------------------------------------------------------------------+ @@ -245,7 +245,7 @@ const zend_function_entry php_ftp_functions[] = { PHP_FE(ftp_connect, arginfo_ftp_connect) #if HAVE_OPENSSL_EXT PHP_FE(ftp_ssl_connect, arginfo_ftp_ssl_connect) -#endif +#endif PHP_FE(ftp_login, arginfo_ftp_login) PHP_FE(ftp_pwd, arginfo_ftp_pwd) PHP_FE(ftp_cdup, arginfo_ftp_cdup) @@ -298,7 +298,7 @@ zend_module_entry php_ftp_module_entry = { ZEND_GET_MODULE(php_ftp) #endif -static void ftp_destructor_ftpbuf(zend_rsrc_list_entry *rsrc TSRMLS_DC) +static void ftp_destructor_ftpbuf(zend_resource *rsrc) { ftpbuf_t *ftp = (ftpbuf_t *)rsrc->ptr; @@ -330,7 +330,7 @@ PHP_MINFO_FUNCTION(ftp) #define XTYPE(xtype, mode) { \ if (mode != FTPTYPE_ASCII && mode != FTPTYPE_IMAGE) { \ - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Mode must be FTP_ASCII or FTP_BINARY"); \ + php_error_docref(NULL, E_WARNING, "Mode must be FTP_ASCII or FTP_BINARY"); \ RETURN_FALSE; \ } \ xtype = mode; \ @@ -343,21 +343,21 @@ PHP_FUNCTION(ftp_connect) { ftpbuf_t *ftp; char *host; - int host_len; - long port = 0; - long timeout_sec = FTP_DEFAULT_TIMEOUT; + size_t host_len; + zend_long port = 0; + zend_long timeout_sec = FTP_DEFAULT_TIMEOUT; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|ll", &host, &host_len, &port, &timeout_sec) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "s|ll", &host, &host_len, &port, &timeout_sec) == FAILURE) { return; } if (timeout_sec <= 0) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Timeout has to be greater than 0"); + php_error_docref(NULL, E_WARNING, "Timeout has to be greater than 0"); RETURN_FALSE; } /* connect */ - if (!(ftp = ftp_open(host, (short)port, timeout_sec TSRMLS_CC))) { + if (!(ftp = ftp_open(host, (short)port, timeout_sec))) { RETURN_FALSE; } @@ -379,21 +379,21 @@ PHP_FUNCTION(ftp_ssl_connect) { ftpbuf_t *ftp; char *host; - int host_len; - long port = 0; - long timeout_sec = FTP_DEFAULT_TIMEOUT; + size_t host_len; + zend_long port = 0; + zend_long timeout_sec = FTP_DEFAULT_TIMEOUT; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|ll", &host, &host_len, &port, &timeout_sec) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "s|ll", &host, &host_len, &port, &timeout_sec) == FAILURE) { return; } if (timeout_sec <= 0) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Timeout has to be greater than 0"); + php_error_docref(NULL, E_WARNING, "Timeout has to be greater than 0"); RETURN_FALSE; } /* connect */ - if (!(ftp = ftp_open(host, (short)port, timeout_sec TSRMLS_CC))) { + if (!(ftp = ftp_open(host, (short)port, timeout_sec))) { RETURN_FALSE; } @@ -414,17 +414,17 @@ PHP_FUNCTION(ftp_login) zval *z_ftp; ftpbuf_t *ftp; char *user, *pass; - int user_len, pass_len; + size_t user_len, pass_len; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rss", &z_ftp, &user, &user_len, &pass, &pass_len) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "rss", &z_ftp, &user, &user_len, &pass, &pass_len) == FAILURE) { return; } - ZEND_FETCH_RESOURCE(ftp, ftpbuf_t*, &z_ftp, -1, le_ftpbuf_name, le_ftpbuf); + ZEND_FETCH_RESOURCE(ftp, ftpbuf_t*, z_ftp, -1, le_ftpbuf_name, le_ftpbuf); /* log in */ - if (!ftp_login(ftp, user, pass TSRMLS_CC)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", ftp->inbuf); + if (!ftp_login(ftp, user, pass)) { + php_error_docref(NULL, E_WARNING, "%s", ftp->inbuf); RETURN_FALSE; } @@ -440,18 +440,18 @@ PHP_FUNCTION(ftp_pwd) ftpbuf_t *ftp; const char *pwd; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &z_ftp) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "r", &z_ftp) == FAILURE) { return; } - ZEND_FETCH_RESOURCE(ftp, ftpbuf_t*, &z_ftp, -1, le_ftpbuf_name, le_ftpbuf); + ZEND_FETCH_RESOURCE(ftp, ftpbuf_t*, z_ftp, -1, le_ftpbuf_name, le_ftpbuf); if (!(pwd = ftp_pwd(ftp))) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", ftp->inbuf); + php_error_docref(NULL, E_WARNING, "%s", ftp->inbuf); RETURN_FALSE; } - RETURN_STRING((char*) pwd, 1); + RETURN_STRING((char*) pwd); } /* }}} */ @@ -462,14 +462,14 @@ PHP_FUNCTION(ftp_cdup) zval *z_ftp; ftpbuf_t *ftp; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &z_ftp) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "r", &z_ftp) == FAILURE) { return; } - ZEND_FETCH_RESOURCE(ftp, ftpbuf_t*, &z_ftp, -1, le_ftpbuf_name, le_ftpbuf); + ZEND_FETCH_RESOURCE(ftp, ftpbuf_t*, z_ftp, -1, le_ftpbuf_name, le_ftpbuf); if (!ftp_cdup(ftp)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", ftp->inbuf); + php_error_docref(NULL, E_WARNING, "%s", ftp->inbuf); RETURN_FALSE; } @@ -484,17 +484,17 @@ PHP_FUNCTION(ftp_chdir) zval *z_ftp; ftpbuf_t *ftp; char *dir; - int dir_len; + size_t dir_len; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs", &z_ftp, &dir, &dir_len) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "rs", &z_ftp, &dir, &dir_len) == FAILURE) { return; } - ZEND_FETCH_RESOURCE(ftp, ftpbuf_t*, &z_ftp, -1, le_ftpbuf_name, le_ftpbuf); + ZEND_FETCH_RESOURCE(ftp, ftpbuf_t*, z_ftp, -1, le_ftpbuf_name, le_ftpbuf); /* change directories */ if (!ftp_chdir(ftp, dir)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", ftp->inbuf); + php_error_docref(NULL, E_WARNING, "%s", ftp->inbuf); RETURN_FALSE; } @@ -509,17 +509,17 @@ PHP_FUNCTION(ftp_exec) zval *z_ftp; ftpbuf_t *ftp; char *cmd; - int cmd_len; + size_t cmd_len; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs", &z_ftp, &cmd, &cmd_len) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "rs", &z_ftp, &cmd, &cmd_len) == FAILURE) { return; } - ZEND_FETCH_RESOURCE(ftp, ftpbuf_t*, &z_ftp, -1, le_ftpbuf_name, le_ftpbuf); + ZEND_FETCH_RESOURCE(ftp, ftpbuf_t*, z_ftp, -1, le_ftpbuf_name, le_ftpbuf); /* execute serverside command */ if (!ftp_exec(ftp, cmd)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", ftp->inbuf); + php_error_docref(NULL, E_WARNING, "%s", ftp->inbuf); RETURN_FALSE; } @@ -534,13 +534,13 @@ PHP_FUNCTION(ftp_raw) zval *z_ftp; ftpbuf_t *ftp; char *cmd; - int cmd_len; + size_t cmd_len; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs", &z_ftp, &cmd, &cmd_len) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "rs", &z_ftp, &cmd, &cmd_len) == FAILURE) { return; } - ZEND_FETCH_RESOURCE(ftp, ftpbuf_t*, &z_ftp, -1, le_ftpbuf_name, le_ftpbuf); + ZEND_FETCH_RESOURCE(ftp, ftpbuf_t*, z_ftp, -1, le_ftpbuf_name, le_ftpbuf); /* execute arbitrary ftp command */ ftp_raw(ftp, cmd, return_value); @@ -553,22 +553,23 @@ PHP_FUNCTION(ftp_mkdir) { zval *z_ftp; ftpbuf_t *ftp; - char *dir, *tmp; - int dir_len; + char *dir; + zend_string *tmp; + size_t dir_len; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs", &z_ftp, &dir, &dir_len) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "rs", &z_ftp, &dir, &dir_len) == FAILURE) { return; } - ZEND_FETCH_RESOURCE(ftp, ftpbuf_t*, &z_ftp, -1, le_ftpbuf_name, le_ftpbuf); + ZEND_FETCH_RESOURCE(ftp, ftpbuf_t*, z_ftp, -1, le_ftpbuf_name, le_ftpbuf); /* create directorie */ if (NULL == (tmp = ftp_mkdir(ftp, dir))) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", ftp->inbuf); + php_error_docref(NULL, E_WARNING, "%s", ftp->inbuf); RETURN_FALSE; } - RETURN_STRING(tmp, 0); + RETURN_STR(tmp); } /* }}} */ @@ -579,17 +580,17 @@ PHP_FUNCTION(ftp_rmdir) zval *z_ftp; ftpbuf_t *ftp; char *dir; - int dir_len; + size_t dir_len; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs", &z_ftp, &dir, &dir_len) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "rs", &z_ftp, &dir, &dir_len) == FAILURE) { return; } - ZEND_FETCH_RESOURCE(ftp, ftpbuf_t*, &z_ftp, -1, le_ftpbuf_name, le_ftpbuf); + ZEND_FETCH_RESOURCE(ftp, ftpbuf_t*, z_ftp, -1, le_ftpbuf_name, le_ftpbuf); /* remove directorie */ if (!ftp_rmdir(ftp, dir)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", ftp->inbuf); + php_error_docref(NULL, E_WARNING, "%s", ftp->inbuf); RETURN_FALSE; } @@ -604,17 +605,17 @@ PHP_FUNCTION(ftp_chmod) zval *z_ftp; ftpbuf_t *ftp; char *filename; - int filename_len; - long mode; + size_t filename_len; + zend_long mode; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rlp", &z_ftp, &mode, &filename, &filename_len) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "rlp", &z_ftp, &mode, &filename, &filename_len) == FAILURE) { RETURN_FALSE; } - ZEND_FETCH_RESOURCE(ftp, ftpbuf_t*, &z_ftp, -1, le_ftpbuf_name, le_ftpbuf); + ZEND_FETCH_RESOURCE(ftp, ftpbuf_t*, z_ftp, -1, le_ftpbuf_name, le_ftpbuf); if (!ftp_chmod(ftp, mode, filename, filename_len)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", ftp->inbuf); + php_error_docref(NULL, E_WARNING, "%s", ftp->inbuf); RETURN_FALSE; } @@ -628,19 +629,19 @@ PHP_FUNCTION(ftp_alloc) { zval *z_ftp, *zresponse = NULL; ftpbuf_t *ftp; - long size, ret; - char *response = NULL; + zend_long size, ret; + zend_string *response = NULL; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl|z", &z_ftp, &size, &zresponse) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "rl|z/", &z_ftp, &size, &zresponse) == FAILURE) { RETURN_FALSE; } - ZEND_FETCH_RESOURCE(ftp, ftpbuf_t*, &z_ftp, -1, le_ftpbuf_name, le_ftpbuf); + ZEND_FETCH_RESOURCE(ftp, ftpbuf_t*, z_ftp, -1, le_ftpbuf_name, le_ftpbuf); ret = ftp_alloc(ftp, size, zresponse ? &response : NULL); if (response) { zval_dtor(zresponse); - ZVAL_STRING(zresponse, response, 0); + ZVAL_STR(zresponse, response); } if (!ret) { @@ -658,22 +659,22 @@ PHP_FUNCTION(ftp_nlist) zval *z_ftp; ftpbuf_t *ftp; char **nlist, **ptr, *dir; - int dir_len; + size_t dir_len; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rp", &z_ftp, &dir, &dir_len) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "rp", &z_ftp, &dir, &dir_len) == FAILURE) { return; } - ZEND_FETCH_RESOURCE(ftp, ftpbuf_t*, &z_ftp, -1, le_ftpbuf_name, le_ftpbuf); + ZEND_FETCH_RESOURCE(ftp, ftpbuf_t*, z_ftp, -1, le_ftpbuf_name, le_ftpbuf); /* get list of files */ - if (NULL == (nlist = ftp_nlist(ftp, dir TSRMLS_CC))) { + if (NULL == (nlist = ftp_nlist(ftp, dir))) { RETURN_FALSE; } array_init(return_value); for (ptr = nlist; *ptr; ptr++) { - add_next_index_string(return_value, *ptr, 1); + add_next_index_string(return_value, *ptr); } efree(nlist); } @@ -686,23 +687,23 @@ PHP_FUNCTION(ftp_rawlist) zval *z_ftp; ftpbuf_t *ftp; char **llist, **ptr, *dir; - int dir_len; + size_t dir_len; zend_bool recursive = 0; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs|b", &z_ftp, &dir, &dir_len, &recursive) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "rs|b", &z_ftp, &dir, &dir_len, &recursive) == FAILURE) { return; } - ZEND_FETCH_RESOURCE(ftp, ftpbuf_t*, &z_ftp, -1, le_ftpbuf_name, le_ftpbuf); + ZEND_FETCH_RESOURCE(ftp, ftpbuf_t*, z_ftp, -1, le_ftpbuf_name, le_ftpbuf); /* get raw directory listing */ - if (NULL == (llist = ftp_list(ftp, dir, recursive TSRMLS_CC))) { + if (NULL == (llist = ftp_list(ftp, dir, recursive))) { RETURN_FALSE; } array_init(return_value); for (ptr = llist; *ptr; ptr++) { - add_next_index_string(return_value, *ptr, 1); + add_next_index_string(return_value, *ptr); } efree(llist); } @@ -716,18 +717,18 @@ PHP_FUNCTION(ftp_systype) ftpbuf_t *ftp; const char *syst; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &z_ftp) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "r", &z_ftp) == FAILURE) { return; } - ZEND_FETCH_RESOURCE(ftp, ftpbuf_t*, &z_ftp, -1, le_ftpbuf_name, le_ftpbuf); + ZEND_FETCH_RESOURCE(ftp, ftpbuf_t*, z_ftp, -1, le_ftpbuf_name, le_ftpbuf); if (NULL == (syst = ftp_syst(ftp))) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", ftp->inbuf); + php_error_docref(NULL, E_WARNING, "%s", ftp->inbuf); RETURN_FALSE; } - RETURN_STRING((char*) syst, 1); + RETURN_STRING((char*) syst); } /* }}} */ @@ -740,15 +741,15 @@ PHP_FUNCTION(ftp_fget) ftptype_t xtype; php_stream *stream; char *file; - int file_len; - long mode, resumepos=0; + size_t file_len; + zend_long mode, resumepos=0; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rrsl|l", &z_ftp, &z_file, &file, &file_len, &mode, &resumepos) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "rrsl|l", &z_ftp, &z_file, &file, &file_len, &mode, &resumepos) == FAILURE) { return; } - ZEND_FETCH_RESOURCE(ftp, ftpbuf_t*, &z_ftp, -1, le_ftpbuf_name, le_ftpbuf); - php_stream_from_zval(stream, &z_file); + ZEND_FETCH_RESOURCE(ftp, ftpbuf_t*, z_ftp, -1, le_ftpbuf_name, le_ftpbuf); + php_stream_from_zval(stream, z_file); XTYPE(xtype, mode); /* ignore autoresume if autoseek is switched off */ @@ -766,8 +767,8 @@ PHP_FUNCTION(ftp_fget) } } - if (!ftp_get(ftp, stream, file, xtype, resumepos TSRMLS_CC)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", ftp->inbuf); + if (!ftp_get(ftp, stream, file, xtype, resumepos)) { + php_error_docref(NULL, E_WARNING, "%s", ftp->inbuf); RETURN_FALSE; } @@ -784,15 +785,15 @@ PHP_FUNCTION(ftp_nb_fget) ftptype_t xtype; php_stream *stream; char *file; - int file_len; - long mode, resumepos=0, ret; + size_t file_len; + zend_long mode, resumepos=0, ret; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rrsl|l", &z_ftp, &z_file, &file, &file_len, &mode, &resumepos) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "rrsl|l", &z_ftp, &z_file, &file, &file_len, &mode, &resumepos) == FAILURE) { return; } - ZEND_FETCH_RESOURCE(ftp, ftpbuf_t*, &z_ftp, -1, le_ftpbuf_name, le_ftpbuf); - php_stream_from_zval(stream, &z_file); + ZEND_FETCH_RESOURCE(ftp, ftpbuf_t*, z_ftp, -1, le_ftpbuf_name, le_ftpbuf); + php_stream_from_zval(stream, z_file); XTYPE(xtype, mode); /* ignore autoresume if autoseek is switched off */ @@ -814,8 +815,8 @@ PHP_FUNCTION(ftp_nb_fget) ftp->direction = 0; /* recv */ ftp->closestream = 0; /* do not close */ - if ((ret = ftp_nb_get(ftp, stream, file, xtype, resumepos TSRMLS_CC)) == PHP_FTP_FAILED) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", ftp->inbuf); + if ((ret = ftp_nb_get(ftp, stream, file, xtype, resumepos)) == PHP_FTP_FAILED) { + php_error_docref(NULL, E_WARNING, "%s", ftp->inbuf); RETURN_LONG(ret); } @@ -831,11 +832,11 @@ PHP_FUNCTION(ftp_pasv) ftpbuf_t *ftp; zend_bool pasv; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rb", &z_ftp, &pasv) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "rb", &z_ftp, &pasv) == FAILURE) { return; } - ZEND_FETCH_RESOURCE(ftp, ftpbuf_t*, &z_ftp, -1, le_ftpbuf_name, le_ftpbuf); + ZEND_FETCH_RESOURCE(ftp, ftpbuf_t*, z_ftp, -1, le_ftpbuf_name, le_ftpbuf); if (!ftp_pasv(ftp, pasv ? 1 : 0)) { RETURN_FALSE; @@ -854,14 +855,14 @@ PHP_FUNCTION(ftp_get) ftptype_t xtype; php_stream *outstream; char *local, *remote; - int local_len, remote_len; - long mode, resumepos=0; + size_t local_len, remote_len; + zend_long mode, resumepos=0; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rppl|l", &z_ftp, &local, &local_len, &remote, &remote_len, &mode, &resumepos) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "rppl|l", &z_ftp, &local, &local_len, &remote, &remote_len, &mode, &resumepos) == FAILURE) { return; } - ZEND_FETCH_RESOURCE(ftp, ftpbuf_t*, &z_ftp, -1, le_ftpbuf_name, le_ftpbuf); + ZEND_FETCH_RESOURCE(ftp, ftpbuf_t*, z_ftp, -1, le_ftpbuf_name, le_ftpbuf); XTYPE(xtype, mode); /* ignore autoresume if autoseek is switched off */ @@ -892,14 +893,14 @@ PHP_FUNCTION(ftp_get) } if (outstream == NULL) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Error opening %s", local); + php_error_docref(NULL, E_WARNING, "Error opening %s", local); RETURN_FALSE; } - if (!ftp_get(ftp, outstream, remote, xtype, resumepos TSRMLS_CC)) { + if (!ftp_get(ftp, outstream, remote, xtype, resumepos)) { php_stream_close(outstream); VCWD_UNLINK(local); - php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", ftp->inbuf); + php_error_docref(NULL, E_WARNING, "%s", ftp->inbuf); RETURN_FALSE; } @@ -917,14 +918,15 @@ PHP_FUNCTION(ftp_nb_get) ftptype_t xtype; php_stream *outstream; char *local, *remote; - int local_len, remote_len, ret; - long mode, resumepos=0; + size_t local_len, remote_len; + int ret; + zend_long mode, resumepos=0; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rssl|l", &z_ftp, &local, &local_len, &remote, &remote_len, &mode, &resumepos) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "rssl|l", &z_ftp, &local, &local_len, &remote, &remote_len, &mode, &resumepos) == FAILURE) { return; } - ZEND_FETCH_RESOURCE(ftp, ftpbuf_t*, &z_ftp, -1, le_ftpbuf_name, le_ftpbuf); + ZEND_FETCH_RESOURCE(ftp, ftpbuf_t*, z_ftp, -1, le_ftpbuf_name, le_ftpbuf); XTYPE(xtype, mode); /* ignore autoresume if autoseek is switched off */ @@ -953,7 +955,7 @@ PHP_FUNCTION(ftp_nb_get) } if (outstream == NULL) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Error opening %s", local); + php_error_docref(NULL, E_WARNING, "Error opening %s", local); RETURN_FALSE; } @@ -961,11 +963,11 @@ PHP_FUNCTION(ftp_nb_get) ftp->direction = 0; /* recv */ ftp->closestream = 1; /* do close */ - if ((ret = ftp_nb_get(ftp, outstream, remote, xtype, resumepos TSRMLS_CC)) == PHP_FTP_FAILED) { + if ((ret = ftp_nb_get(ftp, outstream, remote, xtype, resumepos)) == PHP_FTP_FAILED) { php_stream_close(outstream); ftp->stream = NULL; VCWD_UNLINK(local); - php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", ftp->inbuf); + php_error_docref(NULL, E_WARNING, "%s", ftp->inbuf); RETURN_LONG(PHP_FTP_FAILED); } @@ -984,23 +986,23 @@ PHP_FUNCTION(ftp_nb_continue) { zval *z_ftp; ftpbuf_t *ftp; - long ret; + zend_long ret; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &z_ftp) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "r", &z_ftp) == FAILURE) { return; } - ZEND_FETCH_RESOURCE(ftp, ftpbuf_t*, &z_ftp, -1, le_ftpbuf_name, le_ftpbuf); + ZEND_FETCH_RESOURCE(ftp, ftpbuf_t*, z_ftp, -1, le_ftpbuf_name, le_ftpbuf); if (!ftp->nb) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "no nbronous transfer to continue."); + php_error_docref(NULL, E_WARNING, "no nbronous transfer to continue."); RETURN_LONG(PHP_FTP_FAILED); } if (ftp->direction) { - ret=ftp_nb_continue_write(ftp TSRMLS_CC); + ret=ftp_nb_continue_write(ftp); } else { - ret=ftp_nb_continue_read(ftp TSRMLS_CC); + ret=ftp_nb_continue_read(ftp); } if (ret != PHP_FTP_MOREDATA && ftp->closestream) { @@ -1009,7 +1011,7 @@ PHP_FUNCTION(ftp_nb_continue) } if (ret == PHP_FTP_FAILED) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", ftp->inbuf); + php_error_docref(NULL, E_WARNING, "%s", ftp->inbuf); } RETURN_LONG(ret); @@ -1023,17 +1025,17 @@ PHP_FUNCTION(ftp_fput) zval *z_ftp, *z_file; ftpbuf_t *ftp; ftptype_t xtype; - int remote_len; - long mode, startpos=0; + size_t remote_len; + zend_long mode, startpos=0; php_stream *stream; char *remote; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rsrl|l", &z_ftp, &remote, &remote_len, &z_file, &mode, &startpos) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "rsrl|l", &z_ftp, &remote, &remote_len, &z_file, &mode, &startpos) == FAILURE) { return; } - ZEND_FETCH_RESOURCE(ftp, ftpbuf_t*, &z_ftp, -1, le_ftpbuf_name, le_ftpbuf); - php_stream_from_zval(stream, &z_file); + ZEND_FETCH_RESOURCE(ftp, ftpbuf_t*, z_ftp, -1, le_ftpbuf_name, le_ftpbuf); + php_stream_from_zval(stream, z_file); XTYPE(xtype, mode); /* ignore autoresume if autoseek is switched off */ @@ -1054,8 +1056,8 @@ PHP_FUNCTION(ftp_fput) } } - if (!ftp_put(ftp, remote, stream, xtype, startpos TSRMLS_CC)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", ftp->inbuf); + if (!ftp_put(ftp, remote, stream, xtype, startpos)) { + php_error_docref(NULL, E_WARNING, "%s", ftp->inbuf); RETURN_FALSE; } @@ -1070,17 +1072,18 @@ PHP_FUNCTION(ftp_nb_fput) zval *z_ftp, *z_file; ftpbuf_t *ftp; ftptype_t xtype; - int remote_len, ret; - long mode, startpos=0; + size_t remote_len; + int ret; + zend_long mode, startpos=0; php_stream *stream; char *remote; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rsrl|l", &z_ftp, &remote, &remote_len, &z_file, &mode, &startpos) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "rsrl|l", &z_ftp, &remote, &remote_len, &z_file, &mode, &startpos) == FAILURE) { return; } - ZEND_FETCH_RESOURCE(ftp, ftpbuf_t*, &z_ftp, -1, le_ftpbuf_name, le_ftpbuf); - php_stream_from_zval(stream, &z_file); + ZEND_FETCH_RESOURCE(ftp, ftpbuf_t*, z_ftp, -1, le_ftpbuf_name, le_ftpbuf); + php_stream_from_zval(stream, z_file); XTYPE(xtype, mode); /* ignore autoresume if autoseek is switched off */ @@ -1105,8 +1108,8 @@ PHP_FUNCTION(ftp_nb_fput) ftp->direction = 1; /* send */ ftp->closestream = 0; /* do not close */ - if (((ret = ftp_nb_put(ftp, remote, stream, xtype, startpos TSRMLS_CC)) == PHP_FTP_FAILED)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", ftp->inbuf); + if (((ret = ftp_nb_put(ftp, remote, stream, xtype, startpos)) == PHP_FTP_FAILED)) { + php_error_docref(NULL, E_WARNING, "%s", ftp->inbuf); RETURN_LONG(ret); } @@ -1123,15 +1126,15 @@ PHP_FUNCTION(ftp_put) ftpbuf_t *ftp; ftptype_t xtype; char *remote, *local; - long remote_len, local_len; - long mode, startpos=0; + size_t remote_len, local_len; + zend_long mode, startpos=0; php_stream *instream; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rppl|l", &z_ftp, &remote, &remote_len, &local, &local_len, &mode, &startpos) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "rppl|l", &z_ftp, &remote, &remote_len, &local, &local_len, &mode, &startpos) == FAILURE) { return; } - ZEND_FETCH_RESOURCE(ftp, ftpbuf_t*, &z_ftp, -1, le_ftpbuf_name, le_ftpbuf); + ZEND_FETCH_RESOURCE(ftp, ftpbuf_t*, z_ftp, -1, le_ftpbuf_name, le_ftpbuf); XTYPE(xtype, mode); if (!(instream = php_stream_open_wrapper(local, mode == FTPTYPE_ASCII ? "rt" : "rb", REPORT_ERRORS, NULL))) { @@ -1156,9 +1159,9 @@ PHP_FUNCTION(ftp_put) } } - if (!ftp_put(ftp, remote, instream, xtype, startpos TSRMLS_CC)) { + if (!ftp_put(ftp, remote, instream, xtype, startpos)) { php_stream_close(instream); - php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", ftp->inbuf); + php_error_docref(NULL, E_WARNING, "%s", ftp->inbuf); RETURN_FALSE; } php_stream_close(instream); @@ -1176,15 +1179,15 @@ PHP_FUNCTION(ftp_nb_put) ftpbuf_t *ftp; ftptype_t xtype; char *remote, *local; - int remote_len, local_len; - long mode, startpos=0, ret; + size_t remote_len, local_len; + zend_long mode, startpos=0, ret; php_stream *instream; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rppl|l", &z_ftp, &remote, &remote_len, &local, &local_len, &mode, &startpos) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "rppl|l", &z_ftp, &remote, &remote_len, &local, &local_len, &mode, &startpos) == FAILURE) { return; } - ZEND_FETCH_RESOURCE(ftp, ftpbuf_t*, &z_ftp, -1, le_ftpbuf_name, le_ftpbuf); + ZEND_FETCH_RESOURCE(ftp, ftpbuf_t*, z_ftp, -1, le_ftpbuf_name, le_ftpbuf); XTYPE(xtype, mode); if (!(instream = php_stream_open_wrapper(local, mode == FTPTYPE_ASCII ? "rt" : "rb", REPORT_ERRORS, NULL))) { @@ -1213,7 +1216,7 @@ PHP_FUNCTION(ftp_nb_put) ftp->direction = 1; /* send */ ftp->closestream = 1; /* do close */ - ret = ftp_nb_put(ftp, remote, instream, xtype, startpos TSRMLS_CC); + ret = ftp_nb_put(ftp, remote, instream, xtype, startpos); if (ret != PHP_FTP_MOREDATA) { php_stream_close(instream); @@ -1221,7 +1224,7 @@ PHP_FUNCTION(ftp_nb_put) } if (ret == PHP_FTP_FAILED) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", ftp->inbuf); + php_error_docref(NULL, E_WARNING, "%s", ftp->inbuf); } RETURN_LONG(ret); @@ -1235,13 +1238,13 @@ PHP_FUNCTION(ftp_size) zval *z_ftp; ftpbuf_t *ftp; char *file; - int file_len; + size_t file_len; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rp", &z_ftp, &file, &file_len) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "rp", &z_ftp, &file, &file_len) == FAILURE) { return; } - ZEND_FETCH_RESOURCE(ftp, ftpbuf_t*, &z_ftp, -1, le_ftpbuf_name, le_ftpbuf); + ZEND_FETCH_RESOURCE(ftp, ftpbuf_t*, z_ftp, -1, le_ftpbuf_name, le_ftpbuf); /* get file size */ RETURN_LONG(ftp_size(ftp, file)); @@ -1255,13 +1258,13 @@ PHP_FUNCTION(ftp_mdtm) zval *z_ftp; ftpbuf_t *ftp; char *file; - int file_len; + size_t file_len; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rp", &z_ftp, &file, &file_len) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "rp", &z_ftp, &file, &file_len) == FAILURE) { return; } - ZEND_FETCH_RESOURCE(ftp, ftpbuf_t*, &z_ftp, -1, le_ftpbuf_name, le_ftpbuf); + ZEND_FETCH_RESOURCE(ftp, ftpbuf_t*, z_ftp, -1, le_ftpbuf_name, le_ftpbuf); /* get file mod time */ RETURN_LONG(ftp_mdtm(ftp, file)); @@ -1275,17 +1278,17 @@ PHP_FUNCTION(ftp_rename) zval *z_ftp; ftpbuf_t *ftp; char *src, *dest; - int src_len, dest_len; + size_t src_len, dest_len; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rss", &z_ftp, &src, &src_len, &dest, &dest_len) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "rss", &z_ftp, &src, &src_len, &dest, &dest_len) == FAILURE) { return; } - ZEND_FETCH_RESOURCE(ftp, ftpbuf_t*, &z_ftp, -1, le_ftpbuf_name, le_ftpbuf); + ZEND_FETCH_RESOURCE(ftp, ftpbuf_t*, z_ftp, -1, le_ftpbuf_name, le_ftpbuf); /* rename the file */ if (!ftp_rename(ftp, src, dest)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", ftp->inbuf); + php_error_docref(NULL, E_WARNING, "%s", ftp->inbuf); RETURN_FALSE; } @@ -1300,17 +1303,17 @@ PHP_FUNCTION(ftp_delete) zval *z_ftp; ftpbuf_t *ftp; char *file; - int file_len; + size_t file_len; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs", &z_ftp, &file, &file_len) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "rs", &z_ftp, &file, &file_len) == FAILURE) { return; } - ZEND_FETCH_RESOURCE(ftp, ftpbuf_t*, &z_ftp, -1, le_ftpbuf_name, le_ftpbuf); + ZEND_FETCH_RESOURCE(ftp, ftpbuf_t*, z_ftp, -1, le_ftpbuf_name, le_ftpbuf); /* delete the file */ if (!ftp_delete(ftp, file)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", ftp->inbuf); + php_error_docref(NULL, E_WARNING, "%s", ftp->inbuf); RETURN_FALSE; } @@ -1325,17 +1328,17 @@ PHP_FUNCTION(ftp_site) zval *z_ftp; ftpbuf_t *ftp; char *cmd; - int cmd_len; + size_t cmd_len; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs", &z_ftp, &cmd, &cmd_len) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "rs", &z_ftp, &cmd, &cmd_len) == FAILURE) { return; } - ZEND_FETCH_RESOURCE(ftp, ftpbuf_t*, &z_ftp, -1, le_ftpbuf_name, le_ftpbuf); + ZEND_FETCH_RESOURCE(ftp, ftpbuf_t*, z_ftp, -1, le_ftpbuf_name, le_ftpbuf); /* send the site command */ if (!ftp_site(ftp, cmd)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", ftp->inbuf); + php_error_docref(NULL, E_WARNING, "%s", ftp->inbuf); RETURN_FALSE; } @@ -1350,15 +1353,15 @@ PHP_FUNCTION(ftp_close) zval *z_ftp; ftpbuf_t *ftp; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &z_ftp) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "r", &z_ftp) == FAILURE) { return; } - ZEND_FETCH_RESOURCE(ftp, ftpbuf_t*, &z_ftp, -1, le_ftpbuf_name, le_ftpbuf); + ZEND_FETCH_RESOURCE(ftp, ftpbuf_t*, z_ftp, -1, le_ftpbuf_name, le_ftpbuf); ftp_quit(ftp); - RETURN_BOOL(zend_list_delete(Z_LVAL_P(z_ftp)) == SUCCESS); + RETURN_BOOL(zend_list_close(Z_RES_P(z_ftp)) == SUCCESS); } /* }}} */ @@ -1367,40 +1370,40 @@ PHP_FUNCTION(ftp_close) PHP_FUNCTION(ftp_set_option) { zval *z_ftp, *z_value; - long option; + zend_long option; ftpbuf_t *ftp; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rlz", &z_ftp, &option, &z_value) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "rlz", &z_ftp, &option, &z_value) == FAILURE) { return; } - ZEND_FETCH_RESOURCE(ftp, ftpbuf_t*, &z_ftp, -1, le_ftpbuf_name, le_ftpbuf); + ZEND_FETCH_RESOURCE(ftp, ftpbuf_t*, z_ftp, -1, le_ftpbuf_name, le_ftpbuf); switch (option) { case PHP_FTP_OPT_TIMEOUT_SEC: if (Z_TYPE_P(z_value) != IS_LONG) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Option TIMEOUT_SEC expects value of type long, %s given", + php_error_docref(NULL, E_WARNING, "Option TIMEOUT_SEC expects value of type long, %s given", zend_zval_type_name(z_value)); RETURN_FALSE; } if (Z_LVAL_P(z_value) <= 0) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Timeout has to be greater than 0"); + php_error_docref(NULL, E_WARNING, "Timeout has to be greater than 0"); RETURN_FALSE; } ftp->timeout_sec = Z_LVAL_P(z_value); RETURN_TRUE; break; case PHP_FTP_OPT_AUTOSEEK: - if (Z_TYPE_P(z_value) != IS_BOOL) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Option AUTOSEEK expects value of type boolean, %s given", + if (Z_TYPE_P(z_value) != IS_TRUE && Z_TYPE_P(z_value) != IS_FALSE) { + php_error_docref(NULL, E_WARNING, "Option AUTOSEEK expects value of type boolean, %s given", zend_zval_type_name(z_value)); RETURN_FALSE; } - ftp->autoseek = Z_LVAL_P(z_value); + ftp->autoseek = Z_TYPE_P(z_value) == IS_TRUE ? 1 : 0; RETURN_TRUE; break; default: - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown option '%ld'", option); + php_error_docref(NULL, E_WARNING, "Unknown option '%pd'", option); RETURN_FALSE; break; } @@ -1412,14 +1415,14 @@ PHP_FUNCTION(ftp_set_option) PHP_FUNCTION(ftp_get_option) { zval *z_ftp; - long option; + zend_long option; ftpbuf_t *ftp; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl", &z_ftp, &option) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "rl", &z_ftp, &option) == FAILURE) { return; } - ZEND_FETCH_RESOURCE(ftp, ftpbuf_t*, &z_ftp, -1, le_ftpbuf_name, le_ftpbuf); + ZEND_FETCH_RESOURCE(ftp, ftpbuf_t*, z_ftp, -1, le_ftpbuf_name, le_ftpbuf); switch (option) { case PHP_FTP_OPT_TIMEOUT_SEC: @@ -1429,7 +1432,7 @@ PHP_FUNCTION(ftp_get_option) RETURN_BOOL(ftp->autoseek); break; default: - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown option '%ld'", option); + php_error_docref(NULL, E_WARNING, "Unknown option '%pd'", option); RETURN_FALSE; break; } |