cvs: php4 /ext/standard ftp_fopen_wrapper.c

pollita Fri Apr 25 21:55:31 2003 EDT Modified files: /php4/ext/standard ftp_fopen_wrapper.c Log: Take STREAMS_CC/STREAMS_DC declarations out of do_connect/do_pasv where they don't need to be. Add minimalist url_stat method to ftp:// wrapper which can at least determine filesize. Other properties set to 0 since the FTP protocol simply doesn't support exploring them. url_stat won't actually work however until ext/standard/filestat.c is patched to allow stat wrappers. Index: php4/ext/standard/ftp_fopen_wrapper.c diff -u php4/ext/standard/ftp_fopen_wrapper.c:1.51 php4/ext/standard/ftp_fopen_wrapper.c:1.52 --- php4/ext/standard/ftp_fopen_wrapper.c:1.51 Thu Apr 24 18:25:33 2003 +++ php4/ext/standard/ftp_fopen_wrapper.c Fri Apr 25 21:55:31 2003 @@ -17,7 +17,7 @@ | Hartmut Holzgraefe <hholzgra@php.net> | +----------------------------------------------------------------------+ */ -/* $Id: ftp_fopen_wrapper.c,v 1.51 2003/04/24 22:25:33 pollita Exp $ */ +/* $Id: ftp_fopen_wrapper.c,v 1.52 2003/04/26 01:55:31 pollita Exp $ */ #include "php.h" #include "php_globals.h" @@ -116,8 +116,7 @@ /* {{{ php_ftp_fopen_connect */ static php_stream *php_ftp_fopen_connect(php_stream_wrapper *wrapper, char *path, char *mode, int options, char **opened_path, php_stream_context *context, - php_stream **preuseid, php_url **presource, int *puse_ssl, int *puse_ssl_on_data - STREAMS_DC TSRMLS_DC) + php_stream **preuseid, php_url **presource, int *puse_ssl, int *puse_ssl_on_data TSRMLS_DC) { php_stream *stream = NULL, *reuseid = NULL; php_url *resource = NULL; @@ -281,7 +280,7 @@ /* {{{ php_fopen_do_pasv */ -static unsigned short php_fopen_do_pasv(php_stream *stream, char *ip, int ip_size, char **phoststart STREAMS_DC TSRMLS_DC) +static unsigned short php_fopen_do_pasv(php_stream *stream, char *ip, int ip_size, char **phoststart TSRMLS_DC) { char tmp_line[512]; int result, i; @@ -406,7 +405,7 @@ return NULL; } - stream = php_ftp_fopen_connect(wrapper, path, mode, options, opened_path, context, &reuseid, &resource, &use_ssl, &use_ssl_on_data STREAMS_CC TSRMLS_CC); + stream = php_ftp_fopen_connect(wrapper, path, mode, options, opened_path, context, &reuseid, &resource, &use_ssl, &use_ssl_on_data TSRMLS_CC); if (!stream) { goto errexit; } @@ -464,7 +463,7 @@ } /* set up the passive connection */ - portno = php_fopen_do_pasv(stream, ip, sizeof(ip), &hoststart STREAMS_CC TSRMLS_CC); + portno = php_fopen_do_pasv(stream, ip, sizeof(ip), &hoststart TSRMLS_CC); if (!portno) { goto errexit; @@ -622,7 +621,7 @@ char ip[sizeof("123.123.123.123")]; unsigned short portno; - stream = php_ftp_fopen_connect(wrapper, path, mode, options, opened_path, context, &reuseid, &resource, &use_ssl, &use_ssl_on_data STREAMS_CC TSRMLS_CC); + stream = php_ftp_fopen_connect(wrapper, path, mode, options, opened_path, context, &reuseid, &resource, &use_ssl, &use_ssl_on_data TSRMLS_CC); /* set the connection to be ascii */ php_stream_write_string(stream, "TYPE A\r\n"); @@ -631,7 +630,7 @@ goto opendir_errexit; /* set up the passive connection */ - portno = php_fopen_do_pasv(stream, ip, sizeof(ip), &hoststart STREAMS_CC TSRMLS_CC); + portno = php_fopen_do_pasv(stream, ip, sizeof(ip), &hoststart TSRMLS_CC); if (!portno) { goto opendir_errexit; @@ -701,11 +700,56 @@ } /* }}} */ +/* {{{ php_stream_ftp_url_stat + */ +static int php_stream_ftp_url_stat(php_stream_wrapper *wrapper, char *url, php_stream_statbuf *ssb TSRMLS_DC) +{ + php_stream *stream = NULL; + php_url *resource; + int result; + char tmp_line[512]; + + /* If ssb is NULL then someone is misbehaving */ + if (!ssb) return -1; + memset(ssb, 0, sizeof(php_stream_statbuf)); + + stream = php_ftp_fopen_connect(wrapper, url, "r", 0, NULL, NULL, NULL, &resource, NULL, NULL TSRMLS_CC); + if (!stream) { + goto stat_errexit; + } + + /* Size is the only reliable attribute returned by FTP */ + php_stream_write_string(stream, "SIZE "); + if (resource->path != NULL) { + php_stream_write_string(stream, resource->path); + } else { + php_stream_write_string(stream, "/"); + } + php_stream_write_string(stream, "\r\n"); + + result = GET_FTP_RESULT(stream); + if (result < 200 || result > 299) { + goto stat_errexit; + } + + sscanf(tmp_line + 4, "%d", &(ssb->sb.st_size)); + + php_stream_close(stream); + return 0; + + stat_errexit: + if (stream) { + php_stream_close(stream); + } + return -1; +} +/* }}} */ + static php_stream_wrapper_ops ftp_stream_wops = { php_stream_url_wrap_ftp, php_stream_ftp_stream_close, /* stream_close */ php_stream_ftp_stream_stat, - NULL, /* stat_url */ + php_stream_ftp_url_stat, /* stat_url */ php_stream_ftp_opendir, /* opendir */ "FTP" };