diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 61480825..7e1e4a2b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,7 @@ .test: image: registry.gitlab.gnome.org/gnome/libxml2 variables: - BASE_CONFIG: "--with-ftp --with-legacy --with-xptr-locs" + BASE_CONFIG: "--with-legacy --with-xptr-locs" before_script: - rm -rf libxml2-build - mkdir libxml2-build @@ -72,7 +72,7 @@ clang:msan: tags: - win32-ps variables: - BASE_CONFIG: "--with-ftp --with-legacy --with-xptr-locs" + BASE_CONFIG: "--with-legacy --with-xptr-locs" # Disabled for now, see #658 CONFIG: "--without-python" CHERE_INVOKING: "yes" diff --git a/CMakeLists.txt b/CMakeLists.txt index 723e2344..5dd13b5b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -29,7 +29,6 @@ option(LIBXML2_WITH_C14N "Add the Canonicalization support" ON) option(LIBXML2_WITH_CATALOG "Add the Catalog support" ON) option(LIBXML2_WITH_DEBUG "Add the debugging module" ON) set(LIBXML2_WITH_EXPR ON) -option(LIBXML2_WITH_FTP "Add the FTP support" OFF) option(LIBXML2_WITH_HTML "Add the HTML support" ON) option(LIBXML2_WITH_HTTP "Add the HTTP support" OFF) option(LIBXML2_WITH_ICONV "Add ICONV support" ON) @@ -72,7 +71,7 @@ if(LIBXML2_WITH_PYTHON) CACHE PATH "Python bindings install directory") endif() -foreach(VARIABLE IN ITEMS WITH_AUTOMATA WITH_C14N WITH_CATALOG WITH_DEBUG WITH_EXPR WITH_FTP WITH_HTML WITH_HTTP WITH_ICONV WITH_ICU WITH_ISO8859X WITH_LEGACY WITH_LZMA WITH_MODULES WITH_OUTPUT WITH_PATTERN WITH_PUSH WITH_READER WITH_REGEXPS WITH_SAX1 WITH_SCHEMAS WITH_SCHEMATRON WITH_THREADS WITH_THREAD_ALLOC WITH_TREE WITH_UNICODE WITH_VALID WITH_WRITER WITH_XINCLUDE WITH_XPATH WITH_XPTR WITH_XPTR_LOCS WITH_ZLIB) +foreach(VARIABLE IN ITEMS WITH_AUTOMATA WITH_C14N WITH_CATALOG WITH_DEBUG WITH_EXPR WITH_HTML WITH_HTTP WITH_ICONV WITH_ICU WITH_ISO8859X WITH_LEGACY WITH_LZMA WITH_MODULES WITH_OUTPUT WITH_PATTERN WITH_PUSH WITH_READER WITH_REGEXPS WITH_SAX1 WITH_SCHEMAS WITH_SCHEMATRON WITH_THREADS WITH_THREAD_ALLOC WITH_TREE WITH_UNICODE WITH_VALID WITH_WRITER WITH_XINCLUDE WITH_XPATH WITH_XPTR WITH_XPTR_LOCS WITH_ZLIB) if(LIBXML2_${VARIABLE}) set(${VARIABLE} 1) else() @@ -274,7 +273,6 @@ set( HTMLtree.c legacy.c list.c - nanoftp.c nanohttp.c parser.c parserInternals.c diff --git a/Makefile.am b/Makefile.am index 4cb9a5cc..8f49bf3d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -55,9 +55,6 @@ endif if WITH_DEBUG_SOURCES libxml2_la_SOURCES += debugXML.c endif -if WITH_FTP_SOURCES -libxml2_la_SOURCES += nanoftp.c -endif if WITH_HTML_SOURCES libxml2_la_SOURCES += HTMLparser.c HTMLtree.c endif diff --git a/configure.ac b/configure.ac index e1e96432..33845a98 100644 --- a/configure.ac +++ b/configure.ac @@ -69,8 +69,6 @@ AC_ARG_WITH(catalog, [ --with-catalog XML Catalogs support (on)]) AC_ARG_WITH(debug, [ --with-debug debugging module and shell (on)]) -AC_ARG_WITH(ftp, -[ --with-ftp FTP support (off)]) AC_ARG_WITH(history, [ --with-history history support for shell (off)]) AC_ARG_WITH(readline, @@ -320,7 +318,7 @@ AH_VERBATIM([HAVE_MUNMAP_AFTER],[/* mmap() is no good without munmap() */ dnl dnl Checks for inet libraries dnl -if test "$with_http" = "yes" || test "$with_ftp" = "yes"; then +if test "$with_http" = "yes"; then AC_CHECK_HEADERS([sys/socket.h netinet/in.h arpa/inet.h netdb.h]) AC_CHECK_HEADERS([sys/select.h poll.h]) @@ -519,15 +517,6 @@ else fi AC_SUBST(WITH_TREE) -if test "$with_ftp" != "yes" ; then - WITH_FTP=0 -else - echo Enabling FTP support - WITH_FTP=1 -fi -AC_SUBST(WITH_FTP) -AM_CONDITIONAL(WITH_FTP_SOURCES, test "$WITH_FTP" = "1") - if test "$with_http" != "yes" ; then WITH_HTTP=0 else diff --git a/gentest.py b/gentest.py index 82e9487b..3e5ba159 100755 --- a/gentest.py +++ b/gentest.py @@ -20,7 +20,7 @@ else: # Modules we want to skip in API test # skipped_modules = [ "SAX", "xlink", "threads", "globals", - "xmlmemory", "xmlversion", "xmlexports", + "xmlmemory", "xmlversion", "xmlexports", "nanoftp", ] # @@ -104,8 +104,8 @@ skipped_functions = [ "xmlReaderNewFd", "xmlReaderForFd", "xmlIORead", "xmlReadIO", "xmlCtxtReadIO", "htmlIORead", "htmlReadIO", "htmlCtxtReadIO", -"xmlReaderNewIO", "xmlBufferDump", "xmlNanoFTPConnect", -"xmlNanoFTPConnectTo", "xmlNanoHTTPMethod", "xmlNanoHTTPMethodRedir", +"xmlReaderNewIO", "xmlBufferDump", +"xmlNanoHTTPMethod", "xmlNanoHTTPMethodRedir", # Complex I/O APIs "xmlCreateIOParserCtxt", "xmlParserInputBufferCreateIO", "xmlRegisterInputCallbacks", "xmlReaderForIO", @@ -122,7 +122,7 @@ skipped_functions = [ "xmlTextReaderReadInnerXml", "xmlTextReaderReadOuterXml", "xmlTextReaderReadString", # destructor -"xmlListDelete", "xmlOutputBufferClose", "xmlNanoFTPClose", "xmlNanoHTTPClose", +"xmlListDelete", "xmlOutputBufferClose", "xmlNanoHTTPClose", # deprecated "xmlCatalogGetPublic", "xmlCatalogGetSystem", "xmlEncodeEntities", "xmlNewGlobalNs", "xmlHandleEntity", "xmlNamespaceParseNCName", @@ -169,7 +169,7 @@ skipped_functions = [ # and hence generate errors on memory allocation tests # skipped_memcheck = [ "xmlLoadCatalog", "xmlAddEncodingAlias", - "xmlSchemaInitTypes", "xmlNanoFTPProxy", "xmlNanoFTPScanProxy", + "xmlSchemaInitTypes", "xmlNanoHTTPScanProxy", "xmlResetLastError", "xmlCatalogConvert", "xmlCatalogRemove", "xmlLoadCatalogs", "xmlCleanupCharEncodingHandlers", "xmlInitCharEncodingHandlers", "xmlCatalogCleanup", @@ -346,12 +346,6 @@ def type_convert(str, name, info, module, function, pos): return('fileoutput') return('filepath') if res == 'void_ptr': - if module == 'nanoftp' and name == 'ctx': - return('xmlNanoFTPCtxtPtr') - if function == 'xmlNanoFTPNewCtxt' or \ - function == 'xmlNanoFTPConnectTo' or \ - function == 'xmlNanoFTPOpen': - return('xmlNanoFTPCtxtPtr') if module == 'nanohttp' and name == 'ctx': return('xmlNanoHTTPCtxtPtr') if function == 'xmlNanoHTTPMethod' or \ diff --git a/include/libxml/meson.build b/include/libxml/meson.build index 2b2cfb78..4b497c5f 100644 --- a/include/libxml/meson.build +++ b/include/libxml/meson.build @@ -7,7 +7,6 @@ xmlversion_h.set('LIBXML_VERSION_EXTRA', v_extra) xmlversion_h.set10('WITH_C14N', want_c14n) xmlversion_h.set10('WITH_CATALOG', want_catalog) xmlversion_h.set10('WITH_DEBUG', want_debug) -xmlversion_h.set10('WITH_FTP', want_ftp) xmlversion_h.set10('WITH_HTML', want_html) xmlversion_h.set10('WITH_HTTP', want_http) xmlversion_h.set10('WITH_ICONV', iconv_dep.found()) diff --git a/include/libxml/nanoftp.h b/include/libxml/nanoftp.h index ed3ac4f1..647a9b0a 100644 --- a/include/libxml/nanoftp.h +++ b/include/libxml/nanoftp.h @@ -1,8 +1,5 @@ /* - * Summary: minimal FTP implementation - * Description: minimal FTP implementation allowing to fetch resources - * like external subset. This module is DEPRECATED, do not - * use any of its functions. + * Summary: Removed legacy symbols for an outdated FTP client * * Copy: See Copyright for the status of this software. * @@ -11,176 +8,4 @@ #ifndef __NANO_FTP_H__ #define __NANO_FTP_H__ - -#include - -#if defined(LIBXML_FTP_ENABLED) - -/* Needed for portability to Windows 64 bits */ -#if defined(_WIN32) -#include -#else -/** - * SOCKET: - * - * macro used to provide portability of code to windows sockets - */ -#define SOCKET int -/** - * INVALID_SOCKET: - * - * macro used to provide portability of code to windows sockets - * the value to be used when the socket is not valid - */ -#undef INVALID_SOCKET -#define INVALID_SOCKET (-1) -#endif - -#ifdef __cplusplus -extern "C" { -#endif - -/** - * ftpListCallback: - * @userData: user provided data for the callback - * @filename: the file name (including "->" when links are shown) - * @attrib: the attribute string - * @owner: the owner string - * @group: the group string - * @size: the file size - * @links: the link count - * @year: the year - * @month: the month - * @day: the day - * @hour: the hour - * @minute: the minute - * - * A callback for the xmlNanoFTPList command. - * Note that only one of year and day:minute are specified. - */ -typedef void (*ftpListCallback) (void *userData, - const char *filename, const char *attrib, - const char *owner, const char *group, - unsigned long size, int links, int year, - const char *month, int day, int hour, - int minute); -/** - * ftpDataCallback: - * @userData: the user provided context - * @data: the data received - * @len: its size in bytes - * - * A callback for the xmlNanoFTPGet command. - */ -typedef void (*ftpDataCallback) (void *userData, - const char *data, - int len); - -/* - * Init - */ -XML_DEPRECATED -XMLPUBFUN void - xmlNanoFTPInit (void); -XML_DEPRECATED -XMLPUBFUN void - xmlNanoFTPCleanup (void); - -/* - * Creating/freeing contexts. - */ -XML_DEPRECATED -XMLPUBFUN void * - xmlNanoFTPNewCtxt (const char *URL); -XML_DEPRECATED -XMLPUBFUN void - xmlNanoFTPFreeCtxt (void * ctx); -XML_DEPRECATED -XMLPUBFUN void * - xmlNanoFTPConnectTo (const char *server, - int port); -/* - * Opening/closing session connections. - */ -XML_DEPRECATED -XMLPUBFUN void * - xmlNanoFTPOpen (const char *URL); -XML_DEPRECATED -XMLPUBFUN int - xmlNanoFTPConnect (void *ctx); -XML_DEPRECATED -XMLPUBFUN int - xmlNanoFTPClose (void *ctx); -XML_DEPRECATED -XMLPUBFUN int - xmlNanoFTPQuit (void *ctx); -XML_DEPRECATED -XMLPUBFUN void - xmlNanoFTPScanProxy (const char *URL); -XML_DEPRECATED -XMLPUBFUN void - xmlNanoFTPProxy (const char *host, - int port, - const char *user, - const char *passwd, - int type); -XML_DEPRECATED -XMLPUBFUN int - xmlNanoFTPUpdateURL (void *ctx, - const char *URL); - -/* - * Rather internal commands. - */ -XML_DEPRECATED -XMLPUBFUN int - xmlNanoFTPGetResponse (void *ctx); -XML_DEPRECATED -XMLPUBFUN int - xmlNanoFTPCheckResponse (void *ctx); - -/* - * CD/DIR/GET handlers. - */ -XML_DEPRECATED -XMLPUBFUN int - xmlNanoFTPCwd (void *ctx, - const char *directory); -XML_DEPRECATED -XMLPUBFUN int - xmlNanoFTPDele (void *ctx, - const char *file); - -XML_DEPRECATED -XMLPUBFUN SOCKET - xmlNanoFTPGetConnection (void *ctx); -XML_DEPRECATED -XMLPUBFUN int - xmlNanoFTPCloseConnection(void *ctx); -XML_DEPRECATED -XMLPUBFUN int - xmlNanoFTPList (void *ctx, - ftpListCallback callback, - void *userData, - const char *filename); -XML_DEPRECATED -XMLPUBFUN SOCKET - xmlNanoFTPGetSocket (void *ctx, - const char *filename); -XML_DEPRECATED -XMLPUBFUN int - xmlNanoFTPGet (void *ctx, - ftpDataCallback callback, - void *userData, - const char *filename); -XML_DEPRECATED -XMLPUBFUN int - xmlNanoFTPRead (void *ctx, - void *dest, - int len); - -#ifdef __cplusplus -} -#endif -#endif /* defined(LIBXML_FTP_ENABLED) || defined(LIBXML_LEGACY_ENABLED) */ #endif /* __NANO_FTP_H__ */ diff --git a/include/libxml/xmlIO.h b/include/libxml/xmlIO.h index 66eebd42..81f850e2 100644 --- a/include/libxml/xmlIO.h +++ b/include/libxml/xmlIO.h @@ -392,26 +392,6 @@ XMLPUBFUN int xmlIOHTTPClose (void * context); #endif /* LIBXML_HTTP_ENABLED */ -/** - * Default 'ftp://' protocol callbacks - */ -#if defined(LIBXML_FTP_ENABLED) -XML_DEPRECATED -XMLPUBFUN int - xmlIOFTPMatch (const char *filename); -XML_DEPRECATED -XMLPUBFUN void * - xmlIOFTPOpen (const char *filename); -XML_DEPRECATED -XMLPUBFUN int - xmlIOFTPRead (void * context, - char * buffer, - int len); -XML_DEPRECATED -XMLPUBFUN int - xmlIOFTPClose (void * context); -#endif /* defined(LIBXML_FTP_ENABLED) */ - XMLPUBFUN xmlParserInputBufferCreateFilenameFunc xmlParserInputBufferCreateFilenameDefault( xmlParserInputBufferCreateFilenameFunc func); diff --git a/include/libxml/xmlversion.h.in b/include/libxml/xmlversion.h.in index f153a942..708c287d 100644 --- a/include/libxml/xmlversion.h.in +++ b/include/libxml/xmlversion.h.in @@ -127,15 +127,6 @@ #define LIBXML_SAX1_ENABLED #endif -/** - * LIBXML_FTP_ENABLED: - * - * Whether the FTP support is configured in - */ -#if @WITH_FTP@ -#define LIBXML_FTP_ENABLED -#endif - /** * LIBXML_HTTP_ENABLED: * diff --git a/legacy.c b/legacy.c index ac80c0e4..bb444f98 100644 --- a/legacy.c +++ b/legacy.c @@ -1354,10 +1354,6 @@ cdataBlock(void *ctx, const xmlChar * value, int len) * nanoftp.h */ -#ifndef LIBXML_FTP_ENABLED - -#include - /** DOC_DISABLE */ #ifdef _WIN32 @@ -1597,8 +1593,6 @@ xmlIOFTPClose(void *context ATTRIBUTE_UNUSED) { /** DOC_ENABLE */ -#endif /* #ifndef LIBXML_FTP_ENABLED */ - /* * xpointer.h */ diff --git a/meson.build b/meson.build index 0542fe9a..6bbb45a7 100644 --- a/meson.build +++ b/meson.build @@ -56,7 +56,6 @@ cc = meson.get_compiler('c') want_c14n = get_option('c14n') want_catalog = get_option('catalog') want_debug = get_option('debuging') -want_ftp = get_option('ftp') want_history = get_option('history') want_html = get_option('html') want_http = get_option('http') @@ -469,7 +468,7 @@ if sys_windows == true endif ### inet -if want_http == true or want_ftp == true +if want_http == true if sys_windows == true ws2_dep = cc.find_library('ws2_32', required: true) xml_deps += ws2_dep @@ -639,7 +638,6 @@ xml_opt_src = [ [want_c14n, ['c14n.c']], [want_catalog, ['catalog.c']], [want_debug, ['debugXML.c']], - [want_ftp, ['nanoftp.c']], [want_html, ['HTMLparser.c', 'HTMLtree.c']], [want_http, ['nanohttp.c']], [want_legacy, ['legacy.c']], @@ -806,7 +804,6 @@ summary( 'c14n': want_c14n, 'catalog': want_catalog, 'debug': want_debug, - 'ftp': want_ftp, 'history': want_history, 'html': want_html, 'http': want_http, diff --git a/meson_options.txt b/meson_options.txt index 4d61f3d3..92979127 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -3,7 +3,6 @@ # [X] c14n # [X] catalog # [X] debugging -# [X] ftp - not minimum # [X] history # [X] html # [X] http @@ -59,12 +58,6 @@ option('debuging', description: 'Debugging module and shell' ) -option('ftp', - type: 'boolean', - value: false, - description: 'FTP support' -) - option('history', type: 'boolean', value: false, diff --git a/nanoftp.c b/nanoftp.c deleted file mode 100644 index 8c6378c6..00000000 --- a/nanoftp.c +++ /dev/null @@ -1,1984 +0,0 @@ -/* - * nanoftp.c: basic FTP client support - * - * Reference: RFC 959 - */ - -#ifdef TESTING -#define STANDALONE -#define HAVE_UNISTD_H -#define HAVE_SYS_SOCKET_H -#define HAVE_NETINET_IN_H -#define HAVE_NETDB_H -#define HAVE_SYS_TIME_H -#endif /* TESTING */ - -#define IN_LIBXML -#include "libxml.h" - -#ifdef LIBXML_FTP_ENABLED -#include -#include -#include - -#ifdef HAVE_UNISTD_H -#include -#elif defined (_WIN32) -#include -#endif -#ifdef HAVE_SYS_SOCKET_H -#include -#endif -#ifdef HAVE_NETINET_IN_H -#include -#endif -#ifdef HAVE_ARPA_INET_H -#include -#endif -#ifdef HAVE_NETDB_H -#include -#endif -#ifdef HAVE_FCNTL_H -#include -#endif -#ifdef HAVE_SYS_TIME_H -#include -#endif -#ifdef HAVE_SYS_SELECT_H -#include -#endif -#ifdef HAVE_SYS_SOCKET_H -#include -#endif - -#include -#include -#include -#include -#include - -#include "private/error.h" -#include "private/io.h" - -#if defined(_WIN32) -#include -#endif - -/** - * A couple portability macros - */ -#ifndef _WINSOCKAPI_ -#define closesocket(s) close(s) -#endif - -#ifndef XML_SOCKLEN_T -#define XML_SOCKLEN_T unsigned int -#endif - -#define GETHOSTBYNAME_ARG_CAST (char *) -#define SEND_ARG2_CAST (char *) - -#define FTP_COMMAND_OK 200 -#define FTP_SYNTAX_ERROR 500 -#define FTP_GET_PASSWD 331 -#define FTP_BUF_SIZE 1024 - -#define XML_NANO_MAX_URLBUF 4096 - -#define __xmlIOErr(domain, code, extra) ((void) 0) - -typedef struct xmlNanoFTPCtxt { - char *protocol; /* the protocol name */ - char *hostname; /* the host name */ - int port; /* the port */ - char *path; /* the path within the URL */ - char *user; /* user string */ - char *passwd; /* passwd string */ -#ifdef SUPPORT_IP6 - struct sockaddr_storage ftpAddr; /* this is large enough to hold IPv6 address*/ -#else - struct sockaddr_in ftpAddr; /* the socket address struct */ -#endif - int passive; /* currently we support only passive !!! */ - SOCKET controlFd; /* the file descriptor for the control socket */ - SOCKET dataFd; /* the file descriptor for the data socket */ - int state; /* WRITE / READ / CLOSED */ - int returnValue; /* the protocol return value */ - /* buffer for data received from the control connection */ - char controlBuf[FTP_BUF_SIZE + 1]; - int controlBufIndex; - int controlBufUsed; - int controlBufAnswer; -} xmlNanoFTPCtxt, *xmlNanoFTPCtxtPtr; - -static int initialized = 0; -static char *proxy = NULL; /* the proxy name if any */ -static int proxyPort = 0; /* the proxy port if any */ -static char *proxyUser = NULL; /* user for proxy authentication */ -static char *proxyPasswd = NULL;/* passwd for proxy authentication */ -static int proxyType = 0; /* uses TYPE or a@b ? */ - -#ifdef SUPPORT_IP6 -static -int have_ipv6(void) { - int s; - - s = socket (AF_INET6, SOCK_STREAM, 0); - if (s != -1) { - close (s); - return (1); - } - return (0); -} -#endif - -/** - * xmlFTPErrMemory: - * @extra: extra information - * - * Handle an out of memory condition - */ -static void -xmlFTPErrMemory(const char *extra ATTRIBUTE_UNUSED) -{ - xmlRaiseMemoryError(NULL, NULL, NULL, XML_FROM_FTP, NULL); -} - -/** - * xmlNanoFTPInit: - * - * Initialize the FTP protocol layer. - * Currently it just checks for proxy information, - * and get the hostname - */ - -void -xmlNanoFTPInit(void) { - const char *env; -#ifdef _WINSOCKAPI_ - WSADATA wsaData; -#endif - - if (initialized) - return; - -#ifdef _WINSOCKAPI_ - if (WSAStartup(MAKEWORD(1, 1), &wsaData) != 0) - return; -#endif - - proxyPort = 21; - env = getenv("no_proxy"); - if (env && ((env[0] == '*' ) && (env[1] == 0))) - return; - env = getenv("ftp_proxy"); - if (env != NULL) { - xmlNanoFTPScanProxy(env); - } else { - env = getenv("FTP_PROXY"); - if (env != NULL) { - xmlNanoFTPScanProxy(env); - } - } - env = getenv("ftp_proxy_user"); - if (env != NULL) { - proxyUser = xmlMemStrdup(env); - } - env = getenv("ftp_proxy_password"); - if (env != NULL) { - proxyPasswd = xmlMemStrdup(env); - } - initialized = 1; -} - -/** - * xmlNanoFTPCleanup: - * - * Cleanup the FTP protocol layer. This cleanup proxy information. - */ - -void -xmlNanoFTPCleanup(void) { - if (proxy != NULL) { - xmlFree(proxy); - proxy = NULL; - } - if (proxyUser != NULL) { - xmlFree(proxyUser); - proxyUser = NULL; - } - if (proxyPasswd != NULL) { - xmlFree(proxyPasswd); - proxyPasswd = NULL; - } -#ifdef _WINSOCKAPI_ - if (initialized) - WSACleanup(); -#endif - initialized = 0; -} - -/** - * xmlNanoFTPProxy: - * @host: the proxy host name - * @port: the proxy port - * @user: the proxy user name - * @passwd: the proxy password - * @type: the type of proxy 1 for using SITE, 2 for USER a@b - * - * Setup the FTP proxy information. - * This can also be done by using ftp_proxy ftp_proxy_user and - * ftp_proxy_password environment variables. - */ - -void -xmlNanoFTPProxy(const char *host, int port, const char *user, - const char *passwd, int type) { - if (proxy != NULL) { - xmlFree(proxy); - proxy = NULL; - } - if (proxyUser != NULL) { - xmlFree(proxyUser); - proxyUser = NULL; - } - if (proxyPasswd != NULL) { - xmlFree(proxyPasswd); - proxyPasswd = NULL; - } - if (host) - proxy = xmlMemStrdup(host); - if (user) - proxyUser = xmlMemStrdup(user); - if (passwd) - proxyPasswd = xmlMemStrdup(passwd); - proxyPort = port; - proxyType = type; -} - -/** - * xmlNanoFTPScanURL: - * @ctx: an FTP context - * @URL: The URL used to initialize the context - * - * (Re)Initialize an FTP context by parsing the URL and finding - * the protocol host port and path it indicates. - */ - -static void -xmlNanoFTPScanURL(void *ctx, const char *URL) { - xmlNanoFTPCtxtPtr ctxt = (xmlNanoFTPCtxtPtr) ctx; - xmlURIPtr uri; - - /* - * Clear any existing data from the context - */ - if (ctxt->protocol != NULL) { - xmlFree(ctxt->protocol); - ctxt->protocol = NULL; - } - if (ctxt->hostname != NULL) { - xmlFree(ctxt->hostname); - ctxt->hostname = NULL; - } - if (ctxt->path != NULL) { - xmlFree(ctxt->path); - ctxt->path = NULL; - } - if (URL == NULL) return; - - uri = xmlParseURIRaw(URL, 1); - if (uri == NULL) - return; - - if ((uri->scheme == NULL) || (uri->server == NULL)) { - xmlFreeURI(uri); - return; - } - - ctxt->protocol = xmlMemStrdup(uri->scheme); - ctxt->hostname = xmlMemStrdup(uri->server); - if (uri->path != NULL) - ctxt->path = xmlMemStrdup(uri->path); - else - ctxt->path = xmlMemStrdup("/"); - if (uri->port != 0) - ctxt->port = uri->port; - - if (uri->user != NULL) { - char *cptr; - if ((cptr=strchr(uri->user, ':')) == NULL) - ctxt->user = xmlMemStrdup(uri->user); - else { - ctxt->user = (char *)xmlStrndup((xmlChar *)uri->user, - (cptr - uri->user)); - ctxt->passwd = xmlMemStrdup(cptr+1); - } - } - - xmlFreeURI(uri); - -} - -/** - * xmlNanoFTPUpdateURL: - * @ctx: an FTP context - * @URL: The URL used to update the context - * - * Update an FTP context by parsing the URL and finding - * new path it indicates. If there is an error in the - * protocol, hostname, port or other information, the - * error is raised. It indicates a new connection has to - * be established. - * - * Returns 0 if Ok, -1 in case of error (other host). - */ - -int -xmlNanoFTPUpdateURL(void *ctx, const char *URL) { - xmlNanoFTPCtxtPtr ctxt = (xmlNanoFTPCtxtPtr) ctx; - xmlURIPtr uri; - - if (URL == NULL) - return(-1); - if (ctxt == NULL) - return(-1); - if (ctxt->protocol == NULL) - return(-1); - if (ctxt->hostname == NULL) - return(-1); - - uri = xmlParseURIRaw(URL, 1); - if (uri == NULL) - return(-1); - - if ((uri->scheme == NULL) || (uri->server == NULL)) { - xmlFreeURI(uri); - return(-1); - } - if ((strcmp(ctxt->protocol, uri->scheme)) || - (strcmp(ctxt->hostname, uri->server)) || - ((uri->port != 0) && (ctxt->port != uri->port))) { - xmlFreeURI(uri); - return(-1); - } - - if (uri->port != 0) - ctxt->port = uri->port; - - if (ctxt->path != NULL) { - xmlFree(ctxt->path); - ctxt->path = NULL; - } - - if (uri->path == NULL) - ctxt->path = xmlMemStrdup("/"); - else - ctxt->path = xmlMemStrdup(uri->path); - - xmlFreeURI(uri); - - return(0); -} - -/** - * xmlNanoFTPScanProxy: - * @URL: The proxy URL used to initialize the proxy context - * - * (Re)Initialize the FTP Proxy context by parsing the URL and finding - * the protocol host port it indicates. - * Should be like ftp://myproxy/ or ftp://myproxy:3128/ - * A NULL URL cleans up proxy information. - */ - -void -xmlNanoFTPScanProxy(const char *URL) { - xmlURIPtr uri; - - if (proxy != NULL) { - xmlFree(proxy); - proxy = NULL; - } - proxyPort = 0; - - if (URL == NULL) return; - - uri = xmlParseURIRaw(URL, 1); - if ((uri == NULL) || (uri->scheme == NULL) || - (strcmp(uri->scheme, "ftp")) || (uri->server == NULL)) { - __xmlIOErr(XML_FROM_FTP, XML_FTP_URL_SYNTAX, "Syntax Error\n"); - if (uri != NULL) - xmlFreeURI(uri); - return; - } - - proxy = xmlMemStrdup(uri->server); - if (uri->port != 0) - proxyPort = uri->port; - - xmlFreeURI(uri); -} - -/** - * xmlNanoFTPNewCtxt: - * @URL: The URL used to initialize the context - * - * Allocate and initialize a new FTP context. - * - * Returns an FTP context or NULL in case of error. - */ - -void* -xmlNanoFTPNewCtxt(const char *URL) { - xmlNanoFTPCtxtPtr ret; - char *unescaped; - - ret = (xmlNanoFTPCtxtPtr) xmlMalloc(sizeof(xmlNanoFTPCtxt)); - if (ret == NULL) { - xmlFTPErrMemory("allocating FTP context"); - return(NULL); - } - - memset(ret, 0, sizeof(xmlNanoFTPCtxt)); - ret->port = 21; - ret->passive = 1; - ret->returnValue = 0; - ret->controlBufIndex = 0; - ret->controlBufUsed = 0; - ret->controlFd = INVALID_SOCKET; - - unescaped = xmlURIUnescapeString(URL, 0, NULL); - if (unescaped != NULL) { - xmlNanoFTPScanURL(ret, unescaped); - xmlFree(unescaped); - } else if (URL != NULL) - xmlNanoFTPScanURL(ret, URL); - - return(ret); -} - -/** - * xmlNanoFTPFreeCtxt: - * @ctx: an FTP context - * - * Frees the context after closing the connection. - */ - -void -xmlNanoFTPFreeCtxt(void * ctx) { - xmlNanoFTPCtxtPtr ctxt = (xmlNanoFTPCtxtPtr) ctx; - if (ctxt == NULL) return; - if (ctxt->hostname != NULL) xmlFree(ctxt->hostname); - if (ctxt->protocol != NULL) xmlFree(ctxt->protocol); - if (ctxt->path != NULL) xmlFree(ctxt->path); - if (ctxt->user != NULL) xmlFree(ctxt->user); - if (ctxt->passwd != NULL) xmlFree(ctxt->passwd); - ctxt->passive = 1; - if (ctxt->controlFd != INVALID_SOCKET) closesocket(ctxt->controlFd); - ctxt->controlFd = INVALID_SOCKET; - ctxt->controlBufIndex = -1; - ctxt->controlBufUsed = -1; - xmlFree(ctxt); -} - -/** - * xmlNanoFTPParseResponse: - * @buf: the buffer containing the response - * @len: the buffer length - * - * Parsing of the server answer, we just extract the code. - * - * returns 0 for errors - * +XXX for last line of response - * -XXX for response to be continued - */ -static int -xmlNanoFTPParseResponse(char *buf, int len) { - int val = 0; - - if (len < 3) return(-1); - if ((*buf >= '0') && (*buf <= '9')) - val = val * 10 + (*buf - '0'); - else - return(0); - buf++; - if ((*buf >= '0') && (*buf <= '9')) - val = val * 10 + (*buf - '0'); - else - return(0); - buf++; - if ((*buf >= '0') && (*buf <= '9')) - val = val * 10 + (*buf - '0'); - else - return(0); - buf++; - if (*buf == '-') - return(-val); - return(val); -} - -/** - * xmlNanoFTPGetMore: - * @ctx: an FTP context - * - * Read more information from the FTP control connection - * Returns the number of bytes read, < 0 indicates an error - */ -static int -xmlNanoFTPGetMore(void *ctx) { - xmlNanoFTPCtxtPtr ctxt = (xmlNanoFTPCtxtPtr) ctx; - int len; - int size; - - if ((ctxt == NULL) || (ctxt->controlFd == INVALID_SOCKET)) return(-1); - - if ((ctxt->controlBufIndex < 0) || (ctxt->controlBufIndex > FTP_BUF_SIZE)) { - return(-1); - } - - if ((ctxt->controlBufUsed < 0) || (ctxt->controlBufUsed > FTP_BUF_SIZE)) { - return(-1); - } - if (ctxt->controlBufIndex > ctxt->controlBufUsed) { - return(-1); - } - - /* - * First pack the control buffer - */ - if (ctxt->controlBufIndex > 0) { - memmove(&ctxt->controlBuf[0], &ctxt->controlBuf[ctxt->controlBufIndex], - ctxt->controlBufUsed - ctxt->controlBufIndex); - ctxt->controlBufUsed -= ctxt->controlBufIndex; - ctxt->controlBufIndex = 0; - } - size = FTP_BUF_SIZE - ctxt->controlBufUsed; - if (size == 0) { - return(0); - } - - /* - * Read the amount left on the control connection - */ - if ((len = recv(ctxt->controlFd, &ctxt->controlBuf[ctxt->controlBufIndex], - size, 0)) < 0) { - __xmlIOErr(XML_FROM_FTP, 0, "recv failed"); - closesocket(ctxt->controlFd); ctxt->controlFd = INVALID_SOCKET; - ctxt->controlFd = INVALID_SOCKET; - return(-1); - } - ctxt->controlBufUsed += len; - ctxt->controlBuf[ctxt->controlBufUsed] = 0; - - return(len); -} - -/** - * xmlNanoFTPReadResponse: - * @ctx: an FTP context - * - * Read the response from the FTP server after a command. - * Returns the code number - */ -static int -xmlNanoFTPReadResponse(void *ctx) { - xmlNanoFTPCtxtPtr ctxt = (xmlNanoFTPCtxtPtr) ctx; - char *ptr, *end; - int len; - int res = -1, cur = -1; - - if ((ctxt == NULL) || (ctxt->controlFd == INVALID_SOCKET)) return(-1); - -get_more: - /* - * Assumes everything up to controlBuf[controlBufIndex] has been read - * and analyzed. - */ - len = xmlNanoFTPGetMore(ctx); - if (len < 0) { - return(-1); - } - if ((ctxt->controlBufUsed == 0) && (len == 0)) { - return(-1); - } - ptr = &ctxt->controlBuf[ctxt->controlBufIndex]; - end = &ctxt->controlBuf[ctxt->controlBufUsed]; - - while (ptr < end) { - cur = xmlNanoFTPParseResponse(ptr, end - ptr); - if (cur > 0) { - /* - * Successfully scanned the control code, scratch - * till the end of the line, but keep the index to be - * able to analyze the result if needed. - */ - res = cur; - ptr += 3; - ctxt->controlBufAnswer = ptr - ctxt->controlBuf; - while ((ptr < end) && (*ptr != '\n')) ptr++; - if (*ptr == '\n') ptr++; - if (*ptr == '\r') ptr++; - break; - } - while ((ptr < end) && (*ptr != '\n')) ptr++; - if (ptr >= end) { - ctxt->controlBufIndex = ctxt->controlBufUsed; - goto get_more; - } - if (*ptr != '\r') ptr++; - } - - if (res < 0) goto get_more; - ctxt->controlBufIndex = ptr - ctxt->controlBuf; - - return(res / 100); -} - -/** - * xmlNanoFTPGetResponse: - * @ctx: an FTP context - * - * Get the response from the FTP server after a command. - * Returns the code number - */ - -int -xmlNanoFTPGetResponse(void *ctx) { - int res; - - res = xmlNanoFTPReadResponse(ctx); - - return(res); -} - -/** - * xmlNanoFTPCheckResponse: - * @ctx: an FTP context - * - * Check if there is a response from the FTP server after a command. - * Returns the code number, or 0 - */ - -int -xmlNanoFTPCheckResponse(void *ctx) { - xmlNanoFTPCtxtPtr ctxt = (xmlNanoFTPCtxtPtr) ctx; - fd_set rfd; - struct timeval tv; - - if ((ctxt == NULL) || (ctxt->controlFd == INVALID_SOCKET)) return(-1); - tv.tv_sec = 0; - tv.tv_usec = 0; - FD_ZERO(&rfd); - FD_SET(ctxt->controlFd, &rfd); - switch(select(ctxt->controlFd + 1, &rfd, NULL, NULL, &tv)) { - case 0: - return(0); - case -1: - __xmlIOErr(XML_FROM_FTP, 0, "select"); - return(-1); - - } - - return(xmlNanoFTPReadResponse(ctx)); -} - -/** - * Send the user authentication - */ - -static int -xmlNanoFTPSendUser(void *ctx) { - xmlNanoFTPCtxtPtr ctxt = (xmlNanoFTPCtxtPtr) ctx; - char buf[200]; - int len; - int res; - - if (ctxt->user == NULL) - snprintf(buf, sizeof(buf), "USER anonymous\r\n"); - else - snprintf(buf, sizeof(buf), "USER %s\r\n", ctxt->user); - buf[sizeof(buf) - 1] = 0; - len = strlen(buf); - res = send(ctxt->controlFd, SEND_ARG2_CAST buf, len, 0); - if (res < 0) { - __xmlIOErr(XML_FROM_FTP, 0, "send failed"); - return(res); - } - return(0); -} - -/** - * Send the password authentication - */ - -static int -xmlNanoFTPSendPasswd(void *ctx) { - xmlNanoFTPCtxtPtr ctxt = (xmlNanoFTPCtxtPtr) ctx; - char buf[200]; - int len; - int res; - - if (ctxt->passwd == NULL) - snprintf(buf, sizeof(buf), "PASS anonymous@\r\n"); - else - snprintf(buf, sizeof(buf), "PASS %s\r\n", ctxt->passwd); - buf[sizeof(buf) - 1] = 0; - len = strlen(buf); - res = send(ctxt->controlFd, SEND_ARG2_CAST buf, len, 0); - if (res < 0) { - __xmlIOErr(XML_FROM_FTP, 0, "send failed"); - return(res); - } - return(0); -} - -/** - * xmlNanoFTPQuit: - * @ctx: an FTP context - * - * Send a QUIT command to the server - * - * Returns -1 in case of error, 0 otherwise - */ - - -int -xmlNanoFTPQuit(void *ctx) { - xmlNanoFTPCtxtPtr ctxt = (xmlNanoFTPCtxtPtr) ctx; - char buf[200]; - int len, res; - - if ((ctxt == NULL) || (ctxt->controlFd == INVALID_SOCKET)) return(-1); - - snprintf(buf, sizeof(buf), "QUIT\r\n"); - len = strlen(buf); - res = send(ctxt->controlFd, SEND_ARG2_CAST buf, len, 0); - if (res < 0) { - __xmlIOErr(XML_FROM_FTP, 0, "send failed"); - return(res); - } - return(0); -} - -/** - * xmlNanoFTPConnect: - * @ctx: an FTP context - * - * Tries to open a control connection - * - * Returns -1 in case of error, 0 otherwise - */ - -int -xmlNanoFTPConnect(void *ctx) { - xmlNanoFTPCtxtPtr ctxt = (xmlNanoFTPCtxtPtr) ctx; - struct hostent *hp; - int port; - int res; - int addrlen = sizeof (struct sockaddr_in); - - if (ctxt == NULL) - return(-1); - if (ctxt->hostname == NULL) - return(-1); - - /* - * do the blocking DNS query. - */ - if (proxy) { - port = proxyPort; - } else { - port = ctxt->port; - } - if (port == 0) - port = 21; - - memset (&ctxt->ftpAddr, 0, sizeof(ctxt->ftpAddr)); - -#ifdef SUPPORT_IP6 - if (have_ipv6 ()) { - struct addrinfo hints, *tmp, *result; - - result = NULL; - memset (&hints, 0, sizeof(hints)); - hints.ai_socktype = SOCK_STREAM; - - if (proxy) { - if (getaddrinfo (proxy, NULL, &hints, &result) != 0) { - __xmlIOErr(XML_FROM_FTP, 0, "getaddrinfo failed"); - return (-1); - } - } - else - if (getaddrinfo (ctxt->hostname, NULL, &hints, &result) != 0) { - __xmlIOErr(XML_FROM_FTP, 0, "getaddrinfo failed"); - return (-1); - } - - for (tmp = result; tmp; tmp = tmp->ai_next) - if (tmp->ai_family == AF_INET || tmp->ai_family == AF_INET6) - break; - - if (!tmp) { - if (result) - freeaddrinfo (result); - __xmlIOErr(XML_FROM_FTP, 0, "getaddrinfo failed"); - return (-1); - } - if ((size_t)tmp->ai_addrlen > sizeof(ctxt->ftpAddr)) { - if (result) - freeaddrinfo (result); - __xmlIOErr(XML_FROM_FTP, 0, "gethostbyname address mismatch"); - return (-1); - } - if (tmp->ai_family == AF_INET6) { - memcpy (&ctxt->ftpAddr, tmp->ai_addr, tmp->ai_addrlen); - ((struct sockaddr_in6 *) &ctxt->ftpAddr)->sin6_port = htons (port); - ctxt->controlFd = socket (AF_INET6, SOCK_STREAM, 0); - } - else { - memcpy (&ctxt->ftpAddr, tmp->ai_addr, tmp->ai_addrlen); - ((struct sockaddr_in *) &ctxt->ftpAddr)->sin_port = htons (port); - ctxt->controlFd = socket (AF_INET, SOCK_STREAM, 0); - } - addrlen = tmp->ai_addrlen; - freeaddrinfo (result); - } - else -#endif - { - if (proxy) - hp = gethostbyname (GETHOSTBYNAME_ARG_CAST proxy); - else - hp = gethostbyname (GETHOSTBYNAME_ARG_CAST ctxt->hostname); - if (hp == NULL) { - __xmlIOErr(XML_FROM_FTP, 0, "gethostbyname failed"); - return (-1); - } - if ((unsigned int) hp->h_length > - sizeof(((struct sockaddr_in *)&ctxt->ftpAddr)->sin_addr)) { - __xmlIOErr(XML_FROM_FTP, 0, "gethostbyname address mismatch"); - return (-1); - } - - /* - * Prepare the socket - */ - ((struct sockaddr_in *)&ctxt->ftpAddr)->sin_family = AF_INET; - memcpy (&((struct sockaddr_in *)&ctxt->ftpAddr)->sin_addr, - hp->h_addr_list[0], hp->h_length); - ((struct sockaddr_in *)&ctxt->ftpAddr)->sin_port = - (unsigned short)htons ((unsigned short)port); - ctxt->controlFd = socket (AF_INET, SOCK_STREAM, 0); - addrlen = sizeof (struct sockaddr_in); - } - - if (ctxt->controlFd == INVALID_SOCKET) { - __xmlIOErr(XML_FROM_FTP, 0, "socket failed"); - return(-1); - } - - /* - * Do the connect. - */ - if (connect(ctxt->controlFd, (struct sockaddr *) &ctxt->ftpAddr, - addrlen) < 0) { - __xmlIOErr(XML_FROM_FTP, 0, "Failed to create a connection"); - closesocket(ctxt->controlFd); ctxt->controlFd = INVALID_SOCKET; - ctxt->controlFd = INVALID_SOCKET; - return(-1); - } - - /* - * Wait for the HELLO from the server. - */ - res = xmlNanoFTPGetResponse(ctxt); - if (res != 2) { - closesocket(ctxt->controlFd); ctxt->controlFd = INVALID_SOCKET; - ctxt->controlFd = INVALID_SOCKET; - return(-1); - } - - /* - * State diagram for the login operation on the FTP server - * - * Reference: RFC 959 - * - * 1 - * +---+ USER +---+------------->+---+ - * | B |---------->| W | 2 ---->| E | - * +---+ +---+------ | -->+---+ - * | | | | | - * 3 | | 4,5 | | | - * -------------- ----- | | | - * | | | | | - * | | | | | - * | --------- | - * | 1| | | | - * V | | | | - * +---+ PASS +---+ 2 | ------>+---+ - * | |---------->| W |------------->| S | - * +---+ +---+ ---------->+---+ - * | | | | | - * 3 | |4,5| | | - * -------------- -------- | - * | | | | | - * | | | | | - * | ----------- - * | 1,3| | | | - * V | 2| | | - * +---+ ACCT +---+-- | ----->+---+ - * | |---------->| W | 4,5 -------->| F | - * +---+ +---+------------->+---+ - * - * Of course in case of using a proxy this get really nasty and is not - * standardized at all :-( - */ - if (proxy) { - int len; - char buf[400]; - - if (proxyUser != NULL) { - /* - * We need proxy auth - */ - snprintf(buf, sizeof(buf), "USER %s\r\n", proxyUser); - buf[sizeof(buf) - 1] = 0; - len = strlen(buf); - res = send(ctxt->controlFd, SEND_ARG2_CAST buf, len, 0); - if (res < 0) { - __xmlIOErr(XML_FROM_FTP, 0, "send failed"); - closesocket(ctxt->controlFd); - ctxt->controlFd = INVALID_SOCKET; - return(res); - } - res = xmlNanoFTPGetResponse(ctxt); - switch (res) { - case 2: - if (proxyPasswd == NULL) - break; - /* Falls through. */ - case 3: - if (proxyPasswd != NULL) - snprintf(buf, sizeof(buf), "PASS %s\r\n", proxyPasswd); - else - snprintf(buf, sizeof(buf), "PASS anonymous@\r\n"); - buf[sizeof(buf) - 1] = 0; - len = strlen(buf); - res = send(ctxt->controlFd, SEND_ARG2_CAST buf, len, 0); - if (res < 0) { - __xmlIOErr(XML_FROM_FTP, 0, "send failed"); - closesocket(ctxt->controlFd); - ctxt->controlFd = INVALID_SOCKET; - return(res); - } - res = xmlNanoFTPGetResponse(ctxt); - if (res > 3) { - closesocket(ctxt->controlFd); - ctxt->controlFd = INVALID_SOCKET; - return(-1); - } - break; - case 1: - break; - case 4: - case 5: - case -1: - default: - closesocket(ctxt->controlFd); - ctxt->controlFd = INVALID_SOCKET; - return(-1); - } - } - - /* - * We assume we don't need more authentication to the proxy - * and that it succeeded :-\ - */ - switch (proxyType) { - case 0: - /* we will try in sequence */ - case 1: - /* Using SITE command */ - snprintf(buf, sizeof(buf), "SITE %s\r\n", ctxt->hostname); - buf[sizeof(buf) - 1] = 0; - len = strlen(buf); - res = send(ctxt->controlFd, SEND_ARG2_CAST buf, len, 0); - if (res < 0) { - __xmlIOErr(XML_FROM_FTP, 0, "send failed"); - closesocket(ctxt->controlFd); ctxt->controlFd = INVALID_SOCKET; - ctxt->controlFd = INVALID_SOCKET; - return(res); - } - res = xmlNanoFTPGetResponse(ctxt); - if (res == 2) { - /* we assume it worked :-\ 1 is error for SITE command */ - proxyType = 1; - break; - } - if (proxyType == 1) { - closesocket(ctxt->controlFd); ctxt->controlFd = INVALID_SOCKET; - ctxt->controlFd = INVALID_SOCKET; - return(-1); - } - /* Falls through. */ - case 2: - /* USER user@host command */ - if (ctxt->user == NULL) - snprintf(buf, sizeof(buf), "USER anonymous@%s\r\n", - ctxt->hostname); - else - snprintf(buf, sizeof(buf), "USER %s@%s\r\n", - ctxt->user, ctxt->hostname); - buf[sizeof(buf) - 1] = 0; - len = strlen(buf); - res = send(ctxt->controlFd, SEND_ARG2_CAST buf, len, 0); - if (res < 0) { - __xmlIOErr(XML_FROM_FTP, 0, "send failed"); - closesocket(ctxt->controlFd); ctxt->controlFd = INVALID_SOCKET; - ctxt->controlFd = INVALID_SOCKET; - return(res); - } - res = xmlNanoFTPGetResponse(ctxt); - if ((res == 1) || (res == 2)) { - /* we assume it worked :-\ */ - proxyType = 2; - return(0); - } - if (ctxt->passwd == NULL) - snprintf(buf, sizeof(buf), "PASS anonymous@\r\n"); - else - snprintf(buf, sizeof(buf), "PASS %s\r\n", ctxt->passwd); - buf[sizeof(buf) - 1] = 0; - len = strlen(buf); - res = send(ctxt->controlFd, SEND_ARG2_CAST buf, len, 0); - if (res < 0) { - __xmlIOErr(XML_FROM_FTP, 0, "send failed"); - closesocket(ctxt->controlFd); ctxt->controlFd = INVALID_SOCKET; - ctxt->controlFd = INVALID_SOCKET; - return(res); - } - res = xmlNanoFTPGetResponse(ctxt); - if ((res == 1) || (res == 2)) { - /* we assume it worked :-\ */ - proxyType = 2; - return(0); - } - if (proxyType == 2) { - closesocket(ctxt->controlFd); ctxt->controlFd = INVALID_SOCKET; - ctxt->controlFd = INVALID_SOCKET; - return(-1); - } - /* Falls through. */ - case 3: - /* - * If you need support for other Proxy authentication scheme - * send the code or at least the sequence in use. - */ - default: - closesocket(ctxt->controlFd); ctxt->controlFd = INVALID_SOCKET; - ctxt->controlFd = INVALID_SOCKET; - return(-1); - } - } - /* - * Non-proxy handling. - */ - res = xmlNanoFTPSendUser(ctxt); - if (res < 0) { - closesocket(ctxt->controlFd); ctxt->controlFd = INVALID_SOCKET; - ctxt->controlFd = INVALID_SOCKET; - return(-1); - } - res = xmlNanoFTPGetResponse(ctxt); - switch (res) { - case 2: - return(0); - case 3: - break; - case 1: - case 4: - case 5: - case -1: - default: - closesocket(ctxt->controlFd); ctxt->controlFd = INVALID_SOCKET; - ctxt->controlFd = INVALID_SOCKET; - return(-1); - } - res = xmlNanoFTPSendPasswd(ctxt); - if (res < 0) { - closesocket(ctxt->controlFd); ctxt->controlFd = INVALID_SOCKET; - ctxt->controlFd = INVALID_SOCKET; - return(-1); - } - res = xmlNanoFTPGetResponse(ctxt); - switch (res) { - case 2: - break; - case 3: - __xmlIOErr(XML_FROM_FTP, XML_FTP_ACCNT, - "FTP server asking for ACCNT on anonymous\n"); - /* Falls through. */ - case 1: - case 4: - case 5: - case -1: - default: - closesocket(ctxt->controlFd); ctxt->controlFd = INVALID_SOCKET; - ctxt->controlFd = INVALID_SOCKET; - return(-1); - } - - return(0); -} - -/** - * xmlNanoFTPConnectTo: - * @server: an FTP server name - * @port: the port (use 21 if 0) - * - * Tries to open a control connection to the given server/port - * - * Returns an fTP context or NULL if it failed - */ - -void* -xmlNanoFTPConnectTo(const char *server, int port) { - xmlNanoFTPCtxtPtr ctxt; - int res; - - xmlNanoFTPInit(); - if (server == NULL) - return(NULL); - if (port <= 0) - return(NULL); - ctxt = (xmlNanoFTPCtxtPtr) xmlNanoFTPNewCtxt(NULL); - if (ctxt == NULL) - return(NULL); - ctxt->hostname = xmlMemStrdup(server); - if (ctxt->hostname == NULL) { - xmlNanoFTPFreeCtxt(ctxt); - return(NULL); - } - ctxt->port = port; - res = xmlNanoFTPConnect(ctxt); - if (res < 0) { - xmlNanoFTPFreeCtxt(ctxt); - return(NULL); - } - return(ctxt); -} - -/** - * xmlNanoFTPCwd: - * @ctx: an FTP context - * @directory: a directory on the server - * - * Tries to change the remote directory - * - * Returns -1 in case of error, 1 if CWD worked, 0 if it failed - */ - -int -xmlNanoFTPCwd(void *ctx, const char *directory) { - xmlNanoFTPCtxtPtr ctxt = (xmlNanoFTPCtxtPtr) ctx; - char buf[400]; - int len; - int res; - - if ((ctxt == NULL) || (ctxt->controlFd == INVALID_SOCKET)) return(-1); - if (directory == NULL) return 0; - - /* - * Expected response code for CWD: - * - * CWD - * 250 - * 500, 501, 502, 421, 530, 550 - */ - snprintf(buf, sizeof(buf), "CWD %s\r\n", directory); - buf[sizeof(buf) - 1] = 0; - len = strlen(buf); - res = send(ctxt->controlFd, SEND_ARG2_CAST buf, len, 0); - if (res < 0) { - __xmlIOErr(XML_FROM_FTP, 0, "send failed"); - return(res); - } - res = xmlNanoFTPGetResponse(ctxt); - if (res == 4) { - return(-1); - } - if (res == 2) return(1); - if (res == 5) { - return(0); - } - return(0); -} - -/** - * xmlNanoFTPDele: - * @ctx: an FTP context - * @file: a file or directory on the server - * - * Tries to delete an item (file or directory) from server - * - * Returns -1 in case of error, 1 if DELE worked, 0 if it failed - */ - -int -xmlNanoFTPDele(void *ctx, const char *file) { - xmlNanoFTPCtxtPtr ctxt = (xmlNanoFTPCtxtPtr) ctx; - char buf[400]; - int len; - int res; - - if ((ctxt == NULL) || (ctxt->controlFd == INVALID_SOCKET) || - (file == NULL)) return(-1); - - /* - * Expected response code for DELE: - * - * DELE - * 250 - * 450, 550 - * 500, 501, 502, 421, 530 - */ - - snprintf(buf, sizeof(buf), "DELE %s\r\n", file); - buf[sizeof(buf) - 1] = 0; - len = strlen(buf); - res = send(ctxt->controlFd, SEND_ARG2_CAST buf, len, 0); - if (res < 0) { - __xmlIOErr(XML_FROM_FTP, 0, "send failed"); - return(res); - } - res = xmlNanoFTPGetResponse(ctxt); - if (res == 4) { - return(-1); - } - if (res == 2) return(1); - if (res == 5) { - return(0); - } - return(0); -} -/** - * xmlNanoFTPGetConnection: - * @ctx: an FTP context - * - * Try to open a data connection to the server. Currently only - * passive mode is supported. - * - * Returns -1 in case of error, 0 otherwise - */ - -SOCKET -xmlNanoFTPGetConnection(void *ctx) { - xmlNanoFTPCtxtPtr ctxt = (xmlNanoFTPCtxtPtr) ctx; - char buf[200], *cur; - int len, i; - int res; - unsigned char ad[6], *adp, *portp; - unsigned int temp[6]; -#ifdef SUPPORT_IP6 - struct sockaddr_storage dataAddr; -#else - struct sockaddr_in dataAddr; -#endif - XML_SOCKLEN_T dataAddrLen; - - if (ctxt == NULL) return INVALID_SOCKET; - - memset (&dataAddr, 0, sizeof(dataAddr)); -#ifdef SUPPORT_IP6 - if ((ctxt->ftpAddr).ss_family == AF_INET6) { - ctxt->dataFd = socket (AF_INET6, SOCK_STREAM, IPPROTO_TCP); - ((struct sockaddr_in6 *)&dataAddr)->sin6_family = AF_INET6; - dataAddrLen = sizeof(struct sockaddr_in6); - } else -#endif - { - ctxt->dataFd = socket (AF_INET, SOCK_STREAM, IPPROTO_TCP); - ((struct sockaddr_in *)&dataAddr)->sin_family = AF_INET; - dataAddrLen = sizeof (struct sockaddr_in); - } - - if (ctxt->dataFd == INVALID_SOCKET) { - __xmlIOErr(XML_FROM_FTP, 0, "socket failed"); - return INVALID_SOCKET; - } - - if (ctxt->passive) { -#ifdef SUPPORT_IP6 - if ((ctxt->ftpAddr).ss_family == AF_INET6) - snprintf (buf, sizeof(buf), "EPSV\r\n"); - else -#endif - snprintf (buf, sizeof(buf), "PASV\r\n"); - len = strlen (buf); - res = send(ctxt->controlFd, SEND_ARG2_CAST buf, len, 0); - if (res < 0) { - __xmlIOErr(XML_FROM_FTP, 0, "send failed"); - closesocket(ctxt->dataFd); ctxt->dataFd = INVALID_SOCKET; - return INVALID_SOCKET; - } - res = xmlNanoFTPReadResponse(ctx); - if (res != 2) { - if (res == 5) { - closesocket(ctxt->dataFd); ctxt->dataFd = INVALID_SOCKET; - return INVALID_SOCKET; - } else { - /* - * retry with an active connection - */ - closesocket(ctxt->dataFd); ctxt->dataFd = INVALID_SOCKET; - ctxt->passive = 0; - } - } - cur = &ctxt->controlBuf[ctxt->controlBufAnswer]; - while (((*cur < '0') || (*cur > '9')) && *cur != '\0') cur++; -#ifdef SUPPORT_IP6 - if ((ctxt->ftpAddr).ss_family == AF_INET6) { - if (sscanf (cur, "%u", &temp[0]) != 1) { - __xmlIOErr(XML_FROM_FTP, XML_FTP_EPSV_ANSWER, - "Invalid answer to EPSV\n"); - if (ctxt->dataFd != INVALID_SOCKET) { - closesocket (ctxt->dataFd); ctxt->dataFd = INVALID_SOCKET; - } - return INVALID_SOCKET; - } - memcpy (&((struct sockaddr_in6 *)&dataAddr)->sin6_addr, &((struct sockaddr_in6 *)&ctxt->ftpAddr)->sin6_addr, sizeof(struct in6_addr)); - ((struct sockaddr_in6 *)&dataAddr)->sin6_port = htons (temp[0]); - } - else -#endif - { - if (sscanf (cur, "%u,%u,%u,%u,%u,%u", &temp[0], &temp[1], &temp[2], - &temp[3], &temp[4], &temp[5]) != 6) { - __xmlIOErr(XML_FROM_FTP, XML_FTP_PASV_ANSWER, - "Invalid answer to PASV\n"); - if (ctxt->dataFd != INVALID_SOCKET) { - closesocket (ctxt->dataFd); ctxt->dataFd = INVALID_SOCKET; - } - return INVALID_SOCKET; - } - for (i=0; i<6; i++) ad[i] = (unsigned char) (temp[i] & 0xff); - memcpy (&((struct sockaddr_in *)&dataAddr)->sin_addr, &ad[0], 4); - memcpy (&((struct sockaddr_in *)&dataAddr)->sin_port, &ad[4], 2); - } - - if (connect(ctxt->dataFd, (struct sockaddr *) &dataAddr, dataAddrLen) < 0) { - __xmlIOErr(XML_FROM_FTP, 0, "Failed to create a data connection"); - closesocket(ctxt->dataFd); ctxt->dataFd = INVALID_SOCKET; - return INVALID_SOCKET; - } - } else { - getsockname(ctxt->dataFd, (struct sockaddr *) &dataAddr, &dataAddrLen); -#ifdef SUPPORT_IP6 - if ((ctxt->ftpAddr).ss_family == AF_INET6) - ((struct sockaddr_in6 *)&dataAddr)->sin6_port = 0; - else -#endif - ((struct sockaddr_in *)&dataAddr)->sin_port = 0; - - if (bind(ctxt->dataFd, (struct sockaddr *) &dataAddr, dataAddrLen) < 0) { - __xmlIOErr(XML_FROM_FTP, 0, "bind failed"); - closesocket(ctxt->dataFd); ctxt->dataFd = INVALID_SOCKET; - return INVALID_SOCKET; - } - getsockname(ctxt->dataFd, (struct sockaddr *) &dataAddr, &dataAddrLen); - - if (listen(ctxt->dataFd, 1) < 0) { - __xmlIOErr(XML_FROM_FTP, 0, "listen failed"); - closesocket(ctxt->dataFd); ctxt->dataFd = INVALID_SOCKET; - return INVALID_SOCKET; - } -#ifdef SUPPORT_IP6 - if ((ctxt->ftpAddr).ss_family == AF_INET6) { - char buf6[INET6_ADDRSTRLEN]; - inet_ntop (AF_INET6, &((struct sockaddr_in6 *)&dataAddr)->sin6_addr, - buf6, INET6_ADDRSTRLEN); - adp = (unsigned char *) buf6; - portp = (unsigned char *) &((struct sockaddr_in6 *)&dataAddr)->sin6_port; - snprintf (buf, sizeof(buf), "EPRT |2|%s|%s|\r\n", adp, portp); - } else -#endif - { - adp = (unsigned char *) &((struct sockaddr_in *)&dataAddr)->sin_addr; - portp = (unsigned char *) &((struct sockaddr_in *)&dataAddr)->sin_port; - snprintf (buf, sizeof(buf), "PORT %d,%d,%d,%d,%d,%d\r\n", - adp[0] & 0xff, adp[1] & 0xff, adp[2] & 0xff, adp[3] & 0xff, - portp[0] & 0xff, portp[1] & 0xff); - } - - buf[sizeof(buf) - 1] = 0; - len = strlen(buf); - - res = send(ctxt->controlFd, SEND_ARG2_CAST buf, len, 0); - if (res < 0) { - __xmlIOErr(XML_FROM_FTP, 0, "send failed"); - closesocket(ctxt->dataFd); ctxt->dataFd = INVALID_SOCKET; - return INVALID_SOCKET; - } - res = xmlNanoFTPGetResponse(ctxt); - if (res != 2) { - closesocket(ctxt->dataFd); ctxt->dataFd = INVALID_SOCKET; - return INVALID_SOCKET; - } - } - return(ctxt->dataFd); - -} - -/** - * xmlNanoFTPCloseConnection: - * @ctx: an FTP context - * - * Close the data connection from the server - * - * Returns -1 in case of error, 0 otherwise - */ - -int -xmlNanoFTPCloseConnection(void *ctx) { - xmlNanoFTPCtxtPtr ctxt = (xmlNanoFTPCtxtPtr) ctx; - int res; - fd_set rfd, efd; - struct timeval tv; - - if ((ctxt == NULL) || (ctxt->controlFd == INVALID_SOCKET)) return(-1); - - closesocket(ctxt->dataFd); ctxt->dataFd = INVALID_SOCKET; - tv.tv_sec = 15; - tv.tv_usec = 0; - FD_ZERO(&rfd); - FD_SET(ctxt->controlFd, &rfd); - FD_ZERO(&efd); - FD_SET(ctxt->controlFd, &efd); - res = select(ctxt->controlFd + 1, &rfd, NULL, &efd, &tv); - if (res < 0) { - closesocket(ctxt->controlFd); ctxt->controlFd = INVALID_SOCKET; - return(-1); - } - if (res == 0) { - closesocket(ctxt->controlFd); ctxt->controlFd = INVALID_SOCKET; - } else { - res = xmlNanoFTPGetResponse(ctxt); - if (res != 2) { - closesocket(ctxt->controlFd); ctxt->controlFd = INVALID_SOCKET; - return(-1); - } - } - return(0); -} - -/** - * xmlNanoFTPParseList: - * @list: some data listing received from the server - * @callback: the user callback - * @userData: the user callback data - * - * Parse at most one entry from the listing. - * - * Returns -1 in case of error, the length of data parsed otherwise - */ - -static int -xmlNanoFTPParseList(const char *list, ftpListCallback callback, void *userData) { - const char *cur = list; - char filename[151]; - char attrib[11]; - char owner[11]; - char group[11]; - char month[4]; - int year = 0; - int minute = 0; - int hour = 0; - int day = 0; - unsigned long size = 0; - int links = 0; - int i; - - if (!strncmp(cur, "total", 5)) { - cur += 5; - while (*cur == ' ') cur++; - while ((*cur >= '0') && (*cur <= '9')) - links = (links * 10) + (*cur++ - '0'); - while ((*cur == ' ') || (*cur == '\n') || (*cur == '\r')) - cur++; - return(cur - list); - } else if (*list == '+') { - return(0); - } else { - while ((*cur == ' ') || (*cur == '\n') || (*cur == '\r')) - cur++; - if (*cur == 0) return(0); - i = 0; - while (*cur != ' ') { - if (i < 10) - attrib[i++] = *cur; - cur++; - if (*cur == 0) return(0); - } - attrib[10] = 0; - while (*cur == ' ') cur++; - if (*cur == 0) return(0); - while ((*cur >= '0') && (*cur <= '9')) - links = (links * 10) + (*cur++ - '0'); - while (*cur == ' ') cur++; - if (*cur == 0) return(0); - i = 0; - while (*cur != ' ') { - if (i < 10) - owner[i++] = *cur; - cur++; - if (*cur == 0) return(0); - } - owner[i] = 0; - while (*cur == ' ') cur++; - if (*cur == 0) return(0); - i = 0; - while (*cur != ' ') { - if (i < 10) - group[i++] = *cur; - cur++; - if (*cur == 0) return(0); - } - group[i] = 0; - while (*cur == ' ') cur++; - if (*cur == 0) return(0); - while ((*cur >= '0') && (*cur <= '9')) - size = (size * 10) + (*cur++ - '0'); - while (*cur == ' ') cur++; - if (*cur == 0) return(0); - i = 0; - while (*cur != ' ') { - if (i < 3) - month[i++] = *cur; - cur++; - if (*cur == 0) return(0); - } - month[i] = 0; - while (*cur == ' ') cur++; - if (*cur == 0) return(0); - while ((*cur >= '0') && (*cur <= '9')) - day = (day * 10) + (*cur++ - '0'); - while (*cur == ' ') cur++; - if (*cur == 0) return(0); - if ((cur[1] == 0) || (cur[2] == 0)) return(0); - if ((cur[1] == ':') || (cur[2] == ':')) { - while ((*cur >= '0') && (*cur <= '9')) - hour = (hour * 10) + (*cur++ - '0'); - if (*cur == ':') cur++; - while ((*cur >= '0') && (*cur <= '9')) - minute = (minute * 10) + (*cur++ - '0'); - } else { - while ((*cur >= '0') && (*cur <= '9')) - year = (year * 10) + (*cur++ - '0'); - } - while (*cur == ' ') cur++; - if (*cur == 0) return(0); - i = 0; - while ((*cur != '\n') && (*cur != '\r')) { - if (i < 150) - filename[i++] = *cur; - cur++; - if (*cur == 0) return(0); - } - filename[i] = 0; - if ((*cur != '\n') && (*cur != '\r')) - return(0); - while ((*cur == '\n') || (*cur == '\r')) - cur++; - } - if (callback != NULL) { - callback(userData, filename, attrib, owner, group, size, links, - year, month, day, hour, minute); - } - return(cur - list); -} - -/** - * xmlNanoFTPList: - * @ctx: an FTP context - * @callback: the user callback - * @userData: the user callback data - * @filename: optional files to list - * - * Do a listing on the server. All files info are passed back - * in the callbacks. - * - * Returns -1 in case of error, 0 otherwise - */ - -int -xmlNanoFTPList(void *ctx, ftpListCallback callback, void *userData, - const char *filename) { - xmlNanoFTPCtxtPtr ctxt = (xmlNanoFTPCtxtPtr) ctx; - char buf[4096 + 1]; - int len, res; - int indx = 0, base; - fd_set rfd, efd; - struct timeval tv; - - if (ctxt == NULL) return (-1); - if (filename == NULL) { - if (xmlNanoFTPCwd(ctxt, ctxt->path) < 1) - return(-1); - ctxt->dataFd = xmlNanoFTPGetConnection(ctxt); - if (ctxt->dataFd == INVALID_SOCKET) - return(-1); - snprintf(buf, sizeof(buf), "LIST -L\r\n"); - } else { - if (filename[0] != '/') { - if (xmlNanoFTPCwd(ctxt, ctxt->path) < 1) - return(-1); - } - ctxt->dataFd = xmlNanoFTPGetConnection(ctxt); - if (ctxt->dataFd == INVALID_SOCKET) - return(-1); - snprintf(buf, sizeof(buf), "LIST -L %s\r\n", filename); - } - buf[sizeof(buf) - 1] = 0; - len = strlen(buf); - res = send(ctxt->controlFd, SEND_ARG2_CAST buf, len, 0); - if (res < 0) { - __xmlIOErr(XML_FROM_FTP, 0, "send failed"); - closesocket(ctxt->dataFd); ctxt->dataFd = INVALID_SOCKET; - return(res); - } - res = xmlNanoFTPReadResponse(ctxt); - if (res != 1) { - closesocket(ctxt->dataFd); ctxt->dataFd = INVALID_SOCKET; - return(-res); - } - - do { - tv.tv_sec = 1; - tv.tv_usec = 0; - FD_ZERO(&rfd); - FD_SET(ctxt->dataFd, &rfd); - FD_ZERO(&efd); - FD_SET(ctxt->dataFd, &efd); - res = select(ctxt->dataFd + 1, &rfd, NULL, &efd, &tv); - if (res < 0) { - closesocket(ctxt->dataFd); ctxt->dataFd = INVALID_SOCKET; - return(-1); - } - if (res == 0) { - res = xmlNanoFTPCheckResponse(ctxt); - if (res < 0) { - closesocket(ctxt->dataFd); ctxt->dataFd = INVALID_SOCKET; - ctxt->dataFd = INVALID_SOCKET; - return(-1); - } - if (res == 2) { - closesocket(ctxt->dataFd); ctxt->dataFd = INVALID_SOCKET; - return(0); - } - - continue; - } - - if ((len = recv(ctxt->dataFd, &buf[indx], sizeof(buf) - (indx + 1), 0)) < 0) { - __xmlIOErr(XML_FROM_FTP, 0, "recv"); - closesocket(ctxt->dataFd); ctxt->dataFd = INVALID_SOCKET; - ctxt->dataFd = INVALID_SOCKET; - return(-1); - } - indx += len; - buf[indx] = 0; - base = 0; - do { - res = xmlNanoFTPParseList(&buf[base], callback, userData); - base += res; - } while (res > 0); - - memmove(&buf[0], &buf[base], indx - base); - indx -= base; - } while (len != 0); - xmlNanoFTPCloseConnection(ctxt); - return(0); -} - -/** - * xmlNanoFTPGetSocket: - * @ctx: an FTP context - * @filename: the file to retrieve (or NULL if path is in context). - * - * Initiate fetch of the given file from the server. - * - * Returns the socket for the data connection, or <0 in case of error - */ - - -SOCKET -xmlNanoFTPGetSocket(void *ctx, const char *filename) { - xmlNanoFTPCtxtPtr ctxt = (xmlNanoFTPCtxtPtr) ctx; - char buf[300]; - int res, len; - if (ctx == NULL) - return INVALID_SOCKET; - if ((filename == NULL) && (ctxt->path == NULL)) - return INVALID_SOCKET; - ctxt->dataFd = xmlNanoFTPGetConnection(ctxt); - if (ctxt->dataFd == INVALID_SOCKET) - return INVALID_SOCKET; - - snprintf(buf, sizeof(buf), "TYPE I\r\n"); - len = strlen(buf); - res = send(ctxt->controlFd, SEND_ARG2_CAST buf, len, 0); - if (res < 0) { - __xmlIOErr(XML_FROM_FTP, 0, "send failed"); - closesocket(ctxt->dataFd); ctxt->dataFd = INVALID_SOCKET; - return INVALID_SOCKET; - } - res = xmlNanoFTPReadResponse(ctxt); - if (res != 2) { - closesocket(ctxt->dataFd); ctxt->dataFd = INVALID_SOCKET; - return INVALID_SOCKET; - } - if (filename == NULL) - snprintf(buf, sizeof(buf), "RETR %s\r\n", ctxt->path); - else - snprintf(buf, sizeof(buf), "RETR %s\r\n", filename); - buf[sizeof(buf) - 1] = 0; - len = strlen(buf); - res = send(ctxt->controlFd, SEND_ARG2_CAST buf, len, 0); - if (res < 0) { - __xmlIOErr(XML_FROM_FTP, 0, "send failed"); - closesocket(ctxt->dataFd); ctxt->dataFd = INVALID_SOCKET; - return INVALID_SOCKET; - } - res = xmlNanoFTPReadResponse(ctxt); - if (res != 1) { - closesocket(ctxt->dataFd); ctxt->dataFd = INVALID_SOCKET; - return INVALID_SOCKET; - } - return(ctxt->dataFd); -} - -/** - * xmlNanoFTPGet: - * @ctx: an FTP context - * @callback: the user callback - * @userData: the user callback data - * @filename: the file to retrieve - * - * Fetch the given file from the server. All data are passed back - * in the callbacks. The last callback has a size of 0 block. - * - * Returns -1 in case of error, 0 otherwise - */ - -int -xmlNanoFTPGet(void *ctx, ftpDataCallback callback, void *userData, - const char *filename) { - xmlNanoFTPCtxtPtr ctxt = (xmlNanoFTPCtxtPtr) ctx; - char buf[4096]; - int len = 0, res; - fd_set rfd; - struct timeval tv; - - if (ctxt == NULL) return(-1); - if ((filename == NULL) && (ctxt->path == NULL)) - return(-1); - if (callback == NULL) - return(-1); - if (xmlNanoFTPGetSocket(ctxt, filename) == INVALID_SOCKET) - return(-1); - - do { - tv.tv_sec = 1; - tv.tv_usec = 0; - FD_ZERO(&rfd); - FD_SET(ctxt->dataFd, &rfd); - res = select(ctxt->dataFd + 1, &rfd, NULL, NULL, &tv); - if (res < 0) { - closesocket(ctxt->dataFd); ctxt->dataFd = INVALID_SOCKET; - return(-1); - } - if (res == 0) { - res = xmlNanoFTPCheckResponse(ctxt); - if (res < 0) { - closesocket(ctxt->dataFd); ctxt->dataFd = INVALID_SOCKET; - ctxt->dataFd = INVALID_SOCKET; - return(-1); - } - if (res == 2) { - closesocket(ctxt->dataFd); ctxt->dataFd = INVALID_SOCKET; - return(0); - } - - continue; - } - if ((len = recv(ctxt->dataFd, buf, sizeof(buf), 0)) < 0) { - __xmlIOErr(XML_FROM_FTP, 0, "recv failed"); - callback(userData, buf, len); - closesocket(ctxt->dataFd); ctxt->dataFd = INVALID_SOCKET; - return(-1); - } - callback(userData, buf, len); - } while (len != 0); - - return(xmlNanoFTPCloseConnection(ctxt)); -} - -/** - * xmlNanoFTPRead: - * @ctx: the FTP context - * @dest: a buffer - * @len: the buffer length - * - * This function tries to read @len bytes from the existing FTP connection - * and saves them in @dest. This is a blocking call. - * - * Returns the number of byte read. 0 is an indication of an end of connection. - * -1 indicates a parameter error. - */ -int -xmlNanoFTPRead(void *ctx, void *dest, int len) { - xmlNanoFTPCtxtPtr ctxt = (xmlNanoFTPCtxtPtr) ctx; - - if (ctx == NULL) return(-1); - if (ctxt->dataFd == INVALID_SOCKET) return(0); - if (dest == NULL) return(-1); - if (len <= 0) return(0); - - len = recv(ctxt->dataFd, dest, len, 0); - if (len <= 0) { - if (len < 0) - __xmlIOErr(XML_FROM_FTP, 0, "recv failed"); - xmlNanoFTPCloseConnection(ctxt); - } - return(len); -} - -/** - * xmlNanoFTPOpen: - * @URL: the URL to the resource - * - * Start to fetch the given ftp:// resource - * - * Returns an FTP context, or NULL - */ - -void* -xmlNanoFTPOpen(const char *URL) { - xmlNanoFTPCtxtPtr ctxt; - SOCKET sock; - - xmlNanoFTPInit(); - if (URL == NULL) return(NULL); - if (strncmp("ftp://", URL, 6)) return(NULL); - - ctxt = (xmlNanoFTPCtxtPtr) xmlNanoFTPNewCtxt(URL); - if (ctxt == NULL) return(NULL); - if (xmlNanoFTPConnect(ctxt) < 0) { - xmlNanoFTPFreeCtxt(ctxt); - return(NULL); - } - sock = xmlNanoFTPGetSocket(ctxt, ctxt->path); - if (sock == INVALID_SOCKET) { - xmlNanoFTPFreeCtxt(ctxt); - return(NULL); - } - return(ctxt); -} - -/** - * xmlNanoFTPClose: - * @ctx: an FTP context - * - * Close the connection and both control and transport - * - * Returns -1 in case of error, 0 otherwise - */ - -int -xmlNanoFTPClose(void *ctx) { - xmlNanoFTPCtxtPtr ctxt = (xmlNanoFTPCtxtPtr) ctx; - - if (ctxt == NULL) - return(-1); - - if (ctxt->dataFd != INVALID_SOCKET) { - closesocket(ctxt->dataFd); - ctxt->dataFd = INVALID_SOCKET; - } - if (ctxt->controlFd != INVALID_SOCKET) { - xmlNanoFTPQuit(ctxt); - closesocket(ctxt->controlFd); - ctxt->controlFd = INVALID_SOCKET; - } - xmlNanoFTPFreeCtxt(ctxt); - return(0); -} - -#ifdef STANDALONE -/************************************************************************ - * * - * Basic test in Standalone mode * - * * - ************************************************************************/ -static -void ftpList(void *userData, const char *filename, const char* attrib, - const char *owner, const char *group, unsigned long size, int links, - int year, const char *month, int day, int hour, int minute) { - fprintf(stderr, - "%s %s %s %ld %s\n", attrib, owner, group, size, filename); -} -static -void ftpData(void *userData, const char *data, int len) { - if (userData == NULL) return; - if (len <= 0) { - fclose((FILE*)userData); - return; - } - fwrite(data, len, 1, (FILE*)userData); -} - -int main(int argc, char **argv) { - void *ctxt; - FILE *output; - char *tstfile = NULL; - - xmlNanoFTPInit(); - if (argc > 1) { - ctxt = xmlNanoFTPNewCtxt(argv[1]); - if (xmlNanoFTPConnect(ctxt) < 0) { - fprintf(stderr, - "Couldn't connect to %s\n", argv[1]); - exit(1); - } - if (argc > 2) - tstfile = argv[2]; - } else - ctxt = xmlNanoFTPConnectTo("localhost", 0); - if (ctxt == NULL) { - fprintf(stderr, - "Couldn't connect to localhost\n"); - exit(1); - } - xmlNanoFTPList(ctxt, ftpList, NULL, tstfile); - output = fopen("/tmp/tstdata", "w"); - if (output != NULL) { - if (xmlNanoFTPGet(ctxt, ftpData, (void *) output, tstfile) < 0) - fprintf(stderr, - "Failed to get file\n"); - - } - xmlNanoFTPClose(ctxt); - exit(0); -} -#endif /* STANDALONE */ -#else /* !LIBXML_FTP_ENABLED */ -#ifdef STANDALONE -#include -int main(int argc, char **argv) { - fprintf(stderr, - "%s : FTP support not compiled in\n", argv[0]); - return(0); -} -#endif /* STANDALONE */ -#endif /* LIBXML_FTP_ENABLED */ diff --git a/parser.c b/parser.c index 185d80a8..f1f002b8 100644 --- a/parser.c +++ b/parser.c @@ -563,12 +563,6 @@ xmlHasFeature(xmlFeature feature) return(1); #else return(0); -#endif - case XML_WITH_FTP: -#ifdef LIBXML_FTP_ENABLED - return(1); -#else - return(0); #endif case XML_WITH_HTTP: #ifdef LIBXML_HTTP_ENABLED @@ -13531,7 +13525,7 @@ xmlCtxtSetOptionsInternal(xmlParserCtxtPtr ctxt, int options, int keepMask) * * XML_PARSE_NONET * - * Disable network access with the builtin HTTP and FTP clients. + * Disable network access with the builtin HTTP client. * * XML_PARSE_NODICT * diff --git a/parserInternals.c b/parserInternals.c index 2bee5bdd..6c6c82f8 100644 --- a/parserInternals.c +++ b/parserInternals.c @@ -2288,8 +2288,7 @@ xmlDefaultExternalEntityLoader(const char *url, const char *ID, if ((ctxt != NULL) && (ctxt->options & XML_PARSE_NONET) && - ((xmlStrncasecmp(BAD_CAST url, BAD_CAST "ftp://", 6) == 0) || - (xmlStrncasecmp(BAD_CAST url, BAD_CAST "http://", 7) == 0))) { + (xmlStrncasecmp(BAD_CAST url, BAD_CAST "http://", 7) == 0)) { xmlCtxtErrIO(ctxt, XML_IO_NETWORK_ATTEMPT, url); } else { input = xmlNewInputFromFile(ctxt, url); diff --git a/python/libxml_wrap.h b/python/libxml_wrap.h index e9cc6e3e..23a31d69 100644 --- a/python/libxml_wrap.h +++ b/python/libxml_wrap.h @@ -4,7 +4,6 @@ #include #include #include -#include #include #include #include diff --git a/testapi.c b/testapi.c index d85e5609..3b1192a4 100644 --- a/testapi.c +++ b/testapi.c @@ -183,7 +183,6 @@ int main(int argc, char **argv) { #include #include #include -#include #include #include #include @@ -28533,156 +28532,6 @@ test_xmlFileRead(void) { } -static int -test_xmlIOFTPClose(void) { - int test_ret = 0; - -#if defined(LIBXML_FTP_ENABLED) - int mem_base; - int ret_val; - void * context; /* the I/O context */ - int n_context; - - for (n_context = 0;n_context < gen_nb_void_ptr;n_context++) { - mem_base = xmlMemBlocks(); - context = gen_void_ptr(n_context, 0); - - ret_val = xmlIOFTPClose(context); - desret_int(ret_val); - call_tests++; - des_void_ptr(n_context, context, 0); - xmlResetLastError(); - if (mem_base != xmlMemBlocks()) { - printf("Leak of %d blocks found in xmlIOFTPClose", - xmlMemBlocks() - mem_base); - test_ret++; - printf(" %d", n_context); - printf("\n"); - } - } - function_tests++; -#endif - - return(test_ret); -} - - -static int -test_xmlIOFTPMatch(void) { - int test_ret = 0; - -#if defined(LIBXML_FTP_ENABLED) - int mem_base; - int ret_val; - const char * filename; /* the URI for matching */ - int n_filename; - - for (n_filename = 0;n_filename < gen_nb_filepath;n_filename++) { - mem_base = xmlMemBlocks(); - filename = gen_filepath(n_filename, 0); - - ret_val = xmlIOFTPMatch(filename); - desret_int(ret_val); - call_tests++; - des_filepath(n_filename, filename, 0); - xmlResetLastError(); - if (mem_base != xmlMemBlocks()) { - printf("Leak of %d blocks found in xmlIOFTPMatch", - xmlMemBlocks() - mem_base); - test_ret++; - printf(" %d", n_filename); - printf("\n"); - } - } - function_tests++; -#endif - - return(test_ret); -} - - -static int -test_xmlIOFTPOpen(void) { - int test_ret = 0; - -#if defined(LIBXML_FTP_ENABLED) - int mem_base; - void * ret_val; - const char * filename; /* the URI for matching */ - int n_filename; - - for (n_filename = 0;n_filename < gen_nb_filepath;n_filename++) { - mem_base = xmlMemBlocks(); - filename = gen_filepath(n_filename, 0); - - ret_val = xmlIOFTPOpen(filename); - desret_void_ptr(ret_val); - call_tests++; - des_filepath(n_filename, filename, 0); - xmlResetLastError(); - if (mem_base != xmlMemBlocks()) { - printf("Leak of %d blocks found in xmlIOFTPOpen", - xmlMemBlocks() - mem_base); - test_ret++; - printf(" %d", n_filename); - printf("\n"); - } - } - function_tests++; -#endif - - return(test_ret); -} - - -static int -test_xmlIOFTPRead(void) { - int test_ret = 0; - -#if defined(LIBXML_FTP_ENABLED) - int mem_base; - int ret_val; - void * context; /* the I/O context */ - int n_context; - char * buffer; /* where to drop data */ - int n_buffer; - int len; /* number of bytes to write */ - int n_len; - - for (n_context = 0;n_context < gen_nb_void_ptr;n_context++) { - for (n_buffer = 0;n_buffer < gen_nb_char_ptr;n_buffer++) { - for (n_len = 0;n_len < gen_nb_int;n_len++) { - mem_base = xmlMemBlocks(); - context = gen_void_ptr(n_context, 0); - buffer = gen_char_ptr(n_buffer, 1); - len = gen_int(n_len, 2); - - ret_val = xmlIOFTPRead(context, buffer, len); - desret_int(ret_val); - call_tests++; - des_void_ptr(n_context, context, 0); - des_char_ptr(n_buffer, buffer, 1); - des_int(n_len, len, 2); - xmlResetLastError(); - if (mem_base != xmlMemBlocks()) { - printf("Leak of %d blocks found in xmlIOFTPRead", - xmlMemBlocks() - mem_base); - test_ret++; - printf(" %d", n_context); - printf(" %d", n_buffer); - printf(" %d", n_len); - printf("\n"); - } - } - } - } - function_tests++; -#endif - - return(test_ret); -} - - static int test_xmlIOHTTPClose(void) { int test_ret = 0; @@ -29783,7 +29632,7 @@ static int test_xmlIO(void) { int test_ret = 0; - if (quiet == 0) printf("Testing xmlIO : 41 of 55 functions ...\n"); + if (quiet == 0) printf("Testing xmlIO : 37 of 51 functions ...\n"); test_ret += test_xmlAllocOutputBuffer(); test_ret += test_xmlAllocParserInputBuffer(); test_ret += test_xmlCheckFilename(); @@ -29794,10 +29643,6 @@ test_xmlIO(void) { test_ret += test_xmlFileMatch(); test_ret += test_xmlFileOpen(); test_ret += test_xmlFileRead(); - test_ret += test_xmlIOFTPClose(); - test_ret += test_xmlIOFTPMatch(); - test_ret += test_xmlIOFTPOpen(); - test_ret += test_xmlIOFTPRead(); test_ret += test_xmlIOHTTPClose(); test_ret += test_xmlIOHTTPMatch(); test_ret += test_xmlIOHTTPOpen(); diff --git a/win32/Makefile.bcb b/win32/Makefile.bcb index 49ea0afd..be615b70 100644 --- a/win32/Makefile.bcb +++ b/win32/Makefile.bcb @@ -77,7 +77,7 @@ LIBS = $(LIBS) cw32i.lib !else LIBS = $(LIBS) cw32.lib !endif -!if "$(WITH_FTP)" == "1" || "$(WITH_HTTP)" == "1" +!if "$(WITH_HTTP)" == "1" LIBS = $(LIBS) wsock32.lib ws2_32.lib !endif !if "$(WITH_ICONV)" == "1" @@ -125,7 +125,6 @@ XML_OBJS = $(XML_INTDIR)\buf.obj\ $(XML_INTDIR)\HTMLtree.obj\ $(XML_INTDIR)\legacy.obj\ $(XML_INTDIR)\list.obj\ - $(XML_INTDIR)\nanoftp.obj\ $(XML_INTDIR)\nanohttp.obj\ $(XML_INTDIR)\parser.obj\ $(XML_INTDIR)\parserInternals.obj\ @@ -170,7 +169,6 @@ XML_OBJS_A = $(XML_INTDIR_A)\buf.obj\ $(XML_INTDIR_A)\HTMLtree.obj\ $(XML_INTDIR_A)\legacy.obj\ $(XML_INTDIR_A)\list.obj\ - $(XML_INTDIR_A)\nanoftp.obj\ $(XML_INTDIR_A)\nanohttp.obj\ $(XML_INTDIR_A)\parser.obj\ $(XML_INTDIR_A)\parserInternals.obj\ diff --git a/win32/Makefile.mingw b/win32/Makefile.mingw index 087583fa..ea276455 100644 --- a/win32/Makefile.mingw +++ b/win32/Makefile.mingw @@ -52,9 +52,6 @@ LDFLAGS += -Wl,--major-image-version,$(LIBXML_MAJOR_VERSION) LDFLAGS += -Wl,--minor-image-version,$(LIBXML_MINOR_VERSION) LDFLAGS += -Wl,-L,$(BINDIR) -Wl,-L,$(LIBPREFIX) LIBS = -ifeq ($(WITH_FTP),1) -LIBS += -lwsock32 -lws2_32 -endif ifeq ($(WITH_HTTP),1) LIBS += -lwsock32 -lws2_32 endif @@ -108,7 +105,6 @@ XML_OBJS = $(XML_INTDIR)/buf.o\ $(XML_INTDIR)/HTMLtree.o\ $(XML_INTDIR)/legacy.o\ $(XML_INTDIR)/list.o\ - $(XML_INTDIR)/nanoftp.o\ $(XML_INTDIR)/nanohttp.o\ $(XML_INTDIR)/parser.o\ $(XML_INTDIR)/parserInternals.o\ @@ -155,7 +151,6 @@ XML_OBJS_A = $(XML_INTDIR_A)/buf.o\ $(XML_INTDIR_A)/HTMLtree.o\ $(XML_INTDIR_A)/legacy.o\ $(XML_INTDIR_A)/list.o\ - $(XML_INTDIR_A)/nanoftp.o\ $(XML_INTDIR_A)/nanohttp.o\ $(XML_INTDIR_A)/parser.o\ $(XML_INTDIR_A)/parserInternals.o\ diff --git a/win32/Makefile.msvc b/win32/Makefile.msvc index ce877a5e..9340cd31 100644 --- a/win32/Makefile.msvc +++ b/win32/Makefile.msvc @@ -54,7 +54,7 @@ LD = link.exe LDFLAGS = /nologo /VERSION:$(LIBXML_MAJOR_VERSION).$(LIBXML_MINOR_VERSION) LDFLAGS = $(LDFLAGS) /LIBPATH:$(BINDIR) /LIBPATH:$(LIBPREFIX) LIBS = -!if "$(WITH_FTP)" == "1" || "$(WITH_HTTP)" == "1" +!if "$(WITH_HTTP)" == "1" LIBS = $(LIBS) wsock32.lib ws2_32.lib !endif !if "$(WITH_ICONV)" == "1" @@ -118,7 +118,6 @@ XML_OBJS = $(XML_INTDIR)\buf.obj\ $(XML_INTDIR)\HTMLtree.obj\ $(XML_INTDIR)\legacy.obj\ $(XML_INTDIR)\list.obj\ - $(XML_INTDIR)\nanoftp.obj\ $(XML_INTDIR)\nanohttp.obj\ $(XML_INTDIR)\parser.obj\ $(XML_INTDIR)\parserInternals.obj\ @@ -163,7 +162,6 @@ XML_OBJS_A = $(XML_INTDIR_A)\buf.obj\ $(XML_INTDIR_A)\HTMLtree.obj\ $(XML_INTDIR_A)\legacy.obj\ $(XML_INTDIR_A)\list.obj\ - $(XML_INTDIR_A)\nanoftp.obj\ $(XML_INTDIR_A)\nanohttp.obj\ $(XML_INTDIR_A)\parser.obj\ $(XML_INTDIR_A)\parserInternals.obj\ @@ -208,7 +206,6 @@ XML_OBJS_A_DLL = $(XML_INTDIR_A_DLL)\buf.obj\ $(XML_INTDIR_A_DLL)\HTMLtree.obj\ $(XML_INTDIR_A_DLL)\legacy.obj\ $(XML_INTDIR_A_DLL)\list.obj\ - $(XML_INTDIR_A_DLL)\nanoftp.obj\ $(XML_INTDIR_A_DLL)\nanohttp.obj\ $(XML_INTDIR_A_DLL)\parser.obj\ $(XML_INTDIR_A_DLL)\parserInternals.obj\ diff --git a/win32/configure.js b/win32/configure.js index a73cb598..5ae25a69 100644 --- a/win32/configure.js +++ b/win32/configure.js @@ -29,7 +29,6 @@ var verCvs; var useCvsVer = true; /* Libxml features. */ var withThreads = "native"; -var withFtp = true; var withHttp = true; var withHtml = true; var withC14n = true; @@ -112,7 +111,6 @@ function usage() txt += "either 'yes' or 'no', if not stated otherwise.\n\n"; txt += "\nXML processor options, default value given in parentheses:\n\n"; txt += " threads: Enable thread safety [no|ctls|native|posix] (" + (withThreads) + ") \n"; - txt += " ftp: Enable FTP client (" + (withFtp? "yes" : "no") + ")\n"; txt += " http: Enable HTTP client (" + (withHttp? "yes" : "no") + ")\n"; txt += " html: Enable HTML processor (" + (withHtml? "yes" : "no") + ")\n"; txt += " c14n: Enable C14N support (" + (withC14n? "yes" : "no") + ")\n"; @@ -206,7 +204,6 @@ function discoverVersion() vf.WriteLine("XML_SRCDIR=" + srcDirXml); vf.WriteLine("UTILS_SRCDIR=" + srcDirUtils); vf.WriteLine("WITH_THREADS=" + withThreads); - vf.WriteLine("WITH_FTP=" + (withFtp? "1" : "0")); vf.WriteLine("WITH_HTTP=" + (withHttp? "1" : "0")); vf.WriteLine("WITH_HTML=" + (withHtml? "1" : "0")); vf.WriteLine("WITH_C14N=" + (withC14n? "1" : "0")); @@ -294,8 +291,6 @@ function configureLibxml() of.WriteLine(s.replace(/\@WITH_THREADS\@/, withThreads == "no"? "0" : "1")); } else if (s.search(/\@WITH_THREAD_ALLOC\@/) != -1) { of.WriteLine(s.replace(/\@WITH_THREAD_ALLOC\@/, "0")); - } else if (s.search(/\@WITH_FTP\@/) != -1) { - of.WriteLine(s.replace(/\@WITH_FTP\@/, withFtp? "1" : "0")); } else if (s.search(/\@WITH_HTTP\@/) != -1) { of.WriteLine(s.replace(/\@WITH_HTTP\@/, withHttp? "1" : "0")); } else if (s.search(/\@WITH_HTML\@/) != -1) { @@ -443,8 +438,6 @@ for (i = 0; (i < WScript.Arguments.length) && (error == 0); i++) { if (opt.length > 0) { if (opt == "threads") withThreads = arg.substring(opt.length + 1, arg.length); - else if (opt == "ftp") - withFtp = strToBool(arg.substring(opt.length + 1, arg.length)); else if (opt == "http") withHttp = strToBool(arg.substring(opt.length + 1, arg.length)); else if (opt == "html") @@ -634,7 +627,6 @@ WScript.Echo("Created config.h."); var txtOut = "\nXML processor configuration\n"; txtOut += "---------------------------\n"; txtOut += " Thread safety: " + withThreads + "\n"; -txtOut += " FTP client: " + boolToStr(withFtp) + "\n"; txtOut += " HTTP client: " + boolToStr(withHttp) + "\n"; txtOut += " HTML processor: " + boolToStr(withHtml) + "\n"; txtOut += " C14N support: " + boolToStr(withC14n) + "\n"; diff --git a/xmlIO.c b/xmlIO.c index a9a9fe34..ac2cf0d2 100644 --- a/xmlIO.c +++ b/xmlIO.c @@ -40,7 +40,6 @@ #include #include #include -#include #include #include #ifdef LIBXML_CATALOG_ENABLED @@ -1013,78 +1012,6 @@ xmlIOHTTPClose (void * context) { } #endif /* LIBXML_HTTP_ENABLED */ -#ifdef LIBXML_FTP_ENABLED -/************************************************************************ - * * - * I/O for FTP file accesses * - * * - ************************************************************************/ -/** - * xmlIOFTPMatch: - * @filename: the URI for matching - * - * DEPRECATED: Internal function, don't use. - * - * check if the URI matches an FTP one - * - * Returns 1 if matches, 0 otherwise - */ -int -xmlIOFTPMatch (const char *filename) { - if (!xmlStrncasecmp(BAD_CAST filename, BAD_CAST "ftp://", 6)) - return(1); - return(0); -} - -/** - * xmlIOFTPOpen: - * @filename: the URI for matching - * - * DEPRECATED: Internal function, don't use. - * - * open an FTP I/O channel - * - * Returns an I/O context or NULL in case of error - */ -void * -xmlIOFTPOpen (const char *filename) { - return(xmlNanoFTPOpen(filename)); -} - -/** - * xmlIOFTPRead: - * @context: the I/O context - * @buffer: where to drop data - * @len: number of bytes to write - * - * DEPRECATED: Internal function, don't use. - * - * Read @len bytes to @buffer from the I/O channel. - * - * Returns the number of bytes written - */ -int -xmlIOFTPRead(void * context, char * buffer, int len) { - if ((buffer == NULL) || (len < 0)) return(-1); - return(xmlNanoFTPRead(context, &buffer[0], len)); -} - -/** - * xmlIOFTPClose: - * @context: the I/O context - * - * DEPRECATED: Internal function, don't use. - * - * Close an FTP I/O channel - * - * Returns 0 - */ -int -xmlIOFTPClose (void * context) { - return ( xmlNanoFTPClose(context) ); -} -#endif /* LIBXML_FTP_ENABLED */ - /************************************************************************ * * * Input/output buffers * @@ -1113,21 +1040,6 @@ xmlInputDefaultOpen(xmlParserInputBufferPtr buf, const char *filename, /* Avoid unused variable warning */ (void) flags; -#ifdef LIBXML_FTP_ENABLED - if (xmlIOFTPMatch(filename)) { - if ((flags & XML_INPUT_NETWORK) == 0) - return(XML_IO_NETWORK_ATTEMPT); - - buf->context = xmlIOFTPOpen(filename); - - if (buf->context != NULL) { - buf->readcallback = xmlIOFTPRead; - buf->closecallback = xmlIOFTPClose; - return(XML_ERR_OK); - } - } -#endif /* LIBXML_FTP_ENABLED */ - #ifdef LIBXML_HTTP_ENABLED if (xmlIOHTTPMatch(filename)) { if ((flags & XML_INPUT_NETWORK) == 0) diff --git a/xmllint.c b/xmllint.c index 2864d8b6..0a8ccd33 100644 --- a/xmllint.c +++ b/xmllint.c @@ -2882,7 +2882,6 @@ static void showVersion(const char *name) { if (xmlHasFeature(XML_WITH_PATTERN)) fprintf(ERR_STREAM, "Patterns "); if (xmlHasFeature(XML_WITH_WRITER)) fprintf(ERR_STREAM, "Writer "); if (xmlHasFeature(XML_WITH_SAX1)) fprintf(ERR_STREAM, "SAXv1 "); - if (xmlHasFeature(XML_WITH_FTP)) fprintf(ERR_STREAM, "FTP "); if (xmlHasFeature(XML_WITH_HTTP)) fprintf(ERR_STREAM, "HTTP "); if (xmlHasFeature(XML_WITH_VALID)) fprintf(ERR_STREAM, "DTDValid "); if (xmlHasFeature(XML_WITH_HTML)) fprintf(ERR_STREAM, "HTML ");