[PHP-CVS] cvs: php4(PHP_4_3) /ext/ftp ftp.c

[Jani Taskinen]

sniper          Tue Mar 18 12:31:55 2003 EDT

  Modified files:              (Branch: PHP_4_3)
    /php4/ext/ftp       ftp.c 
  Log:
  MFH: fix for bug #22765
  
Index: php4/ext/ftp/ftp.c
diff -u php4/ext/ftp/ftp.c:1.68.2.5 php4/ext/ftp/ftp.c:1.68.2.6
--- php4/ext/ftp/ftp.c:1.68.2.5 Thu Feb 13 17:18:20 2003
+++ php4/ext/ftp/ftp.c  Tue Mar 18 12:31:55 2003
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: ftp.c,v 1.68.2.5 2003/02/13 22:18:20 pollita Exp $ */
+/* $Id: ftp.c,v 1.68.2.6 2003/03/18 17:31:55 sniper Exp $ */
 
 #include "php.h"
 
@@ -79,8 +79,7 @@
 /* wrapper around send/recv to handle timeouts */
 static int             my_send(ftpbuf_t *ftp, int s, void *buf, size_t len);
 static int             my_recv(ftpbuf_t *ftp, int s, void *buf, size_t len);
-static int             my_accept(ftpbuf_t *ftp, int s, struct sockaddr *addr,
-                               int *addrlen);
+static int             my_accept(ftpbuf_t *ftp, int s, struct sockaddr *addr, 
socklen_t *addrlen);
 
 /* reads a line the socket , returns true on success, false on error */
 static int             ftp_readline(ftpbuf_t *ftp);
@@ -116,7 +115,7 @@
 ftp_open(const char *host, short port, long timeout_sec TSRMLS_DC)
 {
        ftpbuf_t                *ftp;
-       int                     size;
+       socklen_t                size;
        struct timeval tv;
 
 
@@ -137,7 +136,7 @@
 
        size = sizeof(ftp->localaddr);
        memset(&ftp->localaddr, 0, size);
-       if (getsockname(ftp->fd, (struct sockaddr*) &ftp->localaddr, (unsigned 
int*)&size) == -1) {
+       if (getsockname(ftp->fd, (struct sockaddr*) &ftp->localaddr, &size) == -1) {
                php_error_docref(NULL TSRMLS_CC, E_WARNING, "getsockname failed: %s 
(%d)\n", strerror(errno), errno);
                goto bail;
        }
@@ -560,7 +559,7 @@
        char                    *ptr;
        union ipbox             ipbox;
        unsigned long           b[6];
-       int                     n;
+       socklen_t                       n;
        struct sockaddr *sa;
        struct sockaddr_in *sin;
 
@@ -1203,7 +1202,7 @@
 /* {{{ my_accept
  */
 int
-my_accept(ftpbuf_t *ftp, int s, struct sockaddr *addr, int *addrlen)
+my_accept(ftpbuf_t *ftp, int s, struct sockaddr *addr, socklen_t *addrlen)
 {
        fd_set          accept_set;
        struct timeval  tv;
@@ -1223,7 +1222,7 @@
                return -1;
        }
 
-       return accept(s, addr, (unsigned int*)addrlen);
+       return accept(s, addr, addrlen);
 }
 /* }}} */
 
@@ -1236,7 +1235,7 @@
        databuf_t               *data;
        php_sockaddr_storage addr;
        struct sockaddr *sa;
-       int                     size;
+       socklen_t               size;
        union ipbox             ipbox;
        char                    arg[sizeof("255, 255, 255, 255, 255, 255")];
        struct timeval  tv;
@@ -1292,7 +1291,7 @@
                goto bail;
        }
 
-       if (getsockname(fd, (struct sockaddr*) &addr, (unsigned int*)&size) == -1) {
+       if (getsockname(fd, (struct sockaddr*) &addr, &size) == -1) {
                php_error_docref(NULL TSRMLS_CC, E_WARNING, "getsockname() failed: %s 
(%d)\n", strerror(errno), errno);
                goto bail;
        }
@@ -1352,7 +1351,7 @@
 data_accept(databuf_t *data, ftpbuf_t *ftp)
 {
        php_sockaddr_storage addr;
-       int                     size;
+       socklen_t                       size;
 
 #if HAVE_OPENSSL_EXT
        SSL_CTX         *ctx;



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php