diff -ur php-3.0.15/functions/ftp.c /fdos/tmp/functions/ftp.c --- php-3.0.15/functions/ftp.c Tue Feb 22 21:51:05 2000 +++ /fdos/tmp/functions/ftp.c Wed Apr 12 12:07:23 2000 @@ -25,6 +25,7 @@ +----------------------------------------------------------------------+ | Authors: | | Andrew Skalski | + | WIN32 fix Luca Montecchiani | +----------------------------------------------------------------------+ */ @@ -37,9 +38,7 @@ #include #include #include -#ifdef WIN32 -#include "win32/unistd.h" -#else +#ifndef WIN32 #include #endif #include @@ -160,7 +159,7 @@ bail: if (fd != -1) - close(fd); + REALCLOSE(fd); free(ftp); return NULL; } @@ -172,7 +171,7 @@ if (ftp == NULL) return NULL; if (ftp->fd != -1) - close(ftp->fd); + REALCLOSE(ftp->fd); ftp_gc(ftp); free(ftp); return NULL; @@ -997,7 +996,7 @@ sizeof(ftp->pasvaddr)) == -1) { perror("connect"); - close(fd); + REALCLOSE(fd); free(data); return NULL; } @@ -1050,7 +1049,7 @@ bail: if (fd != -1) - close(fd); + REALCLOSE(fd); free(data); return NULL; } @@ -1067,7 +1066,7 @@ size = sizeof(addr); data->fd = my_accept(data->listener, (struct sockaddr*) &addr, &size); - close(data->listener); + REALCLOSE(data->listener); data->listener = -1; if (data->fd == -1) { @@ -1085,9 +1084,9 @@ if (data == NULL) return NULL; if (data->listener != -1) - close(data->listener); + REALCLOSE(data->listener); if (data->fd != -1) - close(data->fd); + REALCLOSE(data->fd); free(data); return NULL; } diff -ur php-3.0.15/functions/ftp.h /fdos/tmp/functions/ftp.h --- php-3.0.15/functions/ftp.h Tue Feb 22 21:51:05 2000 +++ /fdos/tmp/functions/ftp.h Wed Apr 12 12:06:47 2000 @@ -36,8 +36,9 @@ #include #ifdef WIN32 #include -#include "win32/include/portability.h" +#define REALCLOSE(x) closesocket(x) #else +#define REALCLOSE(x) close(x) #include #include #endif diff -ur php-3.0.15/functions/php_ftp.c /fdos/tmp/functions/php_ftp.c --- php-3.0.15/functions/php_ftp.c Tue Feb 22 21:51:05 2000 +++ /fdos/tmp/functions/php_ftp.c Wed Apr 12 12:09:59 2000 @@ -572,7 +572,11 @@ RETURN_FALSE; } +#ifdef WIN32 + if ((outfp = fopen(arg2->value.str.val, "wb")) == NULL) { +#else if ((outfp = fopen(arg2->value.str.val, "w")) == NULL) { +#endif fclose(tmpfp); php_error(E_WARNING, "error opening %s", arg2->value.str.val); RETURN_FALSE; @@ -656,11 +660,15 @@ convert_to_string(arg3); XTYPE(xtype, arg4); +#ifdef WIN32 + if ((infp = fopen(arg3->value.str.val, "rb")) == NULL) { +#else if ((infp = fopen(arg3->value.str.val, "r")) == NULL) { +#endif php_error(E_WARNING, "error opening %s", arg3->value.str.val); RETURN_FALSE; }