|
|
|
|
@ -1,25 +1,22 @@
|
|
|
|
|
Index: configure
|
|
|
|
|
--- configure.orig 2009-09-10 18:10:26 +0200
|
|
|
|
|
+++ configure 2009-09-11 21:54:51 +0200
|
|
|
|
|
@@ -4291,13 +4291,7 @@
|
|
|
|
|
if $ac_preproc_ok; then
|
|
|
|
|
:
|
|
|
|
|
--- configure.orig 2010-11-04 18:28:14.000000000 +0100
|
|
|
|
|
+++ configure 2010-11-05 22:46:47.000000000 +0100
|
|
|
|
|
@@ -4087,10 +4087,7 @@
|
|
|
|
|
if $ac_preproc_ok; then :
|
|
|
|
|
|
|
|
|
|
else
|
|
|
|
|
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
|
|
|
|
|
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
|
|
|
|
|
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
|
|
|
|
-{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
|
|
|
|
|
-See \`config.log' for more details." >&5
|
|
|
|
|
-$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
|
|
|
|
|
-See \`config.log' for more details." >&2;}
|
|
|
|
|
- { (exit 1); exit 1; }; }; }
|
|
|
|
|
+ :
|
|
|
|
|
-as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
|
|
|
|
|
-See \`config.log' for more details" "$LINENO" 5; }
|
|
|
|
|
+ :
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
ac_ext=c
|
|
|
|
|
Index: nanoftp.c
|
|
|
|
|
--- nanoftp.c.orig 2009-08-07 16:16:23 +0200
|
|
|
|
|
+++ nanoftp.c 2009-09-11 21:54:26 +0200
|
|
|
|
|
@@ -1381,7 +1381,7 @@
|
|
|
|
|
--- nanoftp.c.orig 2010-11-04 11:36:31.000000000 +0100
|
|
|
|
|
+++ nanoftp.c 2010-11-05 22:40:32.000000000 +0100
|
|
|
|
|
@@ -1382,7 +1382,7 @@
|
|
|
|
|
|
|
|
|
|
memset (&dataAddr, 0, sizeof(dataAddr));
|
|
|
|
|
#ifdef SUPPORT_IP6
|
|
|
|
|
@ -28,7 +25,7 @@ Index: nanoftp.c
|
|
|
|
|
ctxt->dataFd = socket (AF_INET6, SOCK_STREAM, IPPROTO_TCP);
|
|
|
|
|
((struct sockaddr_in6 *)&dataAddr)->sin6_family = AF_INET6;
|
|
|
|
|
dataAddrLen = sizeof(struct sockaddr_in6);
|
|
|
|
|
@@ -1400,7 +1400,7 @@
|
|
|
|
|
@@ -1401,7 +1401,7 @@
|
|
|
|
|
|
|
|
|
|
if (ctxt->passive) {
|
|
|
|
|
#ifdef SUPPORT_IP6
|
|
|
|
|
@ -37,7 +34,7 @@ Index: nanoftp.c
|
|
|
|
|
snprintf (buf, sizeof(buf), "EPSV\r\n");
|
|
|
|
|
else
|
|
|
|
|
#endif
|
|
|
|
|
@@ -1431,7 +1431,7 @@
|
|
|
|
|
@@ -1432,7 +1432,7 @@
|
|
|
|
|
cur = &ctxt->controlBuf[ctxt->controlBufAnswer];
|
|
|
|
|
while (((*cur < '0') || (*cur > '9')) && *cur != '\0') cur++;
|
|
|
|
|
#ifdef SUPPORT_IP6
|
|
|
|
|
@ -46,7 +43,7 @@ Index: nanoftp.c
|
|
|
|
|
if (sscanf (cur, "%u", &temp[0]) != 1) {
|
|
|
|
|
__xmlIOErr(XML_FROM_FTP, XML_FTP_EPSV_ANSWER,
|
|
|
|
|
"Invalid answer to EPSV\n");
|
|
|
|
|
@@ -1468,7 +1468,7 @@
|
|
|
|
|
@@ -1469,7 +1469,7 @@
|
|
|
|
|
} else {
|
|
|
|
|
getsockname(ctxt->dataFd, (struct sockaddr *) &dataAddr, &dataAddrLen);
|
|
|
|
|
#ifdef SUPPORT_IP6
|
|
|
|
|
@ -55,8 +52,8 @@ Index: nanoftp.c
|
|
|
|
|
((struct sockaddr_in6 *)&dataAddr)->sin6_port = 0;
|
|
|
|
|
else
|
|
|
|
|
#endif
|
|
|
|
|
@@ -1487,7 +1487,7 @@
|
|
|
|
|
return (-1);
|
|
|
|
|
@@ -1488,7 +1488,7 @@
|
|
|
|
|
return INVALID_SOCKET;
|
|
|
|
|
}
|
|
|
|
|
#ifdef SUPPORT_IP6
|
|
|
|
|
- if ((ctxt->ftpAddr).ss_family == AF_INET6) {
|
|
|
|
|
|
