mirror of
https://github.com/reactos/reactos.git
synced 2025-07-01 13:01:24 +00:00
Update libxml to 2.7.7
Resync zlib to 1.2.5. Patch by Samuel Serapion and some lil includes cleanup by me. svn path=/trunk/; revision=47933
This commit is contained in:
parent
a15dcc4250
commit
35deb4dbb9
49 changed files with 1927 additions and 8666 deletions
|
@ -182,6 +182,7 @@ typedef enum {
|
||||||
HTML_PARSE_PEDANTIC = 1<<7, /* pedantic error reporting */
|
HTML_PARSE_PEDANTIC = 1<<7, /* pedantic error reporting */
|
||||||
HTML_PARSE_NOBLANKS = 1<<8, /* remove blank nodes */
|
HTML_PARSE_NOBLANKS = 1<<8, /* remove blank nodes */
|
||||||
HTML_PARSE_NONET = 1<<11,/* Forbid network access */
|
HTML_PARSE_NONET = 1<<11,/* Forbid network access */
|
||||||
|
HTML_PARSE_NOIMPLIED= 1<<13,/* Do not add implied html/body... elements */
|
||||||
HTML_PARSE_COMPACT = 1<<16 /* compact small text nodes */
|
HTML_PARSE_COMPACT = 1<<16 /* compact small text nodes */
|
||||||
} htmlParserOption;
|
} htmlParserOption;
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
# Makefile.in generated by automake 1.11 from Makefile.am.
|
# Makefile.in generated by automake 1.11.1 from Makefile.am.
|
||||||
# @configure_input@
|
# @configure_input@
|
||||||
|
|
||||||
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
||||||
|
@ -38,8 +38,10 @@ subdir = include/libxml
|
||||||
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
|
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
|
||||||
$(srcdir)/xmlversion.h.in $(xmlinc_HEADERS)
|
$(srcdir)/xmlversion.h.in $(xmlinc_HEADERS)
|
||||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||||
am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
|
am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
|
||||||
$(top_srcdir)/configure.in
|
$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
|
||||||
|
$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
|
||||||
|
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
|
||||||
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
|
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
|
||||||
$(ACLOCAL_M4)
|
$(ACLOCAL_M4)
|
||||||
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
|
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
|
||||||
|
|
|
@ -24,7 +24,6 @@
|
||||||
|
|
||||||
#include <libxml/xmlversion.h>
|
#include <libxml/xmlversion.h>
|
||||||
|
|
||||||
#undef LIBXML_ICONV_ENABLED
|
|
||||||
#ifdef LIBXML_ICONV_ENABLED
|
#ifdef LIBXML_ICONV_ENABLED
|
||||||
#include <iconv.h>
|
#include <iconv.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -302,6 +302,12 @@ struct _xmlParserCtxt {
|
||||||
xmlParserMode parseMode; /* the parser mode */
|
xmlParserMode parseMode; /* the parser mode */
|
||||||
unsigned long nbentities; /* number of entities references */
|
unsigned long nbentities; /* number of entities references */
|
||||||
unsigned long sizeentities; /* size of parsed entities */
|
unsigned long sizeentities; /* size of parsed entities */
|
||||||
|
|
||||||
|
/* for use by HTML non-recursive parser */
|
||||||
|
xmlParserNodeInfo *nodeInfo; /* Current NodeInfo */
|
||||||
|
int nodeInfoNr; /* Depth of the parsing stack */
|
||||||
|
int nodeInfoMax; /* Max depth of the parsing stack */
|
||||||
|
xmlParserNodeInfo *nodeInfoTab; /* array of nodeInfos */
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -113,7 +113,7 @@
|
||||||
* _imp__xmlFree listed as missing. Try to workaround the problem
|
* _imp__xmlFree listed as missing. Try to workaround the problem
|
||||||
* by also making that declaration when compiling client code.
|
* by also making that declaration when compiling client code.
|
||||||
*/
|
*/
|
||||||
#if !defined(LIBXML_STATIC)
|
#if defined(IN_LIBXML) && !defined(LIBXML_STATIC)
|
||||||
#define XMLPUBFUN __declspec(dllexport)
|
#define XMLPUBFUN __declspec(dllexport)
|
||||||
#define XMLPUBVAR __declspec(dllexport)
|
#define XMLPUBVAR __declspec(dllexport)
|
||||||
#else
|
#else
|
||||||
|
|
|
@ -29,28 +29,28 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version);
|
||||||
*
|
*
|
||||||
* the version string like "1.2.3"
|
* the version string like "1.2.3"
|
||||||
*/
|
*/
|
||||||
#define LIBXML_DOTTED_VERSION "2.7.6"
|
#define LIBXML_DOTTED_VERSION "2.7.7"
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* LIBXML_VERSION:
|
* LIBXML_VERSION:
|
||||||
*
|
*
|
||||||
* the version number: 1.2.3 value is 10203
|
* the version number: 1.2.3 value is 10203
|
||||||
*/
|
*/
|
||||||
#define LIBXML_VERSION 20706
|
#define LIBXML_VERSION 20707
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* LIBXML_VERSION_STRING:
|
* LIBXML_VERSION_STRING:
|
||||||
*
|
*
|
||||||
* the version number string, 1.2.3 value is "10203"
|
* the version number string, 1.2.3 value is "10203"
|
||||||
*/
|
*/
|
||||||
#define LIBXML_VERSION_STRING "20706"
|
#define LIBXML_VERSION_STRING "20707"
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* LIBXML_VERSION_EXTRA:
|
* LIBXML_VERSION_EXTRA:
|
||||||
*
|
*
|
||||||
* extra version information, used to show a CVS compilation
|
* extra version information, used to show a CVS compilation
|
||||||
*/
|
*/
|
||||||
#define LIBXML_VERSION_EXTRA "-GITv2.7.6"
|
#define LIBXML_VERSION_EXTRA "-GITv2.7.6-36-g06c93b7"
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* LIBXML_TEST_VERSION:
|
* LIBXML_TEST_VERSION:
|
||||||
|
@ -58,7 +58,7 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version);
|
||||||
* Macro to check that the libxml version in use is compatible with
|
* Macro to check that the libxml version in use is compatible with
|
||||||
* the version the software has been compiled against
|
* the version the software has been compiled against
|
||||||
*/
|
*/
|
||||||
#define LIBXML_TEST_VERSION xmlCheckVersion(20706);
|
#define LIBXML_TEST_VERSION xmlCheckVersion(20707);
|
||||||
|
|
||||||
#ifndef VMS
|
#ifndef VMS
|
||||||
#if 0
|
#if 0
|
||||||
|
@ -264,7 +264,7 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version);
|
||||||
*
|
*
|
||||||
* Whether iconv support is available
|
* Whether iconv support is available
|
||||||
*/
|
*/
|
||||||
#if 1
|
#if 0
|
||||||
#define LIBXML_ICONV_ENABLED
|
#define LIBXML_ICONV_ENABLED
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
386
reactos/lib/3rdparty/libxml2/HTMLparser.c
vendored
386
reactos/lib/3rdparty/libxml2/HTMLparser.c
vendored
|
@ -209,6 +209,59 @@ htmlnamePop(htmlParserCtxtPtr ctxt)
|
||||||
return (ret);
|
return (ret);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* htmlNodeInfoPush:
|
||||||
|
* @ctxt: an HTML parser context
|
||||||
|
* @value: the node info
|
||||||
|
*
|
||||||
|
* Pushes a new element name on top of the node info stack
|
||||||
|
*
|
||||||
|
* Returns 0 in case of error, the index in the stack otherwise
|
||||||
|
*/
|
||||||
|
static int
|
||||||
|
htmlNodeInfoPush(htmlParserCtxtPtr ctxt, htmlParserNodeInfo *value)
|
||||||
|
{
|
||||||
|
if (ctxt->nodeInfoNr >= ctxt->nodeInfoMax) {
|
||||||
|
if (ctxt->nodeInfoMax == 0)
|
||||||
|
ctxt->nodeInfoMax = 5;
|
||||||
|
ctxt->nodeInfoMax *= 2;
|
||||||
|
ctxt->nodeInfoTab = (htmlParserNodeInfo *)
|
||||||
|
xmlRealloc((htmlParserNodeInfo *)ctxt->nodeInfoTab,
|
||||||
|
ctxt->nodeInfoMax *
|
||||||
|
sizeof(ctxt->nodeInfoTab[0]));
|
||||||
|
if (ctxt->nodeInfoTab == NULL) {
|
||||||
|
htmlErrMemory(ctxt, NULL);
|
||||||
|
return (0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
ctxt->nodeInfoTab[ctxt->nodeInfoNr] = *value;
|
||||||
|
ctxt->nodeInfo = &ctxt->nodeInfoTab[ctxt->nodeInfoNr];
|
||||||
|
return (ctxt->nodeInfoNr++);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* htmlNodeInfoPop:
|
||||||
|
* @ctxt: an HTML parser context
|
||||||
|
*
|
||||||
|
* Pops the top element name from the node info stack
|
||||||
|
*
|
||||||
|
* Returns 0 in case of error, the pointer to NodeInfo otherwise
|
||||||
|
*/
|
||||||
|
static htmlParserNodeInfo *
|
||||||
|
htmlNodeInfoPop(htmlParserCtxtPtr ctxt)
|
||||||
|
{
|
||||||
|
if (ctxt->nodeInfoNr <= 0)
|
||||||
|
return (NULL);
|
||||||
|
ctxt->nodeInfoNr--;
|
||||||
|
if (ctxt->nodeInfoNr < 0)
|
||||||
|
return (NULL);
|
||||||
|
if (ctxt->nodeInfoNr > 0)
|
||||||
|
ctxt->nodeInfo = &ctxt->nodeInfoTab[ctxt->nodeInfoNr - 1];
|
||||||
|
else
|
||||||
|
ctxt->nodeInfo = NULL;
|
||||||
|
return &ctxt->nodeInfoTab[ctxt->nodeInfoNr];
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Macros for accessing the content. Those should be used only by the parser,
|
* Macros for accessing the content. Those should be used only by the parser,
|
||||||
* and not exported.
|
* and not exported.
|
||||||
|
@ -267,8 +320,6 @@ htmlnamePop(htmlParserCtxtPtr ctxt)
|
||||||
#define NEXT xmlNextChar(ctxt)
|
#define NEXT xmlNextChar(ctxt)
|
||||||
|
|
||||||
#define RAW (ctxt->token ? -1 : (*ctxt->input->cur))
|
#define RAW (ctxt->token ? -1 : (*ctxt->input->cur))
|
||||||
#define NXT(val) ctxt->input->cur[(val)]
|
|
||||||
#define CUR_PTR ctxt->input->cur
|
|
||||||
|
|
||||||
|
|
||||||
#define NEXTL(l) do { \
|
#define NEXTL(l) do { \
|
||||||
|
@ -567,9 +618,9 @@ htmlSkipBlankChars(xmlParserCtxtPtr ctxt) {
|
||||||
#define NB_PHRASE 10
|
#define NB_PHRASE 10
|
||||||
#define SPECIAL "a", "img", "applet", "embed", "object", "font", "basefont", "br", "script", "map", "q", "sub", "sup", "span", "bdo", "iframe"
|
#define SPECIAL "a", "img", "applet", "embed", "object", "font", "basefont", "br", "script", "map", "q", "sub", "sup", "span", "bdo", "iframe"
|
||||||
#define NB_SPECIAL 16
|
#define NB_SPECIAL 16
|
||||||
#define INLINE PCDATA FONTSTYLE PHRASE SPECIAL FORMCTRL
|
#define INLINE FONTSTYLE, PHRASE, SPECIAL, FORMCTRL
|
||||||
#define NB_INLINE NB_PCDATA + NB_FONTSTYLE + NB_PHRASE + NB_SPECIAL + NB_FORMCTRL
|
#define NB_INLINE NB_PCDATA + NB_FONTSTYLE + NB_PHRASE + NB_SPECIAL + NB_FORMCTRL
|
||||||
#define BLOCK HEADING, LIST "pre", "p", "dl", "div", "center", "noscript", "noframes", "blockquote", "form", "isindex", "hr", "table", "fieldset", "address"
|
#define BLOCK HEADING, LIST, "pre", "p", "dl", "div", "center", "noscript", "noframes", "blockquote", "form", "isindex", "hr", "table", "fieldset", "address"
|
||||||
#define NB_BLOCK NB_HEADING + NB_LIST + 14
|
#define NB_BLOCK NB_HEADING + NB_LIST + 14
|
||||||
#define FORMCTRL "input", "select", "textarea", "label", "button"
|
#define FORMCTRL "input", "select", "textarea", "label", "button"
|
||||||
#define NB_FORMCTRL 5
|
#define NB_FORMCTRL 5
|
||||||
|
@ -1394,6 +1445,8 @@ static void
|
||||||
htmlCheckImplied(htmlParserCtxtPtr ctxt, const xmlChar *newtag) {
|
htmlCheckImplied(htmlParserCtxtPtr ctxt, const xmlChar *newtag) {
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
|
if (ctxt->options & HTML_PARSE_NOIMPLIED)
|
||||||
|
return;
|
||||||
if (!htmlOmittedDefaultValue)
|
if (!htmlOmittedDefaultValue)
|
||||||
return;
|
return;
|
||||||
if (xmlStrEqual(newtag, BAD_CAST"html"))
|
if (xmlStrEqual(newtag, BAD_CAST"html"))
|
||||||
|
@ -3373,11 +3426,6 @@ htmlParseAttribute(htmlParserCtxtPtr ctxt, xmlChar **value) {
|
||||||
NEXT;
|
NEXT;
|
||||||
SKIP_BLANKS;
|
SKIP_BLANKS;
|
||||||
val = htmlParseAttValue(ctxt);
|
val = htmlParseAttValue(ctxt);
|
||||||
} else if (htmlIsBooleanAttr(name)) {
|
|
||||||
/*
|
|
||||||
* assume a minimized attribute
|
|
||||||
*/
|
|
||||||
val = xmlStrdup(name);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
*value = val;
|
*value = val;
|
||||||
|
@ -3476,6 +3524,8 @@ htmlCheckEncoding(htmlParserCtxtPtr ctxt, const xmlChar *attvalue) {
|
||||||
}
|
}
|
||||||
ctxt->input->base =
|
ctxt->input->base =
|
||||||
ctxt->input->cur = ctxt->input->buf->buffer->content;
|
ctxt->input->cur = ctxt->input->buf->buffer->content;
|
||||||
|
ctxt->input->end =
|
||||||
|
&ctxt->input->base[ctxt->input->buf->buffer->use];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -3925,6 +3975,7 @@ htmlParseReference(htmlParserCtxtPtr ctxt) {
|
||||||
* @ctxt: an HTML parser context
|
* @ctxt: an HTML parser context
|
||||||
*
|
*
|
||||||
* Parse a content: comment, sub-element, reference or text.
|
* Parse a content: comment, sub-element, reference or text.
|
||||||
|
* Kept for compatibility with old code
|
||||||
*/
|
*/
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
@ -4072,24 +4123,12 @@ htmlParseContent(htmlParserCtxtPtr ctxt) {
|
||||||
if (currentNode != NULL) xmlFree(currentNode);
|
if (currentNode != NULL) xmlFree(currentNode);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* htmlParseContent:
|
|
||||||
* @ctxt: an HTML parser context
|
|
||||||
*
|
|
||||||
* Parse a content: comment, sub-element, reference or text.
|
|
||||||
*/
|
|
||||||
|
|
||||||
void
|
|
||||||
__htmlParseContent(void *ctxt) {
|
|
||||||
if (ctxt != NULL)
|
|
||||||
htmlParseContent((htmlParserCtxtPtr) ctxt);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* htmlParseElement:
|
* htmlParseElement:
|
||||||
* @ctxt: an HTML parser context
|
* @ctxt: an HTML parser context
|
||||||
*
|
*
|
||||||
* parse an HTML element, this is highly recursive
|
* parse an HTML element, this is highly recursive
|
||||||
|
* this is kept for compatibility with previous code versions
|
||||||
*
|
*
|
||||||
* [39] element ::= EmptyElemTag | STag content ETag
|
* [39] element ::= EmptyElemTag | STag content ETag
|
||||||
*
|
*
|
||||||
|
@ -4217,6 +4256,301 @@ htmlParseElement(htmlParserCtxtPtr ctxt) {
|
||||||
xmlFree(currentNode);
|
xmlFree(currentNode);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
htmlParserFinishElementParsing(htmlParserCtxtPtr ctxt) {
|
||||||
|
/*
|
||||||
|
* Capture end position and add node
|
||||||
|
*/
|
||||||
|
if ( ctxt->node != NULL && ctxt->record_info ) {
|
||||||
|
ctxt->nodeInfo->end_pos = ctxt->input->consumed +
|
||||||
|
(CUR_PTR - ctxt->input->base);
|
||||||
|
ctxt->nodeInfo->end_line = ctxt->input->line;
|
||||||
|
ctxt->nodeInfo->node = ctxt->node;
|
||||||
|
xmlParserAddNodeInfo(ctxt, ctxt->nodeInfo);
|
||||||
|
htmlNodeInfoPop(ctxt);
|
||||||
|
}
|
||||||
|
if (!IS_CHAR_CH(CUR)) {
|
||||||
|
htmlAutoCloseOnEnd(ctxt);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* htmlParseElementInternal:
|
||||||
|
* @ctxt: an HTML parser context
|
||||||
|
*
|
||||||
|
* parse an HTML element, new version, non recursive
|
||||||
|
*
|
||||||
|
* [39] element ::= EmptyElemTag | STag content ETag
|
||||||
|
*
|
||||||
|
* [41] Attribute ::= Name Eq AttValue
|
||||||
|
*/
|
||||||
|
|
||||||
|
static void
|
||||||
|
htmlParseElementInternal(htmlParserCtxtPtr ctxt) {
|
||||||
|
const xmlChar *name;
|
||||||
|
const htmlElemDesc * info;
|
||||||
|
htmlParserNodeInfo node_info;
|
||||||
|
int failed;
|
||||||
|
|
||||||
|
if ((ctxt == NULL) || (ctxt->input == NULL)) {
|
||||||
|
htmlParseErr(ctxt, XML_ERR_INTERNAL_ERROR,
|
||||||
|
"htmlParseElementInternal: context error\n", NULL, NULL);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (ctxt->instate == XML_PARSER_EOF)
|
||||||
|
return;
|
||||||
|
|
||||||
|
/* Capture start position */
|
||||||
|
if (ctxt->record_info) {
|
||||||
|
node_info.begin_pos = ctxt->input->consumed +
|
||||||
|
(CUR_PTR - ctxt->input->base);
|
||||||
|
node_info.begin_line = ctxt->input->line;
|
||||||
|
}
|
||||||
|
|
||||||
|
failed = htmlParseStartTag(ctxt);
|
||||||
|
name = ctxt->name;
|
||||||
|
if ((failed == -1) || (name == NULL)) {
|
||||||
|
if (CUR == '>')
|
||||||
|
NEXT;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Lookup the info for that element.
|
||||||
|
*/
|
||||||
|
info = htmlTagLookup(name);
|
||||||
|
if (info == NULL) {
|
||||||
|
htmlParseErr(ctxt, XML_HTML_UNKNOWN_TAG,
|
||||||
|
"Tag %s invalid\n", name, NULL);
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Check for an Empty Element labeled the XML/SGML way
|
||||||
|
*/
|
||||||
|
if ((CUR == '/') && (NXT(1) == '>')) {
|
||||||
|
SKIP(2);
|
||||||
|
if ((ctxt->sax != NULL) && (ctxt->sax->endElement != NULL))
|
||||||
|
ctxt->sax->endElement(ctxt->userData, name);
|
||||||
|
htmlnamePop(ctxt);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (CUR == '>') {
|
||||||
|
NEXT;
|
||||||
|
} else {
|
||||||
|
htmlParseErr(ctxt, XML_ERR_GT_REQUIRED,
|
||||||
|
"Couldn't find end of Start Tag %s\n", name, NULL);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* end of parsing of this node.
|
||||||
|
*/
|
||||||
|
if (xmlStrEqual(name, ctxt->name)) {
|
||||||
|
nodePop(ctxt);
|
||||||
|
htmlnamePop(ctxt);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (ctxt->record_info)
|
||||||
|
htmlNodeInfoPush(ctxt, &node_info);
|
||||||
|
htmlParserFinishElementParsing(ctxt);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Check for an Empty Element from DTD definition
|
||||||
|
*/
|
||||||
|
if ((info != NULL) && (info->empty)) {
|
||||||
|
if ((ctxt->sax != NULL) && (ctxt->sax->endElement != NULL))
|
||||||
|
ctxt->sax->endElement(ctxt->userData, name);
|
||||||
|
htmlnamePop(ctxt);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (ctxt->record_info)
|
||||||
|
htmlNodeInfoPush(ctxt, &node_info);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* htmlParseContentInternal:
|
||||||
|
* @ctxt: an HTML parser context
|
||||||
|
*
|
||||||
|
* Parse a content: comment, sub-element, reference or text.
|
||||||
|
* New version for non recursive htmlParseElementInternal
|
||||||
|
*/
|
||||||
|
|
||||||
|
static void
|
||||||
|
htmlParseContentInternal(htmlParserCtxtPtr ctxt) {
|
||||||
|
xmlChar *currentNode;
|
||||||
|
int depth;
|
||||||
|
const xmlChar *name;
|
||||||
|
|
||||||
|
currentNode = xmlStrdup(ctxt->name);
|
||||||
|
depth = ctxt->nameNr;
|
||||||
|
while (1) {
|
||||||
|
long cons = ctxt->nbChars;
|
||||||
|
|
||||||
|
GROW;
|
||||||
|
|
||||||
|
if (ctxt->instate == XML_PARSER_EOF)
|
||||||
|
break;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Our tag or one of it's parent or children is ending.
|
||||||
|
*/
|
||||||
|
if ((CUR == '<') && (NXT(1) == '/')) {
|
||||||
|
if (htmlParseEndTag(ctxt) &&
|
||||||
|
((currentNode != NULL) || (ctxt->nameNr == 0))) {
|
||||||
|
if (currentNode != NULL)
|
||||||
|
xmlFree(currentNode);
|
||||||
|
|
||||||
|
currentNode = xmlStrdup(ctxt->name);
|
||||||
|
depth = ctxt->nameNr;
|
||||||
|
}
|
||||||
|
continue; /* while */
|
||||||
|
}
|
||||||
|
|
||||||
|
else if ((CUR == '<') &&
|
||||||
|
((IS_ASCII_LETTER(NXT(1))) ||
|
||||||
|
(NXT(1) == '_') || (NXT(1) == ':'))) {
|
||||||
|
name = htmlParseHTMLName_nonInvasive(ctxt);
|
||||||
|
if (name == NULL) {
|
||||||
|
htmlParseErr(ctxt, XML_ERR_NAME_REQUIRED,
|
||||||
|
"htmlParseStartTag: invalid element name\n",
|
||||||
|
NULL, NULL);
|
||||||
|
/* Dump the bogus tag like browsers do */
|
||||||
|
while ((IS_CHAR_CH(CUR)) && (CUR != '>'))
|
||||||
|
NEXT;
|
||||||
|
|
||||||
|
htmlParserFinishElementParsing(ctxt);
|
||||||
|
if (currentNode != NULL)
|
||||||
|
xmlFree(currentNode);
|
||||||
|
|
||||||
|
currentNode = xmlStrdup(ctxt->name);
|
||||||
|
depth = ctxt->nameNr;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (ctxt->name != NULL) {
|
||||||
|
if (htmlCheckAutoClose(name, ctxt->name) == 1) {
|
||||||
|
htmlAutoClose(ctxt, name);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Has this node been popped out during parsing of
|
||||||
|
* the next element
|
||||||
|
*/
|
||||||
|
if ((ctxt->nameNr > 0) && (depth >= ctxt->nameNr) &&
|
||||||
|
(!xmlStrEqual(currentNode, ctxt->name)))
|
||||||
|
{
|
||||||
|
htmlParserFinishElementParsing(ctxt);
|
||||||
|
if (currentNode != NULL) xmlFree(currentNode);
|
||||||
|
|
||||||
|
currentNode = xmlStrdup(ctxt->name);
|
||||||
|
depth = ctxt->nameNr;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if ((CUR != 0) && ((xmlStrEqual(currentNode, BAD_CAST"script")) ||
|
||||||
|
(xmlStrEqual(currentNode, BAD_CAST"style")))) {
|
||||||
|
/*
|
||||||
|
* Handle SCRIPT/STYLE separately
|
||||||
|
*/
|
||||||
|
htmlParseScript(ctxt);
|
||||||
|
} else {
|
||||||
|
/*
|
||||||
|
* Sometimes DOCTYPE arrives in the middle of the document
|
||||||
|
*/
|
||||||
|
if ((CUR == '<') && (NXT(1) == '!') &&
|
||||||
|
(UPP(2) == 'D') && (UPP(3) == 'O') &&
|
||||||
|
(UPP(4) == 'C') && (UPP(5) == 'T') &&
|
||||||
|
(UPP(6) == 'Y') && (UPP(7) == 'P') &&
|
||||||
|
(UPP(8) == 'E')) {
|
||||||
|
htmlParseErr(ctxt, XML_HTML_STRUCURE_ERROR,
|
||||||
|
"Misplaced DOCTYPE declaration\n",
|
||||||
|
BAD_CAST "DOCTYPE" , NULL);
|
||||||
|
htmlParseDocTypeDecl(ctxt);
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* First case : a comment
|
||||||
|
*/
|
||||||
|
if ((CUR == '<') && (NXT(1) == '!') &&
|
||||||
|
(NXT(2) == '-') && (NXT(3) == '-')) {
|
||||||
|
htmlParseComment(ctxt);
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Second case : a Processing Instruction.
|
||||||
|
*/
|
||||||
|
else if ((CUR == '<') && (NXT(1) == '?')) {
|
||||||
|
htmlParsePI(ctxt);
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Third case : a sub-element.
|
||||||
|
*/
|
||||||
|
else if (CUR == '<') {
|
||||||
|
htmlParseElementInternal(ctxt);
|
||||||
|
if (currentNode != NULL) xmlFree(currentNode);
|
||||||
|
|
||||||
|
currentNode = xmlStrdup(ctxt->name);
|
||||||
|
depth = ctxt->nameNr;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Fourth case : a reference. If if has not been resolved,
|
||||||
|
* parsing returns it's Name, create the node
|
||||||
|
*/
|
||||||
|
else if (CUR == '&') {
|
||||||
|
htmlParseReference(ctxt);
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Fifth case : end of the resource
|
||||||
|
*/
|
||||||
|
else if (CUR == 0) {
|
||||||
|
htmlAutoCloseOnEnd(ctxt);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Last case, text. Note that References are handled directly.
|
||||||
|
*/
|
||||||
|
else {
|
||||||
|
htmlParseCharData(ctxt);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (cons == ctxt->nbChars) {
|
||||||
|
if (ctxt->node != NULL) {
|
||||||
|
htmlParseErr(ctxt, XML_ERR_INTERNAL_ERROR,
|
||||||
|
"detected an error in element content\n",
|
||||||
|
NULL, NULL);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
GROW;
|
||||||
|
}
|
||||||
|
if (currentNode != NULL) xmlFree(currentNode);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* htmlParseContent:
|
||||||
|
* @ctxt: an HTML parser context
|
||||||
|
*
|
||||||
|
* Parse a content: comment, sub-element, reference or text.
|
||||||
|
* This is the entry point when called from parser.c
|
||||||
|
*/
|
||||||
|
|
||||||
|
void
|
||||||
|
__htmlParseContent(void *ctxt) {
|
||||||
|
if (ctxt != NULL)
|
||||||
|
htmlParseContentInternal((htmlParserCtxtPtr) ctxt);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* htmlParseDocument:
|
* htmlParseDocument:
|
||||||
* @ctxt: an HTML parser context
|
* @ctxt: an HTML parser context
|
||||||
|
@ -4321,7 +4655,7 @@ htmlParseDocument(htmlParserCtxtPtr ctxt) {
|
||||||
/*
|
/*
|
||||||
* Time to start parsing the tree itself
|
* Time to start parsing the tree itself
|
||||||
*/
|
*/
|
||||||
htmlParseContent(ctxt);
|
htmlParseContentInternal(ctxt);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* autoclose
|
* autoclose
|
||||||
|
@ -4424,7 +4758,7 @@ htmlInitParserCtxt(htmlParserCtxtPtr ctxt)
|
||||||
if (ctxt->nameTab == NULL) {
|
if (ctxt->nameTab == NULL) {
|
||||||
htmlErrMemory(NULL, "htmlInitParserCtxt: out of memory\n");
|
htmlErrMemory(NULL, "htmlInitParserCtxt: out of memory\n");
|
||||||
ctxt->nameNr = 0;
|
ctxt->nameNr = 0;
|
||||||
ctxt->nameMax = 10;
|
ctxt->nameMax = 0;
|
||||||
ctxt->name = NULL;
|
ctxt->name = NULL;
|
||||||
ctxt->nodeNr = 0;
|
ctxt->nodeNr = 0;
|
||||||
ctxt->nodeMax = 0;
|
ctxt->nodeMax = 0;
|
||||||
|
@ -4438,6 +4772,10 @@ htmlInitParserCtxt(htmlParserCtxtPtr ctxt)
|
||||||
ctxt->nameMax = 10;
|
ctxt->nameMax = 10;
|
||||||
ctxt->name = NULL;
|
ctxt->name = NULL;
|
||||||
|
|
||||||
|
ctxt->nodeInfoTab = NULL;
|
||||||
|
ctxt->nodeInfoNr = 0;
|
||||||
|
ctxt->nodeInfoMax = 0;
|
||||||
|
|
||||||
if (sax == NULL) ctxt->sax = (xmlSAXHandlerPtr) &htmlDefaultSAXHandler;
|
if (sax == NULL) ctxt->sax = (xmlSAXHandlerPtr) &htmlDefaultSAXHandler;
|
||||||
else {
|
else {
|
||||||
ctxt->sax = sax;
|
ctxt->sax = sax;
|
||||||
|
|
384
reactos/lib/3rdparty/libxml2/INSTALL
vendored
384
reactos/lib/3rdparty/libxml2/INSTALL
vendored
|
@ -1,61 +1,365 @@
|
||||||
Extracted from the documentation:
|
Installation Instructions
|
||||||
http://xmlsoft.org/FAQ.html#Compilatio
|
*************************
|
||||||
|
|
||||||
Compilation
|
Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
|
||||||
|
2006, 2007, 2008, 2009 Free Software Foundation, Inc.
|
||||||
|
|
||||||
1.What is the process to compile libxml ?
|
Copying and distribution of this file, with or without modification,
|
||||||
|
are permitted in any medium without royalty provided the copyright
|
||||||
|
notice and this notice are preserved. This file is offered as-is,
|
||||||
|
without warranty of any kind.
|
||||||
|
|
||||||
As most UNIX libraries libxml follows the "standard":
|
Basic Installation
|
||||||
|
==================
|
||||||
|
|
||||||
gunzip -c xxx.tar.gz | tar xvf -
|
Briefly, the shell commands `./configure; make; make install' should
|
||||||
|
configure, build, and install this package. The following
|
||||||
|
more-detailed instructions are generic; see the `README' file for
|
||||||
|
instructions specific to this package. Some packages provide this
|
||||||
|
`INSTALL' file but do not implement all of the features documented
|
||||||
|
below. The lack of an optional feature in a given package is not
|
||||||
|
necessarily a bug. More recommendations for GNU packages can be found
|
||||||
|
in *note Makefile Conventions: (standards)Makefile Conventions.
|
||||||
|
|
||||||
cd libxml-xxxx
|
The `configure' shell script attempts to guess correct values for
|
||||||
|
various system-dependent variables used during compilation. It uses
|
||||||
|
those values to create a `Makefile' in each directory of the package.
|
||||||
|
It may also create one or more `.h' files containing system-dependent
|
||||||
|
definitions. Finally, it creates a shell script `config.status' that
|
||||||
|
you can run in the future to recreate the current configuration, and a
|
||||||
|
file `config.log' containing compiler output (useful mainly for
|
||||||
|
debugging `configure').
|
||||||
|
|
||||||
./configure --help
|
It can also use an optional file (typically called `config.cache'
|
||||||
|
and enabled with `--cache-file=config.cache' or simply `-C') that saves
|
||||||
|
the results of its tests to speed up reconfiguring. Caching is
|
||||||
|
disabled by default to prevent problems with accidental use of stale
|
||||||
|
cache files.
|
||||||
|
|
||||||
to see the options, then the compilation/installation proper
|
If you need to do unusual things to compile the package, please try
|
||||||
|
to figure out how `configure' could check whether to do them, and mail
|
||||||
|
diffs or instructions to the address given in the `README' so they can
|
||||||
|
be considered for the next release. If you are using the cache, and at
|
||||||
|
some point `config.cache' contains results you don't want to keep, you
|
||||||
|
may remove or edit it.
|
||||||
|
|
||||||
./configure [possible options]
|
The file `configure.ac' (or `configure.in') is used to create
|
||||||
|
`configure' by a program called `autoconf'. You need `configure.ac' if
|
||||||
|
you want to change it or regenerate `configure' using a newer version
|
||||||
|
of `autoconf'.
|
||||||
|
|
||||||
make
|
The simplest way to compile this package is:
|
||||||
|
|
||||||
make install
|
1. `cd' to the directory containing the package's source code and type
|
||||||
|
`./configure' to configure the package for your system.
|
||||||
|
|
||||||
At that point you may have to rerun ldconfig or similar utility to
|
Running `configure' might take a while. While running, it prints
|
||||||
update your list of installed shared libs.
|
some messages telling which features it is checking for.
|
||||||
|
|
||||||
At this point you can check that the library is properly functionning
|
2. Type `make' to compile the package.
|
||||||
by running
|
|
||||||
|
|
||||||
make tests
|
3. Optionally, type `make check' to run any self-tests that come with
|
||||||
|
the package, generally using the just-built uninstalled binaries.
|
||||||
|
|
||||||
2.What other libraries are needed to compile/install libxml ?
|
4. Type `make install' to install the programs and any data files and
|
||||||
|
documentation. When installing into a prefix owned by root, it is
|
||||||
|
recommended that the package be configured and built as a regular
|
||||||
|
user, and only the `make install' phase executed with root
|
||||||
|
privileges.
|
||||||
|
|
||||||
Libxml does not requires any other library, the normal C ANSI API
|
5. Optionally, type `make installcheck' to repeat any self-tests, but
|
||||||
should be sufficient (please report any violation to this rule you
|
this time using the binaries in their final installed location.
|
||||||
may find).
|
This target does not install anything. Running this target as a
|
||||||
|
regular user, particularly if the prior `make install' required
|
||||||
|
root privileges, verifies that the installation completed
|
||||||
|
correctly.
|
||||||
|
|
||||||
However if found at configuration time libxml will detect and use
|
6. You can remove the program binaries and object files from the
|
||||||
the following libs:
|
source code directory by typing `make clean'. To also remove the
|
||||||
|
files that `configure' created (so you can compile the package for
|
||||||
|
a different kind of computer), type `make distclean'. There is
|
||||||
|
also a `make maintainer-clean' target, but that is intended mainly
|
||||||
|
for the package's developers. If you use it, you may have to get
|
||||||
|
all sorts of other programs in order to regenerate files that came
|
||||||
|
with the distribution.
|
||||||
|
|
||||||
libz: a highly portable and available widely compression library
|
7. Often, you can also type `make uninstall' to remove the installed
|
||||||
http://www.info-zip.org/pub/infozip/zlib/
|
files again. In practice, not all packages have tested that
|
||||||
iconv: a powerful character encoding conversion library. It's
|
uninstallation works correctly, even though it is required by the
|
||||||
included by default on recent glibc libraries, so it doesn't
|
GNU Coding Standards.
|
||||||
need to be installed specifically on linux. It seems it's
|
|
||||||
now part of the official UNIX specification. Here is one
|
|
||||||
implementation of the library which source can be found here.
|
|
||||||
http://clisp.cons.org/~haible/packages-libiconv.html
|
|
||||||
ftp://ftp.ilog.fr/pub/Users/haible/gnu/
|
|
||||||
|
|
||||||
3.make tests may fail on some platforms
|
8. Some packages, particularly those that use Automake, provide `make
|
||||||
|
distcheck', which can by used by developers to test that all other
|
||||||
|
targets like `make install' and `make uninstall' work correctly.
|
||||||
|
This target is generally not run by end users.
|
||||||
|
|
||||||
Sometime the regression tests results don't completely match the
|
Compilers and Options
|
||||||
value produced by the parser, and the makefile uses diff to print
|
=====================
|
||||||
the delta. On some platforms the diff return breaks the compilation
|
|
||||||
process, if the diff is small this is probably not a serious problem
|
|
||||||
|
|
||||||
Daniel
|
Some systems require unusual options for compilation or linking that
|
||||||
veillard@redhat.com
|
the `configure' script does not know about. Run `./configure --help'
|
||||||
|
for details on some of the pertinent environment variables.
|
||||||
|
|
||||||
|
You can give `configure' initial values for configuration parameters
|
||||||
|
by setting variables in the command line or in the environment. Here
|
||||||
|
is an example:
|
||||||
|
|
||||||
|
./configure CC=c99 CFLAGS=-g LIBS=-lposix
|
||||||
|
|
||||||
|
*Note Defining Variables::, for more details.
|
||||||
|
|
||||||
|
Compiling For Multiple Architectures
|
||||||
|
====================================
|
||||||
|
|
||||||
|
You can compile the package for more than one kind of computer at the
|
||||||
|
same time, by placing the object files for each architecture in their
|
||||||
|
own directory. To do this, you can use GNU `make'. `cd' to the
|
||||||
|
directory where you want the object files and executables to go and run
|
||||||
|
the `configure' script. `configure' automatically checks for the
|
||||||
|
source code in the directory that `configure' is in and in `..'. This
|
||||||
|
is known as a "VPATH" build.
|
||||||
|
|
||||||
|
With a non-GNU `make', it is safer to compile the package for one
|
||||||
|
architecture at a time in the source code directory. After you have
|
||||||
|
installed the package for one architecture, use `make distclean' before
|
||||||
|
reconfiguring for another architecture.
|
||||||
|
|
||||||
|
On MacOS X 10.5 and later systems, you can create libraries and
|
||||||
|
executables that work on multiple system types--known as "fat" or
|
||||||
|
"universal" binaries--by specifying multiple `-arch' options to the
|
||||||
|
compiler but only a single `-arch' option to the preprocessor. Like
|
||||||
|
this:
|
||||||
|
|
||||||
|
./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
|
||||||
|
CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
|
||||||
|
CPP="gcc -E" CXXCPP="g++ -E"
|
||||||
|
|
||||||
|
This is not guaranteed to produce working output in all cases, you
|
||||||
|
may have to build one architecture at a time and combine the results
|
||||||
|
using the `lipo' tool if you have problems.
|
||||||
|
|
||||||
|
Installation Names
|
||||||
|
==================
|
||||||
|
|
||||||
|
By default, `make install' installs the package's commands under
|
||||||
|
`/usr/local/bin', include files under `/usr/local/include', etc. You
|
||||||
|
can specify an installation prefix other than `/usr/local' by giving
|
||||||
|
`configure' the option `--prefix=PREFIX', where PREFIX must be an
|
||||||
|
absolute file name.
|
||||||
|
|
||||||
|
You can specify separate installation prefixes for
|
||||||
|
architecture-specific files and architecture-independent files. If you
|
||||||
|
pass the option `--exec-prefix=PREFIX' to `configure', the package uses
|
||||||
|
PREFIX as the prefix for installing programs and libraries.
|
||||||
|
Documentation and other data files still use the regular prefix.
|
||||||
|
|
||||||
|
In addition, if you use an unusual directory layout you can give
|
||||||
|
options like `--bindir=DIR' to specify different values for particular
|
||||||
|
kinds of files. Run `configure --help' for a list of the directories
|
||||||
|
you can set and what kinds of files go in them. In general, the
|
||||||
|
default for these options is expressed in terms of `${prefix}', so that
|
||||||
|
specifying just `--prefix' will affect all of the other directory
|
||||||
|
specifications that were not explicitly provided.
|
||||||
|
|
||||||
|
The most portable way to affect installation locations is to pass the
|
||||||
|
correct locations to `configure'; however, many packages provide one or
|
||||||
|
both of the following shortcuts of passing variable assignments to the
|
||||||
|
`make install' command line to change installation locations without
|
||||||
|
having to reconfigure or recompile.
|
||||||
|
|
||||||
|
The first method involves providing an override variable for each
|
||||||
|
affected directory. For example, `make install
|
||||||
|
prefix=/alternate/directory' will choose an alternate location for all
|
||||||
|
directory configuration variables that were expressed in terms of
|
||||||
|
`${prefix}'. Any directories that were specified during `configure',
|
||||||
|
but not in terms of `${prefix}', must each be overridden at install
|
||||||
|
time for the entire installation to be relocated. The approach of
|
||||||
|
makefile variable overrides for each directory variable is required by
|
||||||
|
the GNU Coding Standards, and ideally causes no recompilation.
|
||||||
|
However, some platforms have known limitations with the semantics of
|
||||||
|
shared libraries that end up requiring recompilation when using this
|
||||||
|
method, particularly noticeable in packages that use GNU Libtool.
|
||||||
|
|
||||||
|
The second method involves providing the `DESTDIR' variable. For
|
||||||
|
example, `make install DESTDIR=/alternate/directory' will prepend
|
||||||
|
`/alternate/directory' before all installation names. The approach of
|
||||||
|
`DESTDIR' overrides is not required by the GNU Coding Standards, and
|
||||||
|
does not work on platforms that have drive letters. On the other hand,
|
||||||
|
it does better at avoiding recompilation issues, and works well even
|
||||||
|
when some directory options were not specified in terms of `${prefix}'
|
||||||
|
at `configure' time.
|
||||||
|
|
||||||
|
Optional Features
|
||||||
|
=================
|
||||||
|
|
||||||
|
If the package supports it, you can cause programs to be installed
|
||||||
|
with an extra prefix or suffix on their names by giving `configure' the
|
||||||
|
option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
|
||||||
|
|
||||||
|
Some packages pay attention to `--enable-FEATURE' options to
|
||||||
|
`configure', where FEATURE indicates an optional part of the package.
|
||||||
|
They may also pay attention to `--with-PACKAGE' options, where PACKAGE
|
||||||
|
is something like `gnu-as' or `x' (for the X Window System). The
|
||||||
|
`README' should mention any `--enable-' and `--with-' options that the
|
||||||
|
package recognizes.
|
||||||
|
|
||||||
|
For packages that use the X Window System, `configure' can usually
|
||||||
|
find the X include and library files automatically, but if it doesn't,
|
||||||
|
you can use the `configure' options `--x-includes=DIR' and
|
||||||
|
`--x-libraries=DIR' to specify their locations.
|
||||||
|
|
||||||
|
Some packages offer the ability to configure how verbose the
|
||||||
|
execution of `make' will be. For these packages, running `./configure
|
||||||
|
--enable-silent-rules' sets the default to minimal output, which can be
|
||||||
|
overridden with `make V=1'; while running `./configure
|
||||||
|
--disable-silent-rules' sets the default to verbose, which can be
|
||||||
|
overridden with `make V=0'.
|
||||||
|
|
||||||
|
Particular systems
|
||||||
|
==================
|
||||||
|
|
||||||
|
On HP-UX, the default C compiler is not ANSI C compatible. If GNU
|
||||||
|
CC is not installed, it is recommended to use the following options in
|
||||||
|
order to use an ANSI C compiler:
|
||||||
|
|
||||||
|
./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
|
||||||
|
|
||||||
|
and if that doesn't work, install pre-built binaries of GCC for HP-UX.
|
||||||
|
|
||||||
|
On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
|
||||||
|
parse its `<wchar.h>' header file. The option `-nodtk' can be used as
|
||||||
|
a workaround. If GNU CC is not installed, it is therefore recommended
|
||||||
|
to try
|
||||||
|
|
||||||
|
./configure CC="cc"
|
||||||
|
|
||||||
|
and if that doesn't work, try
|
||||||
|
|
||||||
|
./configure CC="cc -nodtk"
|
||||||
|
|
||||||
|
On Solaris, don't put `/usr/ucb' early in your `PATH'. This
|
||||||
|
directory contains several dysfunctional programs; working variants of
|
||||||
|
these programs are available in `/usr/bin'. So, if you need `/usr/ucb'
|
||||||
|
in your `PATH', put it _after_ `/usr/bin'.
|
||||||
|
|
||||||
|
On Haiku, software installed for all users goes in `/boot/common',
|
||||||
|
not `/usr/local'. It is recommended to use the following options:
|
||||||
|
|
||||||
|
./configure --prefix=/boot/common
|
||||||
|
|
||||||
|
Specifying the System Type
|
||||||
|
==========================
|
||||||
|
|
||||||
|
There may be some features `configure' cannot figure out
|
||||||
|
automatically, but needs to determine by the type of machine the package
|
||||||
|
will run on. Usually, assuming the package is built to be run on the
|
||||||
|
_same_ architectures, `configure' can figure that out, but if it prints
|
||||||
|
a message saying it cannot guess the machine type, give it the
|
||||||
|
`--build=TYPE' option. TYPE can either be a short name for the system
|
||||||
|
type, such as `sun4', or a canonical name which has the form:
|
||||||
|
|
||||||
|
CPU-COMPANY-SYSTEM
|
||||||
|
|
||||||
|
where SYSTEM can have one of these forms:
|
||||||
|
|
||||||
|
OS
|
||||||
|
KERNEL-OS
|
||||||
|
|
||||||
|
See the file `config.sub' for the possible values of each field. If
|
||||||
|
`config.sub' isn't included in this package, then this package doesn't
|
||||||
|
need to know the machine type.
|
||||||
|
|
||||||
|
If you are _building_ compiler tools for cross-compiling, you should
|
||||||
|
use the option `--target=TYPE' to select the type of system they will
|
||||||
|
produce code for.
|
||||||
|
|
||||||
|
If you want to _use_ a cross compiler, that generates code for a
|
||||||
|
platform different from the build platform, you should specify the
|
||||||
|
"host" platform (i.e., that on which the generated programs will
|
||||||
|
eventually be run) with `--host=TYPE'.
|
||||||
|
|
||||||
|
Sharing Defaults
|
||||||
|
================
|
||||||
|
|
||||||
|
If you want to set default values for `configure' scripts to share,
|
||||||
|
you can create a site shell script called `config.site' that gives
|
||||||
|
default values for variables like `CC', `cache_file', and `prefix'.
|
||||||
|
`configure' looks for `PREFIX/share/config.site' if it exists, then
|
||||||
|
`PREFIX/etc/config.site' if it exists. Or, you can set the
|
||||||
|
`CONFIG_SITE' environment variable to the location of the site script.
|
||||||
|
A warning: not all `configure' scripts look for a site script.
|
||||||
|
|
||||||
|
Defining Variables
|
||||||
|
==================
|
||||||
|
|
||||||
|
Variables not defined in a site shell script can be set in the
|
||||||
|
environment passed to `configure'. However, some packages may run
|
||||||
|
configure again during the build, and the customized values of these
|
||||||
|
variables may be lost. In order to avoid this problem, you should set
|
||||||
|
them in the `configure' command line, using `VAR=value'. For example:
|
||||||
|
|
||||||
|
./configure CC=/usr/local2/bin/gcc
|
||||||
|
|
||||||
|
causes the specified `gcc' to be used as the C compiler (unless it is
|
||||||
|
overridden in the site shell script).
|
||||||
|
|
||||||
|
Unfortunately, this technique does not work for `CONFIG_SHELL' due to
|
||||||
|
an Autoconf bug. Until the bug is fixed you can use this workaround:
|
||||||
|
|
||||||
|
CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
|
||||||
|
|
||||||
|
`configure' Invocation
|
||||||
|
======================
|
||||||
|
|
||||||
|
`configure' recognizes the following options to control how it
|
||||||
|
operates.
|
||||||
|
|
||||||
|
`--help'
|
||||||
|
`-h'
|
||||||
|
Print a summary of all of the options to `configure', and exit.
|
||||||
|
|
||||||
|
`--help=short'
|
||||||
|
`--help=recursive'
|
||||||
|
Print a summary of the options unique to this package's
|
||||||
|
`configure', and exit. The `short' variant lists options used
|
||||||
|
only in the top level, while the `recursive' variant lists options
|
||||||
|
also present in any nested packages.
|
||||||
|
|
||||||
|
`--version'
|
||||||
|
`-V'
|
||||||
|
Print the version of Autoconf used to generate the `configure'
|
||||||
|
script, and exit.
|
||||||
|
|
||||||
|
`--cache-file=FILE'
|
||||||
|
Enable the cache: use and save the results of the tests in FILE,
|
||||||
|
traditionally `config.cache'. FILE defaults to `/dev/null' to
|
||||||
|
disable caching.
|
||||||
|
|
||||||
|
`--config-cache'
|
||||||
|
`-C'
|
||||||
|
Alias for `--cache-file=config.cache'.
|
||||||
|
|
||||||
|
`--quiet'
|
||||||
|
`--silent'
|
||||||
|
`-q'
|
||||||
|
Do not print messages saying which checks are being made. To
|
||||||
|
suppress all normal output, redirect it to `/dev/null' (any error
|
||||||
|
messages will still be shown).
|
||||||
|
|
||||||
|
`--srcdir=DIR'
|
||||||
|
Look for the package's source code in directory DIR. Usually
|
||||||
|
`configure' can determine that directory automatically.
|
||||||
|
|
||||||
|
`--prefix=DIR'
|
||||||
|
Use DIR as the installation prefix. *note Installation Names::
|
||||||
|
for more details, including other options available for fine-tuning
|
||||||
|
the installation locations.
|
||||||
|
|
||||||
|
`--no-create'
|
||||||
|
`-n'
|
||||||
|
Run the configure checks, but stop before creating any output
|
||||||
|
files.
|
||||||
|
|
||||||
|
`configure' also accepts some other, not widely useful, options. Run
|
||||||
|
`configure --help' for more details.
|
||||||
|
|
||||||
$Id$
|
|
||||||
|
|
4
reactos/lib/3rdparty/libxml2/Makefile.am
vendored
4
reactos/lib/3rdparty/libxml2/Makefile.am
vendored
|
@ -1,5 +1,7 @@
|
||||||
## Process this file with automake to produce Makefile.in
|
## Process this file with automake to produce Makefile.in
|
||||||
|
|
||||||
|
ACLOCAL_AMFLAGS = -I m4
|
||||||
|
|
||||||
SUBDIRS = include . doc example xstc @PYTHON_SUBDIR@
|
SUBDIRS = include . doc example xstc @PYTHON_SUBDIR@
|
||||||
|
|
||||||
DIST_SUBDIRS = include . doc example python xstc
|
DIST_SUBDIRS = include . doc example python xstc
|
||||||
|
@ -157,7 +159,7 @@ testModule_LDADD= $(LDADDS)
|
||||||
|
|
||||||
noinst_LTLIBRARIES = testdso.la
|
noinst_LTLIBRARIES = testdso.la
|
||||||
testdso_la_SOURCES = testdso.c
|
testdso_la_SOURCES = testdso.c
|
||||||
testdso_la_LDFLAGS = -module -rpath $(libdir)
|
testdso_la_LDFLAGS = -module -no-undefined -avoid-version -rpath $(libdir)
|
||||||
|
|
||||||
# that one forces the rebuild when "make rebuild" is run on doc/
|
# that one forces the rebuild when "make rebuild" is run on doc/
|
||||||
rebuild_testapi:
|
rebuild_testapi:
|
||||||
|
|
26
reactos/lib/3rdparty/libxml2/Makefile.in
vendored
26
reactos/lib/3rdparty/libxml2/Makefile.in
vendored
|
@ -1,4 +1,4 @@
|
||||||
# Makefile.in generated by automake 1.11 from Makefile.am.
|
# Makefile.in generated by automake 1.11.1 from Makefile.am.
|
||||||
# @configure_input@
|
# @configure_input@
|
||||||
|
|
||||||
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
||||||
|
@ -54,8 +54,10 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
|
||||||
COPYING ChangeLog INSTALL NEWS TODO acconfig.h config.guess \
|
COPYING ChangeLog INSTALL NEWS TODO acconfig.h config.guess \
|
||||||
config.sub depcomp install-sh ltmain.sh missing mkinstalldirs
|
config.sub depcomp install-sh ltmain.sh missing mkinstalldirs
|
||||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||||
am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
|
am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
|
||||||
$(top_srcdir)/configure.in
|
$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
|
||||||
|
$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
|
||||||
|
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
|
||||||
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
|
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
|
||||||
$(ACLOCAL_M4)
|
$(ACLOCAL_M4)
|
||||||
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
|
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
|
||||||
|
@ -559,6 +561,7 @@ target_alias = @target_alias@
|
||||||
top_build_prefix = @top_build_prefix@
|
top_build_prefix = @top_build_prefix@
|
||||||
top_builddir = @top_builddir@
|
top_builddir = @top_builddir@
|
||||||
top_srcdir = @top_srcdir@
|
top_srcdir = @top_srcdir@
|
||||||
|
ACLOCAL_AMFLAGS = -I m4
|
||||||
SUBDIRS = include . doc example xstc @PYTHON_SUBDIR@
|
SUBDIRS = include . doc example xstc @PYTHON_SUBDIR@
|
||||||
DIST_SUBDIRS = include . doc example python xstc
|
DIST_SUBDIRS = include . doc example python xstc
|
||||||
INCLUDES = -I$(top_builddir)/include -I@srcdir@/include @THREAD_CFLAGS@ @Z_CFLAGS@
|
INCLUDES = -I$(top_builddir)/include -I@srcdir@/include @THREAD_CFLAGS@ @Z_CFLAGS@
|
||||||
|
@ -675,7 +678,7 @@ testModule_DEPENDENCIES = $(DEPS)
|
||||||
testModule_LDADD = $(LDADDS)
|
testModule_LDADD = $(LDADDS)
|
||||||
noinst_LTLIBRARIES = testdso.la
|
noinst_LTLIBRARIES = testdso.la
|
||||||
testdso_la_SOURCES = testdso.c
|
testdso_la_SOURCES = testdso.c
|
||||||
testdso_la_LDFLAGS = -module -rpath $(libdir)
|
testdso_la_LDFLAGS = -module -no-undefined -avoid-version -rpath $(libdir)
|
||||||
testapi_SOURCES = testapi.c
|
testapi_SOURCES = testapi.c
|
||||||
testapi_LDFLAGS =
|
testapi_LDFLAGS =
|
||||||
testapi_DEPENDENCIES = $(DEPS)
|
testapi_DEPENDENCIES = $(DEPS)
|
||||||
|
@ -1222,7 +1225,7 @@ uninstall-pkgconfigDATA:
|
||||||
# (which will cause the Makefiles to be regenerated when you run `make');
|
# (which will cause the Makefiles to be regenerated when you run `make');
|
||||||
# (2) otherwise, pass the desired values on the `make' command line.
|
# (2) otherwise, pass the desired values on the `make' command line.
|
||||||
$(RECURSIVE_TARGETS):
|
$(RECURSIVE_TARGETS):
|
||||||
@failcom='exit 1'; \
|
@fail= failcom='exit 1'; \
|
||||||
for f in x $$MAKEFLAGS; do \
|
for f in x $$MAKEFLAGS; do \
|
||||||
case $$f in \
|
case $$f in \
|
||||||
*=* | --[!k]*);; \
|
*=* | --[!k]*);; \
|
||||||
|
@ -1247,7 +1250,7 @@ $(RECURSIVE_TARGETS):
|
||||||
fi; test -z "$$fail"
|
fi; test -z "$$fail"
|
||||||
|
|
||||||
$(RECURSIVE_CLEAN_TARGETS):
|
$(RECURSIVE_CLEAN_TARGETS):
|
||||||
@failcom='exit 1'; \
|
@fail= failcom='exit 1'; \
|
||||||
for f in x $$MAKEFLAGS; do \
|
for f in x $$MAKEFLAGS; do \
|
||||||
case $$f in \
|
case $$f in \
|
||||||
*=* | --[!k]*);; \
|
*=* | --[!k]*);; \
|
||||||
|
@ -1427,7 +1430,8 @@ distdir: $(DISTFILES)
|
||||||
top_distdir="$(top_distdir)" distdir="$(distdir)" \
|
top_distdir="$(top_distdir)" distdir="$(distdir)" \
|
||||||
dist-hook
|
dist-hook
|
||||||
-test -n "$(am__skip_mode_fix)" \
|
-test -n "$(am__skip_mode_fix)" \
|
||||||
|| find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
|
|| find "$(distdir)" -type d ! -perm -755 \
|
||||||
|
-exec chmod u+rwx,go+rx {} \; -o \
|
||||||
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
|
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
|
||||||
! -type d ! -perm -400 -exec chmod a+r {} \; -o \
|
! -type d ! -perm -400 -exec chmod a+r {} \; -o \
|
||||||
! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
|
! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
|
||||||
|
@ -1471,17 +1475,17 @@ dist dist-all: distdir
|
||||||
distcheck: dist
|
distcheck: dist
|
||||||
case '$(DIST_ARCHIVES)' in \
|
case '$(DIST_ARCHIVES)' in \
|
||||||
*.tar.gz*) \
|
*.tar.gz*) \
|
||||||
GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
|
GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
|
||||||
*.tar.bz2*) \
|
*.tar.bz2*) \
|
||||||
bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
|
bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
|
||||||
*.tar.lzma*) \
|
*.tar.lzma*) \
|
||||||
unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
|
lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
|
||||||
*.tar.xz*) \
|
*.tar.xz*) \
|
||||||
xz -dc $(distdir).tar.xz | $(am__untar) ;;\
|
xz -dc $(distdir).tar.xz | $(am__untar) ;;\
|
||||||
*.tar.Z*) \
|
*.tar.Z*) \
|
||||||
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
|
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
|
||||||
*.shar.gz*) \
|
*.shar.gz*) \
|
||||||
GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
|
GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
|
||||||
*.zip*) \
|
*.zip*) \
|
||||||
unzip $(distdir).zip ;;\
|
unzip $(distdir).zip ;;\
|
||||||
esac
|
esac
|
||||||
|
|
9
reactos/lib/3rdparty/libxml2/SAX2.c
vendored
9
reactos/lib/3rdparty/libxml2/SAX2.c
vendored
|
@ -1105,6 +1105,14 @@ xmlSAX2AttributeInternal(void *ctx, const xmlChar *fullname,
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef LIBXML_HTML_ENABLED
|
||||||
|
if ((ctxt->html) &&
|
||||||
|
(value == NULL) && (htmlIsBooleanAttr(fullname))) {
|
||||||
|
nval = xmlStrdup(fullname);
|
||||||
|
value = (const xmlChar *) nval;
|
||||||
|
} else
|
||||||
|
#endif
|
||||||
|
{
|
||||||
#ifdef LIBXML_VALID_ENABLED
|
#ifdef LIBXML_VALID_ENABLED
|
||||||
/*
|
/*
|
||||||
* Do the last stage of the attribute normalization
|
* Do the last stage of the attribute normalization
|
||||||
|
@ -1123,6 +1131,7 @@ xmlSAX2AttributeInternal(void *ctx, const xmlChar *fullname,
|
||||||
#else
|
#else
|
||||||
nval = NULL;
|
nval = NULL;
|
||||||
#endif /* LIBXML_VALID_ENABLED */
|
#endif /* LIBXML_VALID_ENABLED */
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Check whether it's a namespace definition
|
* Check whether it's a namespace definition
|
||||||
|
|
7960
reactos/lib/3rdparty/libxml2/aclocal.m4
vendored
7960
reactos/lib/3rdparty/libxml2/aclocal.m4
vendored
File diff suppressed because it is too large
Load diff
196
reactos/lib/3rdparty/libxml2/config.guess
vendored
196
reactos/lib/3rdparty/libxml2/config.guess
vendored
|
@ -1,10 +1,10 @@
|
||||||
#! /bin/sh
|
#! /bin/sh
|
||||||
# Attempt to guess a canonical system name.
|
# Attempt to guess a canonical system name.
|
||||||
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
|
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
|
||||||
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
|
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
|
||||||
# Free Software Foundation, Inc.
|
# Free Software Foundation, Inc.
|
||||||
|
|
||||||
timestamp='2009-04-27'
|
timestamp='2009-11-20'
|
||||||
|
|
||||||
# This file is free software; you can redistribute it and/or modify it
|
# This file is free software; you can redistribute it and/or modify it
|
||||||
# under the terms of the GNU General Public License as published by
|
# under the terms of the GNU General Public License as published by
|
||||||
|
@ -27,16 +27,16 @@ timestamp='2009-04-27'
|
||||||
# the same distribution terms that you use for the rest of that program.
|
# the same distribution terms that you use for the rest of that program.
|
||||||
|
|
||||||
|
|
||||||
# Originally written by Per Bothner <per@bothner.com>.
|
# Originally written by Per Bothner. Please send patches (context
|
||||||
# Please send patches to <config-patches@gnu.org>. Submit a context
|
# diff format) to <config-patches@gnu.org> and include a ChangeLog
|
||||||
# diff and a properly formatted ChangeLog entry.
|
# entry.
|
||||||
#
|
#
|
||||||
# This script attempts to guess a canonical system name similar to
|
# This script attempts to guess a canonical system name similar to
|
||||||
# config.sub. If it succeeds, it prints the system name on stdout, and
|
# config.sub. If it succeeds, it prints the system name on stdout, and
|
||||||
# exits with 0. Otherwise, it exits with 1.
|
# exits with 0. Otherwise, it exits with 1.
|
||||||
#
|
#
|
||||||
# The plan is that this can be called by configure scripts if you
|
# You can get the latest version of this script from:
|
||||||
# don't specify an explicit build system type.
|
# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
|
||||||
|
|
||||||
me=`echo "$0" | sed -e 's,.*/,,'`
|
me=`echo "$0" | sed -e 's,.*/,,'`
|
||||||
|
|
||||||
|
@ -170,7 +170,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
|
||||||
arm*|i386|m68k|ns32k|sh3*|sparc|vax)
|
arm*|i386|m68k|ns32k|sh3*|sparc|vax)
|
||||||
eval $set_cc_for_build
|
eval $set_cc_for_build
|
||||||
if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
|
if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
|
||||||
| grep __ELF__ >/dev/null
|
| grep -q __ELF__
|
||||||
then
|
then
|
||||||
# Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
|
# Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
|
||||||
# Return netbsd for either. FIX?
|
# Return netbsd for either. FIX?
|
||||||
|
@ -333,6 +333,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
|
||||||
sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
|
sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
|
||||||
echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
|
echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
|
||||||
exit ;;
|
exit ;;
|
||||||
|
i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
|
||||||
|
echo i386-pc-auroraux${UNAME_RELEASE}
|
||||||
|
exit ;;
|
||||||
i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
|
i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
|
||||||
eval $set_cc_for_build
|
eval $set_cc_for_build
|
||||||
SUN_ARCH="i386"
|
SUN_ARCH="i386"
|
||||||
|
@ -656,7 +659,7 @@ EOF
|
||||||
# => hppa64-hp-hpux11.23
|
# => hppa64-hp-hpux11.23
|
||||||
|
|
||||||
if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
|
if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
|
||||||
grep __LP64__ >/dev/null
|
grep -q __LP64__
|
||||||
then
|
then
|
||||||
HP_ARCH="hppa2.0w"
|
HP_ARCH="hppa2.0w"
|
||||||
else
|
else
|
||||||
|
@ -807,12 +810,12 @@ EOF
|
||||||
i*:PW*:*)
|
i*:PW*:*)
|
||||||
echo ${UNAME_MACHINE}-pc-pw32
|
echo ${UNAME_MACHINE}-pc-pw32
|
||||||
exit ;;
|
exit ;;
|
||||||
*:Interix*:[3456]*)
|
*:Interix*:*)
|
||||||
case ${UNAME_MACHINE} in
|
case ${UNAME_MACHINE} in
|
||||||
x86)
|
x86)
|
||||||
echo i586-pc-interix${UNAME_RELEASE}
|
echo i586-pc-interix${UNAME_RELEASE}
|
||||||
exit ;;
|
exit ;;
|
||||||
EM64T | authenticamd | genuineintel)
|
authenticamd | genuineintel | EM64T)
|
||||||
echo x86_64-unknown-interix${UNAME_RELEASE}
|
echo x86_64-unknown-interix${UNAME_RELEASE}
|
||||||
exit ;;
|
exit ;;
|
||||||
IA64)
|
IA64)
|
||||||
|
@ -822,6 +825,9 @@ EOF
|
||||||
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
|
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
|
||||||
echo i${UNAME_MACHINE}-pc-mks
|
echo i${UNAME_MACHINE}-pc-mks
|
||||||
exit ;;
|
exit ;;
|
||||||
|
8664:Windows_NT:*)
|
||||||
|
echo x86_64-pc-mks
|
||||||
|
exit ;;
|
||||||
i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
|
i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
|
||||||
# How do we know it's Interix rather than the generic POSIX subsystem?
|
# How do we know it's Interix rather than the generic POSIX subsystem?
|
||||||
# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
|
# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
|
||||||
|
@ -851,6 +857,20 @@ EOF
|
||||||
i*86:Minix:*:*)
|
i*86:Minix:*:*)
|
||||||
echo ${UNAME_MACHINE}-pc-minix
|
echo ${UNAME_MACHINE}-pc-minix
|
||||||
exit ;;
|
exit ;;
|
||||||
|
alpha:Linux:*:*)
|
||||||
|
case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
|
||||||
|
EV5) UNAME_MACHINE=alphaev5 ;;
|
||||||
|
EV56) UNAME_MACHINE=alphaev56 ;;
|
||||||
|
PCA56) UNAME_MACHINE=alphapca56 ;;
|
||||||
|
PCA57) UNAME_MACHINE=alphapca56 ;;
|
||||||
|
EV6) UNAME_MACHINE=alphaev6 ;;
|
||||||
|
EV67) UNAME_MACHINE=alphaev67 ;;
|
||||||
|
EV68*) UNAME_MACHINE=alphaev68 ;;
|
||||||
|
esac
|
||||||
|
objdump --private-headers /bin/sh | grep -q ld.so.1
|
||||||
|
if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
|
||||||
|
echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
|
||||||
|
exit ;;
|
||||||
arm*:Linux:*:*)
|
arm*:Linux:*:*)
|
||||||
eval $set_cc_for_build
|
eval $set_cc_for_build
|
||||||
if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
|
if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
|
||||||
|
@ -873,6 +893,17 @@ EOF
|
||||||
frv:Linux:*:*)
|
frv:Linux:*:*)
|
||||||
echo frv-unknown-linux-gnu
|
echo frv-unknown-linux-gnu
|
||||||
exit ;;
|
exit ;;
|
||||||
|
i*86:Linux:*:*)
|
||||||
|
LIBC=gnu
|
||||||
|
eval $set_cc_for_build
|
||||||
|
sed 's/^ //' << EOF >$dummy.c
|
||||||
|
#ifdef __dietlibc__
|
||||||
|
LIBC=dietlibc
|
||||||
|
#endif
|
||||||
|
EOF
|
||||||
|
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
|
||||||
|
echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
|
||||||
|
exit ;;
|
||||||
ia64:Linux:*:*)
|
ia64:Linux:*:*)
|
||||||
echo ${UNAME_MACHINE}-unknown-linux-gnu
|
echo ${UNAME_MACHINE}-unknown-linux-gnu
|
||||||
exit ;;
|
exit ;;
|
||||||
|
@ -882,78 +913,34 @@ EOF
|
||||||
m68*:Linux:*:*)
|
m68*:Linux:*:*)
|
||||||
echo ${UNAME_MACHINE}-unknown-linux-gnu
|
echo ${UNAME_MACHINE}-unknown-linux-gnu
|
||||||
exit ;;
|
exit ;;
|
||||||
mips:Linux:*:*)
|
mips:Linux:*:* | mips64:Linux:*:*)
|
||||||
eval $set_cc_for_build
|
eval $set_cc_for_build
|
||||||
sed 's/^ //' << EOF >$dummy.c
|
sed 's/^ //' << EOF >$dummy.c
|
||||||
#undef CPU
|
#undef CPU
|
||||||
#undef mips
|
#undef ${UNAME_MACHINE}
|
||||||
#undef mipsel
|
#undef ${UNAME_MACHINE}el
|
||||||
#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
|
#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
|
||||||
CPU=mipsel
|
CPU=${UNAME_MACHINE}el
|
||||||
#else
|
#else
|
||||||
#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
|
#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
|
||||||
CPU=mips
|
CPU=${UNAME_MACHINE}
|
||||||
#else
|
#else
|
||||||
CPU=
|
CPU=
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
EOF
|
EOF
|
||||||
eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
|
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
|
||||||
/^CPU/{
|
|
||||||
s: ::g
|
|
||||||
p
|
|
||||||
}'`"
|
|
||||||
test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
|
|
||||||
;;
|
|
||||||
mips64:Linux:*:*)
|
|
||||||
eval $set_cc_for_build
|
|
||||||
sed 's/^ //' << EOF >$dummy.c
|
|
||||||
#undef CPU
|
|
||||||
#undef mips64
|
|
||||||
#undef mips64el
|
|
||||||
#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
|
|
||||||
CPU=mips64el
|
|
||||||
#else
|
|
||||||
#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
|
|
||||||
CPU=mips64
|
|
||||||
#else
|
|
||||||
CPU=
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
EOF
|
|
||||||
eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
|
|
||||||
/^CPU/{
|
|
||||||
s: ::g
|
|
||||||
p
|
|
||||||
}'`"
|
|
||||||
test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
|
test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
|
||||||
;;
|
;;
|
||||||
or32:Linux:*:*)
|
or32:Linux:*:*)
|
||||||
echo or32-unknown-linux-gnu
|
echo or32-unknown-linux-gnu
|
||||||
exit ;;
|
exit ;;
|
||||||
ppc:Linux:*:*)
|
|
||||||
echo powerpc-unknown-linux-gnu
|
|
||||||
exit ;;
|
|
||||||
ppc64:Linux:*:*)
|
|
||||||
echo powerpc64-unknown-linux-gnu
|
|
||||||
exit ;;
|
|
||||||
alpha:Linux:*:*)
|
|
||||||
case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
|
|
||||||
EV5) UNAME_MACHINE=alphaev5 ;;
|
|
||||||
EV56) UNAME_MACHINE=alphaev56 ;;
|
|
||||||
PCA56) UNAME_MACHINE=alphapca56 ;;
|
|
||||||
PCA57) UNAME_MACHINE=alphapca56 ;;
|
|
||||||
EV6) UNAME_MACHINE=alphaev6 ;;
|
|
||||||
EV67) UNAME_MACHINE=alphaev67 ;;
|
|
||||||
EV68*) UNAME_MACHINE=alphaev68 ;;
|
|
||||||
esac
|
|
||||||
objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
|
|
||||||
if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
|
|
||||||
echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
|
|
||||||
exit ;;
|
|
||||||
padre:Linux:*:*)
|
padre:Linux:*:*)
|
||||||
echo sparc-unknown-linux-gnu
|
echo sparc-unknown-linux-gnu
|
||||||
exit ;;
|
exit ;;
|
||||||
|
parisc64:Linux:*:* | hppa64:Linux:*:*)
|
||||||
|
echo hppa64-unknown-linux-gnu
|
||||||
|
exit ;;
|
||||||
parisc:Linux:*:* | hppa:Linux:*:*)
|
parisc:Linux:*:* | hppa:Linux:*:*)
|
||||||
# Look for CPU level
|
# Look for CPU level
|
||||||
case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
|
case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
|
||||||
|
@ -962,8 +949,11 @@ EOF
|
||||||
*) echo hppa-unknown-linux-gnu ;;
|
*) echo hppa-unknown-linux-gnu ;;
|
||||||
esac
|
esac
|
||||||
exit ;;
|
exit ;;
|
||||||
parisc64:Linux:*:* | hppa64:Linux:*:*)
|
ppc64:Linux:*:*)
|
||||||
echo hppa64-unknown-linux-gnu
|
echo powerpc64-unknown-linux-gnu
|
||||||
|
exit ;;
|
||||||
|
ppc:Linux:*:*)
|
||||||
|
echo powerpc-unknown-linux-gnu
|
||||||
exit ;;
|
exit ;;
|
||||||
s390:Linux:*:* | s390x:Linux:*:*)
|
s390:Linux:*:* | s390x:Linux:*:*)
|
||||||
echo ${UNAME_MACHINE}-ibm-linux
|
echo ${UNAME_MACHINE}-ibm-linux
|
||||||
|
@ -986,66 +976,6 @@ EOF
|
||||||
xtensa*:Linux:*:*)
|
xtensa*:Linux:*:*)
|
||||||
echo ${UNAME_MACHINE}-unknown-linux-gnu
|
echo ${UNAME_MACHINE}-unknown-linux-gnu
|
||||||
exit ;;
|
exit ;;
|
||||||
i*86:Linux:*:*)
|
|
||||||
# The BFD linker knows what the default object file format is, so
|
|
||||||
# first see if it will tell us. cd to the root directory to prevent
|
|
||||||
# problems with other programs or directories called `ld' in the path.
|
|
||||||
# Set LC_ALL=C to ensure ld outputs messages in English.
|
|
||||||
ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
|
|
||||||
| sed -ne '/supported targets:/!d
|
|
||||||
s/[ ][ ]*/ /g
|
|
||||||
s/.*supported targets: *//
|
|
||||||
s/ .*//
|
|
||||||
p'`
|
|
||||||
case "$ld_supported_targets" in
|
|
||||||
elf32-i386)
|
|
||||||
TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
|
|
||||||
;;
|
|
||||||
a.out-i386-linux)
|
|
||||||
echo "${UNAME_MACHINE}-pc-linux-gnuaout"
|
|
||||||
exit ;;
|
|
||||||
"")
|
|
||||||
# Either a pre-BFD a.out linker (linux-gnuoldld) or
|
|
||||||
# one that does not give us useful --help.
|
|
||||||
echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
|
|
||||||
exit ;;
|
|
||||||
esac
|
|
||||||
# Determine whether the default compiler is a.out or elf
|
|
||||||
eval $set_cc_for_build
|
|
||||||
sed 's/^ //' << EOF >$dummy.c
|
|
||||||
#include <features.h>
|
|
||||||
#ifdef __ELF__
|
|
||||||
# ifdef __GLIBC__
|
|
||||||
# if __GLIBC__ >= 2
|
|
||||||
LIBC=gnu
|
|
||||||
# else
|
|
||||||
LIBC=gnulibc1
|
|
||||||
# endif
|
|
||||||
# else
|
|
||||||
LIBC=gnulibc1
|
|
||||||
# endif
|
|
||||||
#else
|
|
||||||
#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
|
|
||||||
LIBC=gnu
|
|
||||||
#else
|
|
||||||
LIBC=gnuaout
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
#ifdef __dietlibc__
|
|
||||||
LIBC=dietlibc
|
|
||||||
#endif
|
|
||||||
EOF
|
|
||||||
eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
|
|
||||||
/^LIBC/{
|
|
||||||
s: ::g
|
|
||||||
p
|
|
||||||
}'`"
|
|
||||||
test x"${LIBC}" != x && {
|
|
||||||
echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
|
|
||||||
exit
|
|
||||||
}
|
|
||||||
test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
|
|
||||||
;;
|
|
||||||
i*86:DYNIX/ptx:4*:*)
|
i*86:DYNIX/ptx:4*:*)
|
||||||
# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
|
# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
|
||||||
# earlier versions are messed up and put the nodename in both
|
# earlier versions are messed up and put the nodename in both
|
||||||
|
@ -1074,7 +1004,7 @@ EOF
|
||||||
i*86:syllable:*:*)
|
i*86:syllable:*:*)
|
||||||
echo ${UNAME_MACHINE}-pc-syllable
|
echo ${UNAME_MACHINE}-pc-syllable
|
||||||
exit ;;
|
exit ;;
|
||||||
i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
|
i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
|
||||||
echo i386-unknown-lynxos${UNAME_RELEASE}
|
echo i386-unknown-lynxos${UNAME_RELEASE}
|
||||||
exit ;;
|
exit ;;
|
||||||
i*86:*DOS:*:*)
|
i*86:*DOS:*:*)
|
||||||
|
@ -1182,7 +1112,7 @@ EOF
|
||||||
rs6000:LynxOS:2.*:*)
|
rs6000:LynxOS:2.*:*)
|
||||||
echo rs6000-unknown-lynxos${UNAME_RELEASE}
|
echo rs6000-unknown-lynxos${UNAME_RELEASE}
|
||||||
exit ;;
|
exit ;;
|
||||||
PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
|
PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
|
||||||
echo powerpc-unknown-lynxos${UNAME_RELEASE}
|
echo powerpc-unknown-lynxos${UNAME_RELEASE}
|
||||||
exit ;;
|
exit ;;
|
||||||
SM[BE]S:UNIX_SV:*:*)
|
SM[BE]S:UNIX_SV:*:*)
|
||||||
|
@ -1275,6 +1205,16 @@ EOF
|
||||||
*:Darwin:*:*)
|
*:Darwin:*:*)
|
||||||
UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
|
UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
|
||||||
case $UNAME_PROCESSOR in
|
case $UNAME_PROCESSOR in
|
||||||
|
i386)
|
||||||
|
eval $set_cc_for_build
|
||||||
|
if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
|
||||||
|
if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
|
||||||
|
(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
|
||||||
|
grep IS_64BIT_ARCH >/dev/null
|
||||||
|
then
|
||||||
|
UNAME_PROCESSOR="x86_64"
|
||||||
|
fi
|
||||||
|
fi ;;
|
||||||
unknown) UNAME_PROCESSOR=powerpc ;;
|
unknown) UNAME_PROCESSOR=powerpc ;;
|
||||||
esac
|
esac
|
||||||
echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
|
echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
|
||||||
|
|
4
reactos/lib/3rdparty/libxml2/config.h
vendored
4
reactos/lib/3rdparty/libxml2/config.h
vendored
|
@ -1,7 +1,7 @@
|
||||||
/* config.h. Generated by configure. */
|
/* config.h. Generated by configure. */
|
||||||
/* config.h.in. Generated from configure.in by autoheader. */
|
/* config.h.in. Generated from configure.in by autoheader. */
|
||||||
#define PACKAGE "libxml2"
|
#define PACKAGE "libxml2"
|
||||||
#define VERSION "2.6.20"
|
#define VERSION "2.7.7"
|
||||||
/* #undef HAVE_LIBZ */
|
/* #undef HAVE_LIBZ */
|
||||||
/* #undef HAVE_LIBM */
|
/* #undef HAVE_LIBM */
|
||||||
/* #undef HAVE_ISINF */
|
/* #undef HAVE_ISINF */
|
||||||
|
@ -281,7 +281,7 @@
|
||||||
/* #undef SUPPORT_IP6 */
|
/* #undef SUPPORT_IP6 */
|
||||||
|
|
||||||
/* Version number of package */
|
/* Version number of package */
|
||||||
#define VERSION "2.6.20"
|
#define VERSION "2.7.7"
|
||||||
|
|
||||||
/* Determine what socket length (socklen_t) data type is */
|
/* Determine what socket length (socklen_t) data type is */
|
||||||
#define XML_SOCKLEN_T int
|
#define XML_SOCKLEN_T int
|
||||||
|
|
43
reactos/lib/3rdparty/libxml2/config.sub
vendored
43
reactos/lib/3rdparty/libxml2/config.sub
vendored
|
@ -1,10 +1,10 @@
|
||||||
#! /bin/sh
|
#! /bin/sh
|
||||||
# Configuration validation subroutine script.
|
# Configuration validation subroutine script.
|
||||||
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
|
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
|
||||||
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
|
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
|
||||||
# Free Software Foundation, Inc.
|
# Free Software Foundation, Inc.
|
||||||
|
|
||||||
timestamp='2009-04-17'
|
timestamp='2009-11-20'
|
||||||
|
|
||||||
# This file is (in principle) common to ALL GNU software.
|
# This file is (in principle) common to ALL GNU software.
|
||||||
# The presence of a machine in this file suggests that SOME GNU software
|
# The presence of a machine in this file suggests that SOME GNU software
|
||||||
|
@ -32,13 +32,16 @@ timestamp='2009-04-17'
|
||||||
|
|
||||||
|
|
||||||
# Please send patches to <config-patches@gnu.org>. Submit a context
|
# Please send patches to <config-patches@gnu.org>. Submit a context
|
||||||
# diff and a properly formatted ChangeLog entry.
|
# diff and a properly formatted GNU ChangeLog entry.
|
||||||
#
|
#
|
||||||
# Configuration subroutine to validate and canonicalize a configuration type.
|
# Configuration subroutine to validate and canonicalize a configuration type.
|
||||||
# Supply the specified configuration type as an argument.
|
# Supply the specified configuration type as an argument.
|
||||||
# If it is invalid, we print an error message on stderr and exit with code 1.
|
# If it is invalid, we print an error message on stderr and exit with code 1.
|
||||||
# Otherwise, we print the canonical config type on stdout and succeed.
|
# Otherwise, we print the canonical config type on stdout and succeed.
|
||||||
|
|
||||||
|
# You can get the latest version of this script from:
|
||||||
|
# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
|
||||||
|
|
||||||
# This file is supposed to be the same for all GNU packages
|
# This file is supposed to be the same for all GNU packages
|
||||||
# and recognize all the CPU types, system types and aliases
|
# and recognize all the CPU types, system types and aliases
|
||||||
# that are meaningful with *any* GNU software.
|
# that are meaningful with *any* GNU software.
|
||||||
|
@ -149,10 +152,13 @@ case $os in
|
||||||
-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
|
-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
|
||||||
-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
|
-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
|
||||||
-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
|
-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
|
||||||
-apple | -axis | -knuth | -cray)
|
-apple | -axis | -knuth | -cray | -microblaze)
|
||||||
os=
|
os=
|
||||||
basic_machine=$1
|
basic_machine=$1
|
||||||
;;
|
;;
|
||||||
|
-bluegene*)
|
||||||
|
os=-cnk
|
||||||
|
;;
|
||||||
-sim | -cisco | -oki | -wec | -winbond)
|
-sim | -cisco | -oki | -wec | -winbond)
|
||||||
os=
|
os=
|
||||||
basic_machine=$1
|
basic_machine=$1
|
||||||
|
@ -281,6 +287,7 @@ case $basic_machine in
|
||||||
| pdp10 | pdp11 | pj | pjl \
|
| pdp10 | pdp11 | pj | pjl \
|
||||||
| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
|
| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
|
||||||
| pyramid \
|
| pyramid \
|
||||||
|
| rx \
|
||||||
| score \
|
| score \
|
||||||
| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
|
| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
|
||||||
| sh64 | sh64le \
|
| sh64 | sh64le \
|
||||||
|
@ -288,13 +295,14 @@ case $basic_machine in
|
||||||
| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
|
| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
|
||||||
| spu | strongarm \
|
| spu | strongarm \
|
||||||
| tahoe | thumb | tic4x | tic80 | tron \
|
| tahoe | thumb | tic4x | tic80 | tron \
|
||||||
|
| ubicom32 \
|
||||||
| v850 | v850e \
|
| v850 | v850e \
|
||||||
| we32k \
|
| we32k \
|
||||||
| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
|
| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
|
||||||
| z8k | z80)
|
| z8k | z80)
|
||||||
basic_machine=$basic_machine-unknown
|
basic_machine=$basic_machine-unknown
|
||||||
;;
|
;;
|
||||||
m6811 | m68hc11 | m6812 | m68hc12)
|
m6811 | m68hc11 | m6812 | m68hc12 | picochip)
|
||||||
# Motorola 68HC11/12.
|
# Motorola 68HC11/12.
|
||||||
basic_machine=$basic_machine-unknown
|
basic_machine=$basic_machine-unknown
|
||||||
os=-none
|
os=-none
|
||||||
|
@ -337,7 +345,7 @@ case $basic_machine in
|
||||||
| lm32-* \
|
| lm32-* \
|
||||||
| m32c-* | m32r-* | m32rle-* \
|
| m32c-* | m32r-* | m32rle-* \
|
||||||
| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
|
| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
|
||||||
| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
|
| m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
|
||||||
| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
|
| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
|
||||||
| mips16-* \
|
| mips16-* \
|
||||||
| mips64-* | mips64el-* \
|
| mips64-* | mips64el-* \
|
||||||
|
@ -365,7 +373,7 @@ case $basic_machine in
|
||||||
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
|
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
|
||||||
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
|
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
|
||||||
| pyramid-* \
|
| pyramid-* \
|
||||||
| romp-* | rs6000-* \
|
| romp-* | rs6000-* | rx-* \
|
||||||
| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
|
| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
|
||||||
| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
|
| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
|
||||||
| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
|
| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
|
||||||
|
@ -374,6 +382,7 @@ case $basic_machine in
|
||||||
| tahoe-* | thumb-* \
|
| tahoe-* | thumb-* \
|
||||||
| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
|
| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
|
||||||
| tron-* \
|
| tron-* \
|
||||||
|
| ubicom32-* \
|
||||||
| v850-* | v850e-* | vax-* \
|
| v850-* | v850e-* | vax-* \
|
||||||
| we32k-* \
|
| we32k-* \
|
||||||
| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
|
| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
|
||||||
|
@ -467,6 +476,10 @@ case $basic_machine in
|
||||||
basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
|
basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
|
||||||
os=-linux
|
os=-linux
|
||||||
;;
|
;;
|
||||||
|
bluegene*)
|
||||||
|
basic_machine=powerpc-ibm
|
||||||
|
os=-cnk
|
||||||
|
;;
|
||||||
c90)
|
c90)
|
||||||
basic_machine=c90-cray
|
basic_machine=c90-cray
|
||||||
os=-unicos
|
os=-unicos
|
||||||
|
@ -719,6 +732,9 @@ case $basic_machine in
|
||||||
basic_machine=ns32k-utek
|
basic_machine=ns32k-utek
|
||||||
os=-sysv
|
os=-sysv
|
||||||
;;
|
;;
|
||||||
|
microblaze)
|
||||||
|
basic_machine=microblaze-xilinx
|
||||||
|
;;
|
||||||
mingw32)
|
mingw32)
|
||||||
basic_machine=i386-pc
|
basic_machine=i386-pc
|
||||||
os=-mingw32
|
os=-mingw32
|
||||||
|
@ -1240,6 +1256,9 @@ case $os in
|
||||||
# First match some system type aliases
|
# First match some system type aliases
|
||||||
# that might get confused with valid system types.
|
# that might get confused with valid system types.
|
||||||
# -solaris* is a basic system type, with this one exception.
|
# -solaris* is a basic system type, with this one exception.
|
||||||
|
-auroraux)
|
||||||
|
os=-auroraux
|
||||||
|
;;
|
||||||
-solaris1 | -solaris1.*)
|
-solaris1 | -solaris1.*)
|
||||||
os=`echo $os | sed -e 's|solaris1|sunos4|'`
|
os=`echo $os | sed -e 's|solaris1|sunos4|'`
|
||||||
;;
|
;;
|
||||||
|
@ -1260,9 +1279,9 @@ case $os in
|
||||||
# Each alternative MUST END IN A *, to match a version number.
|
# Each alternative MUST END IN A *, to match a version number.
|
||||||
# -sysv* is not here because it comes later, after sysvr4.
|
# -sysv* is not here because it comes later, after sysvr4.
|
||||||
-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
|
-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
|
||||||
| -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
|
| -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
|
||||||
| -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
|
| -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
|
||||||
| -kopensolaris* \
|
| -sym* | -kopensolaris* \
|
||||||
| -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
|
| -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
|
||||||
| -aos* | -aros* \
|
| -aos* | -aros* \
|
||||||
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
|
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
|
||||||
|
@ -1283,7 +1302,7 @@ case $os in
|
||||||
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
|
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
|
||||||
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
|
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
|
||||||
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
|
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
|
||||||
| -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
|
| -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
|
||||||
# Remember, each alternative MUST END IN *, to match a version number.
|
# Remember, each alternative MUST END IN *, to match a version number.
|
||||||
;;
|
;;
|
||||||
-qnx*)
|
-qnx*)
|
||||||
|
@ -1613,7 +1632,7 @@ case $basic_machine in
|
||||||
-sunos*)
|
-sunos*)
|
||||||
vendor=sun
|
vendor=sun
|
||||||
;;
|
;;
|
||||||
-aix*)
|
-cnk*|-aix*)
|
||||||
vendor=ibm
|
vendor=ibm
|
||||||
;;
|
;;
|
||||||
-beos*)
|
-beos*)
|
||||||
|
|
67
reactos/lib/3rdparty/libxml2/configure
vendored
67
reactos/lib/3rdparty/libxml2/configure
vendored
|
@ -2207,6 +2207,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
||||||
|
|
||||||
ac_config_headers="$ac_config_headers config.h"
|
ac_config_headers="$ac_config_headers config.h"
|
||||||
|
|
||||||
|
|
||||||
ac_aux_dir=
|
ac_aux_dir=
|
||||||
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
|
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
|
||||||
if test -f "$ac_dir/install-sh"; then
|
if test -f "$ac_dir/install-sh"; then
|
||||||
|
@ -2324,7 +2325,7 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
|
||||||
|
|
||||||
LIBXML_MAJOR_VERSION=2
|
LIBXML_MAJOR_VERSION=2
|
||||||
LIBXML_MINOR_VERSION=7
|
LIBXML_MINOR_VERSION=7
|
||||||
LIBXML_MICRO_VERSION=6
|
LIBXML_MICRO_VERSION=7
|
||||||
LIBXML_MICRO_VERSION_SUFFIX=
|
LIBXML_MICRO_VERSION_SUFFIX=
|
||||||
LIBXML_VERSION=$LIBXML_MAJOR_VERSION.$LIBXML_MINOR_VERSION.$LIBXML_MICRO_VERSION$LIBXML_MICRO_VERSION_SUFFIX
|
LIBXML_VERSION=$LIBXML_MAJOR_VERSION.$LIBXML_MINOR_VERSION.$LIBXML_MICRO_VERSION$LIBXML_MICRO_VERSION_SUFFIX
|
||||||
LIBXML_VERSION_INFO=`expr $LIBXML_MAJOR_VERSION + $LIBXML_MINOR_VERSION`:$LIBXML_MICRO_VERSION:$LIBXML_MINOR_VERSION
|
LIBXML_VERSION_INFO=`expr $LIBXML_MAJOR_VERSION + $LIBXML_MINOR_VERSION`:$LIBXML_MICRO_VERSION:$LIBXML_MINOR_VERSION
|
||||||
|
@ -5472,8 +5473,8 @@ esac
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
macro_version='2.2.6'
|
macro_version='2.2.6b'
|
||||||
macro_revision='1.3012'
|
macro_revision='1.3017'
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -5949,13 +5950,13 @@ if test "${lt_cv_nm_interface+set}" = set; then
|
||||||
else
|
else
|
||||||
lt_cv_nm_interface="BSD nm"
|
lt_cv_nm_interface="BSD nm"
|
||||||
echo "int some_variable = 0;" > conftest.$ac_ext
|
echo "int some_variable = 0;" > conftest.$ac_ext
|
||||||
(eval echo "\"\$as_me:5952: $ac_compile\"" >&5)
|
(eval echo "\"\$as_me:5953: $ac_compile\"" >&5)
|
||||||
(eval "$ac_compile" 2>conftest.err)
|
(eval "$ac_compile" 2>conftest.err)
|
||||||
cat conftest.err >&5
|
cat conftest.err >&5
|
||||||
(eval echo "\"\$as_me:5955: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
|
(eval echo "\"\$as_me:5956: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
|
||||||
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
|
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
|
||||||
cat conftest.err >&5
|
cat conftest.err >&5
|
||||||
(eval echo "\"\$as_me:5958: output\"" >&5)
|
(eval echo "\"\$as_me:5959: output\"" >&5)
|
||||||
cat conftest.out >&5
|
cat conftest.out >&5
|
||||||
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
|
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
|
||||||
lt_cv_nm_interface="MS dumpbin"
|
lt_cv_nm_interface="MS dumpbin"
|
||||||
|
@ -7157,7 +7158,7 @@ ia64-*-hpux*)
|
||||||
;;
|
;;
|
||||||
*-*-irix6*)
|
*-*-irix6*)
|
||||||
# Find out which ABI we are using.
|
# Find out which ABI we are using.
|
||||||
echo '#line 7160 "configure"' > conftest.$ac_ext
|
echo '#line 7161 "configure"' > conftest.$ac_ext
|
||||||
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
||||||
(eval $ac_compile) 2>&5
|
(eval $ac_compile) 2>&5
|
||||||
ac_status=$?
|
ac_status=$?
|
||||||
|
@ -8495,6 +8496,10 @@ _lt_linker_boilerplate=`cat conftest.err`
|
||||||
$RM -r conftest*
|
$RM -r conftest*
|
||||||
|
|
||||||
|
|
||||||
|
## CAVEAT EMPTOR:
|
||||||
|
## There is no encapsulation within the following macros, do not change
|
||||||
|
## the running order or otherwise move them around unless you know exactly
|
||||||
|
## what you are doing...
|
||||||
if test -n "$compiler"; then
|
if test -n "$compiler"; then
|
||||||
|
|
||||||
lt_prog_compiler_no_builtin_flag=
|
lt_prog_compiler_no_builtin_flag=
|
||||||
|
@ -8520,11 +8525,11 @@ else
|
||||||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||||
-e 's:$: $lt_compiler_flag:'`
|
-e 's:$: $lt_compiler_flag:'`
|
||||||
(eval echo "\"\$as_me:8523: $lt_compile\"" >&5)
|
(eval echo "\"\$as_me:8528: $lt_compile\"" >&5)
|
||||||
(eval "$lt_compile" 2>conftest.err)
|
(eval "$lt_compile" 2>conftest.err)
|
||||||
ac_status=$?
|
ac_status=$?
|
||||||
cat conftest.err >&5
|
cat conftest.err >&5
|
||||||
echo "$as_me:8527: \$? = $ac_status" >&5
|
echo "$as_me:8532: \$? = $ac_status" >&5
|
||||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||||
# The compiler can only warn and ignore the option if not recognized
|
# The compiler can only warn and ignore the option if not recognized
|
||||||
# So say no if there are warnings other than the usual output.
|
# So say no if there are warnings other than the usual output.
|
||||||
|
@ -8859,11 +8864,11 @@ else
|
||||||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||||
-e 's:$: $lt_compiler_flag:'`
|
-e 's:$: $lt_compiler_flag:'`
|
||||||
(eval echo "\"\$as_me:8862: $lt_compile\"" >&5)
|
(eval echo "\"\$as_me:8867: $lt_compile\"" >&5)
|
||||||
(eval "$lt_compile" 2>conftest.err)
|
(eval "$lt_compile" 2>conftest.err)
|
||||||
ac_status=$?
|
ac_status=$?
|
||||||
cat conftest.err >&5
|
cat conftest.err >&5
|
||||||
echo "$as_me:8866: \$? = $ac_status" >&5
|
echo "$as_me:8871: \$? = $ac_status" >&5
|
||||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||||
# The compiler can only warn and ignore the option if not recognized
|
# The compiler can only warn and ignore the option if not recognized
|
||||||
# So say no if there are warnings other than the usual output.
|
# So say no if there are warnings other than the usual output.
|
||||||
|
@ -8964,11 +8969,11 @@ else
|
||||||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||||
-e 's:$: $lt_compiler_flag:'`
|
-e 's:$: $lt_compiler_flag:'`
|
||||||
(eval echo "\"\$as_me:8967: $lt_compile\"" >&5)
|
(eval echo "\"\$as_me:8972: $lt_compile\"" >&5)
|
||||||
(eval "$lt_compile" 2>out/conftest.err)
|
(eval "$lt_compile" 2>out/conftest.err)
|
||||||
ac_status=$?
|
ac_status=$?
|
||||||
cat out/conftest.err >&5
|
cat out/conftest.err >&5
|
||||||
echo "$as_me:8971: \$? = $ac_status" >&5
|
echo "$as_me:8976: \$? = $ac_status" >&5
|
||||||
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
||||||
then
|
then
|
||||||
# The compiler can only warn and ignore the option if not recognized
|
# The compiler can only warn and ignore the option if not recognized
|
||||||
|
@ -9019,11 +9024,11 @@ else
|
||||||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||||
-e 's:$: $lt_compiler_flag:'`
|
-e 's:$: $lt_compiler_flag:'`
|
||||||
(eval echo "\"\$as_me:9022: $lt_compile\"" >&5)
|
(eval echo "\"\$as_me:9027: $lt_compile\"" >&5)
|
||||||
(eval "$lt_compile" 2>out/conftest.err)
|
(eval "$lt_compile" 2>out/conftest.err)
|
||||||
ac_status=$?
|
ac_status=$?
|
||||||
cat out/conftest.err >&5
|
cat out/conftest.err >&5
|
||||||
echo "$as_me:9026: \$? = $ac_status" >&5
|
echo "$as_me:9031: \$? = $ac_status" >&5
|
||||||
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
||||||
then
|
then
|
||||||
# The compiler can only warn and ignore the option if not recognized
|
# The compiler can only warn and ignore the option if not recognized
|
||||||
|
@ -11822,7 +11827,7 @@ else
|
||||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||||
lt_status=$lt_dlunknown
|
lt_status=$lt_dlunknown
|
||||||
cat > conftest.$ac_ext <<_LT_EOF
|
cat > conftest.$ac_ext <<_LT_EOF
|
||||||
#line 11825 "configure"
|
#line 11830 "configure"
|
||||||
#include "confdefs.h"
|
#include "confdefs.h"
|
||||||
|
|
||||||
#if HAVE_DLFCN_H
|
#if HAVE_DLFCN_H
|
||||||
|
@ -11918,7 +11923,7 @@ else
|
||||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||||
lt_status=$lt_dlunknown
|
lt_status=$lt_dlunknown
|
||||||
cat > conftest.$ac_ext <<_LT_EOF
|
cat > conftest.$ac_ext <<_LT_EOF
|
||||||
#line 11921 "configure"
|
#line 11926 "configure"
|
||||||
#include "confdefs.h"
|
#include "confdefs.h"
|
||||||
|
|
||||||
#if HAVE_DLFCN_H
|
#if HAVE_DLFCN_H
|
||||||
|
@ -12147,10 +12152,14 @@ CC="$lt_save_CC"
|
||||||
|
|
||||||
|
|
||||||
VERSION_SCRIPT_FLAGS=
|
VERSION_SCRIPT_FLAGS=
|
||||||
$(/usr/bin/ld --help 2>&1 | grep -- --version-script >/dev/null) && \
|
# lt_cv_prog_gnu_ld is from libtool 2.+
|
||||||
|
if test "$lt_cv_prog_gnu_ld" = yes; then
|
||||||
VERSION_SCRIPT_FLAGS=-Wl,--version-script=
|
VERSION_SCRIPT_FLAGS=-Wl,--version-script=
|
||||||
test "`uname`" == "SunOS" && \
|
else
|
||||||
VERSION_SCRIPT_FLAGS="-Wl,-M -Wl,"
|
case $host in
|
||||||
|
*-*-sunos*) VERSION_SCRIPT_FLAGS="-Wl,-M -Wl,";;
|
||||||
|
esac
|
||||||
|
fi
|
||||||
|
|
||||||
if test -n "$VERSION_SCRIPT_FLAGS"; then
|
if test -n "$VERSION_SCRIPT_FLAGS"; then
|
||||||
USE_VERSION_SCRIPT_TRUE=
|
USE_VERSION_SCRIPT_TRUE=
|
||||||
|
@ -18926,7 +18935,7 @@ fi
|
||||||
{ $as_echo "$as_me:$LINENO: checking for type of socket length (socklen_t)" >&5
|
{ $as_echo "$as_me:$LINENO: checking for type of socket length (socklen_t)" >&5
|
||||||
$as_echo_n "checking for type of socket length (socklen_t)... " >&6; }
|
$as_echo_n "checking for type of socket length (socklen_t)... " >&6; }
|
||||||
cat > conftest.$ac_ext <<EOF
|
cat > conftest.$ac_ext <<EOF
|
||||||
#line 18929 "configure"
|
#line 18938 "configure"
|
||||||
#include "confdefs.h"
|
#include "confdefs.h"
|
||||||
|
|
||||||
#include <stddef.h>
|
#include <stddef.h>
|
||||||
|
@ -18937,7 +18946,7 @@ int main(void) {
|
||||||
(void)getsockopt (1, 1, 1, NULL, (socklen_t *)NULL)
|
(void)getsockopt (1, 1, 1, NULL, (socklen_t *)NULL)
|
||||||
; return 0; }
|
; return 0; }
|
||||||
EOF
|
EOF
|
||||||
if { (eval echo configure:18940: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; _out=`eval $ac_compile 2>&1` && test "x$_out" = x; }; then
|
if { (eval echo configure:18949: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; _out=`eval $ac_compile 2>&1` && test "x$_out" = x; }; then
|
||||||
rm -rf conftest*
|
rm -rf conftest*
|
||||||
|
|
||||||
{ $as_echo "$as_me:$LINENO: result: socklen_t *" >&5
|
{ $as_echo "$as_me:$LINENO: result: socklen_t *" >&5
|
||||||
|
@ -18949,7 +18958,7 @@ else
|
||||||
rm -rf conftest*
|
rm -rf conftest*
|
||||||
|
|
||||||
cat > conftest.$ac_ext <<EOF
|
cat > conftest.$ac_ext <<EOF
|
||||||
#line 18952 "configure"
|
#line 18961 "configure"
|
||||||
#include "confdefs.h"
|
#include "confdefs.h"
|
||||||
|
|
||||||
#include <stddef.h>
|
#include <stddef.h>
|
||||||
|
@ -18960,7 +18969,7 @@ int main(void) {
|
||||||
(void)getsockopt (1, 1, 1, NULL, (size_t *)NULL)
|
(void)getsockopt (1, 1, 1, NULL, (size_t *)NULL)
|
||||||
; return 0; }
|
; return 0; }
|
||||||
EOF
|
EOF
|
||||||
if { (eval echo configure:18963: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; _out=`eval $ac_compile 2>&1` && test "x$_out" = x; }; then
|
if { (eval echo configure:18972: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; _out=`eval $ac_compile 2>&1` && test "x$_out" = x; }; then
|
||||||
rm -rf conftest*
|
rm -rf conftest*
|
||||||
|
|
||||||
{ $as_echo "$as_me:$LINENO: result: size_t *" >&5
|
{ $as_echo "$as_me:$LINENO: result: size_t *" >&5
|
||||||
|
@ -18972,7 +18981,7 @@ else
|
||||||
rm -rf conftest*
|
rm -rf conftest*
|
||||||
|
|
||||||
cat > conftest.$ac_ext <<EOF
|
cat > conftest.$ac_ext <<EOF
|
||||||
#line 18975 "configure"
|
#line 18984 "configure"
|
||||||
#include "confdefs.h"
|
#include "confdefs.h"
|
||||||
|
|
||||||
#include <stddef.h>
|
#include <stddef.h>
|
||||||
|
@ -18983,7 +18992,7 @@ int main(void) {
|
||||||
(void)getsockopt (1, 1, 1, NULL, (int *)NULL)
|
(void)getsockopt (1, 1, 1, NULL, (int *)NULL)
|
||||||
; return 0; }
|
; return 0; }
|
||||||
EOF
|
EOF
|
||||||
if { (eval echo configure:18986: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; _out=`eval $ac_compile 2>&1` && test "x$_out" = x; }; then
|
if { (eval echo configure:18995: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; _out=`eval $ac_compile 2>&1` && test "x$_out" = x; }; then
|
||||||
rm -rf conftest*
|
rm -rf conftest*
|
||||||
|
|
||||||
{ $as_echo "$as_me:$LINENO: result: int *" >&5
|
{ $as_echo "$as_me:$LINENO: result: int *" >&5
|
||||||
|
@ -19880,7 +19889,7 @@ fi
|
||||||
PYTHON_SITE_PACKAGES=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib()"`
|
PYTHON_SITE_PACKAGES=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib()"`
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
PYTHON_LIBS=`python$PYTHON_VERSION-config --libs`
|
PYTHON_LIBS=`python$PYTHON_VERSION-config --ldflags`
|
||||||
fi
|
fi
|
||||||
if test "$with_python" != ""
|
if test "$with_python" != ""
|
||||||
then
|
then
|
||||||
|
@ -19993,6 +20002,10 @@ _ACEOF
|
||||||
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
;;
|
||||||
|
*-*-mingw*)
|
||||||
|
MODULE_EXTENSION=".dll"
|
||||||
|
WITH_MODULES=1
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
{ $as_echo "$as_me:$LINENO: checking for shl_load" >&5
|
{ $as_echo "$as_me:$LINENO: checking for shl_load" >&5
|
||||||
|
|
19
reactos/lib/3rdparty/libxml2/configure.in
vendored
19
reactos/lib/3rdparty/libxml2/configure.in
vendored
|
@ -1,11 +1,12 @@
|
||||||
dnl Process this file with autoconf to produce a configure script.
|
dnl Process this file with autoconf to produce a configure script.
|
||||||
AC_INIT(entities.c)
|
AC_INIT(entities.c)
|
||||||
AM_CONFIG_HEADER(config.h)
|
AM_CONFIG_HEADER(config.h)
|
||||||
|
AC_CONFIG_MACRO_DIR([m4])
|
||||||
AC_CANONICAL_HOST
|
AC_CANONICAL_HOST
|
||||||
|
|
||||||
LIBXML_MAJOR_VERSION=2
|
LIBXML_MAJOR_VERSION=2
|
||||||
LIBXML_MINOR_VERSION=7
|
LIBXML_MINOR_VERSION=7
|
||||||
LIBXML_MICRO_VERSION=6
|
LIBXML_MICRO_VERSION=7
|
||||||
LIBXML_MICRO_VERSION_SUFFIX=
|
LIBXML_MICRO_VERSION_SUFFIX=
|
||||||
LIBXML_VERSION=$LIBXML_MAJOR_VERSION.$LIBXML_MINOR_VERSION.$LIBXML_MICRO_VERSION$LIBXML_MICRO_VERSION_SUFFIX
|
LIBXML_VERSION=$LIBXML_MAJOR_VERSION.$LIBXML_MINOR_VERSION.$LIBXML_MICRO_VERSION$LIBXML_MICRO_VERSION_SUFFIX
|
||||||
LIBXML_VERSION_INFO=`expr $LIBXML_MAJOR_VERSION + $LIBXML_MINOR_VERSION`:$LIBXML_MICRO_VERSION:$LIBXML_MINOR_VERSION
|
LIBXML_VERSION_INFO=`expr $LIBXML_MAJOR_VERSION + $LIBXML_MINOR_VERSION`:$LIBXML_MICRO_VERSION:$LIBXML_MINOR_VERSION
|
||||||
|
@ -72,10 +73,14 @@ dnl if the system support linker version scripts for symbol versioning
|
||||||
dnl then add it
|
dnl then add it
|
||||||
dnl
|
dnl
|
||||||
VERSION_SCRIPT_FLAGS=
|
VERSION_SCRIPT_FLAGS=
|
||||||
$(/usr/bin/ld --help 2>&1 | grep -- --version-script >/dev/null) && \
|
# lt_cv_prog_gnu_ld is from libtool 2.+
|
||||||
|
if test "$lt_cv_prog_gnu_ld" = yes; then
|
||||||
VERSION_SCRIPT_FLAGS=-Wl,--version-script=
|
VERSION_SCRIPT_FLAGS=-Wl,--version-script=
|
||||||
test "`uname`" == "SunOS" && \
|
else
|
||||||
VERSION_SCRIPT_FLAGS="-Wl,-M -Wl,"
|
case $host in
|
||||||
|
*-*-sunos*) VERSION_SCRIPT_FLAGS="-Wl,-M -Wl,";;
|
||||||
|
esac
|
||||||
|
fi
|
||||||
AC_SUBST(VERSION_SCRIPT_FLAGS)
|
AC_SUBST(VERSION_SCRIPT_FLAGS)
|
||||||
AM_CONDITIONAL([USE_VERSION_SCRIPT], [test -n "$VERSION_SCRIPT_FLAGS"])
|
AM_CONDITIONAL([USE_VERSION_SCRIPT], [test -n "$VERSION_SCRIPT_FLAGS"])
|
||||||
|
|
||||||
|
@ -742,7 +747,7 @@ if test "$with_python" != "no" ; then
|
||||||
PYTHON_SITE_PACKAGES=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib()"`
|
PYTHON_SITE_PACKAGES=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib()"`
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
PYTHON_LIBS=`python$PYTHON_VERSION-config --libs`
|
PYTHON_LIBS=`python$PYTHON_VERSION-config --ldflags`
|
||||||
fi
|
fi
|
||||||
if test "$with_python" != ""
|
if test "$with_python" != ""
|
||||||
then
|
then
|
||||||
|
@ -778,6 +783,10 @@ if test "$with_modules" != "no" ; then
|
||||||
AC_DEFINE([HAVE_DLOPEN], [], [Have dlopen based dso])
|
AC_DEFINE([HAVE_DLOPEN], [], [Have dlopen based dso])
|
||||||
])
|
])
|
||||||
;;
|
;;
|
||||||
|
*-*-mingw*)
|
||||||
|
MODULE_EXTENSION=".dll"
|
||||||
|
WITH_MODULES=1
|
||||||
|
;;
|
||||||
*)
|
*)
|
||||||
AC_CHECK_FUNC(shl_load, libxml_have_shl_load=yes, [
|
AC_CHECK_FUNC(shl_load, libxml_have_shl_load=yes, [
|
||||||
AC_CHECK_LIB(dld, shl_load, [
|
AC_CHECK_LIB(dld, shl_load, [
|
||||||
|
|
1
reactos/lib/3rdparty/libxml2/error.c
vendored
1
reactos/lib/3rdparty/libxml2/error.c
vendored
|
@ -929,6 +929,7 @@ xmlCtxtResetLastError(void *ctx)
|
||||||
|
|
||||||
if (ctxt == NULL)
|
if (ctxt == NULL)
|
||||||
return;
|
return;
|
||||||
|
ctxt->errNo = XML_ERR_OK;
|
||||||
if (ctxt->lastError.code == XML_ERR_OK)
|
if (ctxt->lastError.code == XML_ERR_OK)
|
||||||
return;
|
return;
|
||||||
xmlResetError(&ctxt->lastError);
|
xmlResetError(&ctxt->lastError);
|
||||||
|
|
2
reactos/lib/3rdparty/libxml2/globals.c
vendored
2
reactos/lib/3rdparty/libxml2/globals.c
vendored
|
@ -46,7 +46,7 @@ static xmlMutexPtr xmlThrDefMutex = NULL;
|
||||||
*/
|
*/
|
||||||
void xmlInitGlobals(void)
|
void xmlInitGlobals(void)
|
||||||
{
|
{
|
||||||
if (xmlThrDefMutex != NULL)
|
if (xmlThrDefMutex == NULL)
|
||||||
xmlThrDefMutex = xmlNewMutex();
|
xmlThrDefMutex = xmlNewMutex();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
12
reactos/lib/3rdparty/libxml2/include/Makefile.in
vendored
12
reactos/lib/3rdparty/libxml2/include/Makefile.in
vendored
|
@ -1,4 +1,4 @@
|
||||||
# Makefile.in generated by automake 1.11 from Makefile.am.
|
# Makefile.in generated by automake 1.11.1 from Makefile.am.
|
||||||
# @configure_input@
|
# @configure_input@
|
||||||
|
|
||||||
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
||||||
|
@ -36,8 +36,10 @@ host_triplet = @host@
|
||||||
subdir = include
|
subdir = include
|
||||||
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
|
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
|
||||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||||
am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
|
am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
|
||||||
$(top_srcdir)/configure.in
|
$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
|
||||||
|
$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
|
||||||
|
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
|
||||||
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
|
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
|
||||||
$(ACLOCAL_M4)
|
$(ACLOCAL_M4)
|
||||||
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
|
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
|
||||||
|
@ -356,7 +358,7 @@ clean-libtool:
|
||||||
# (which will cause the Makefiles to be regenerated when you run `make');
|
# (which will cause the Makefiles to be regenerated when you run `make');
|
||||||
# (2) otherwise, pass the desired values on the `make' command line.
|
# (2) otherwise, pass the desired values on the `make' command line.
|
||||||
$(RECURSIVE_TARGETS):
|
$(RECURSIVE_TARGETS):
|
||||||
@failcom='exit 1'; \
|
@fail= failcom='exit 1'; \
|
||||||
for f in x $$MAKEFLAGS; do \
|
for f in x $$MAKEFLAGS; do \
|
||||||
case $$f in \
|
case $$f in \
|
||||||
*=* | --[!k]*);; \
|
*=* | --[!k]*);; \
|
||||||
|
@ -381,7 +383,7 @@ $(RECURSIVE_TARGETS):
|
||||||
fi; test -z "$$fail"
|
fi; test -z "$$fail"
|
||||||
|
|
||||||
$(RECURSIVE_CLEAN_TARGETS):
|
$(RECURSIVE_CLEAN_TARGETS):
|
||||||
@failcom='exit 1'; \
|
@fail= failcom='exit 1'; \
|
||||||
for f in x $$MAKEFLAGS; do \
|
for f in x $$MAKEFLAGS; do \
|
||||||
case $$f in \
|
case $$f in \
|
||||||
*=* | --[!k]*);; \
|
*=* | --[!k]*);; \
|
||||||
|
|
650
reactos/lib/3rdparty/libxml2/install-sh
vendored
650
reactos/lib/3rdparty/libxml2/install-sh
vendored
|
@ -1,250 +1,520 @@
|
||||||
#! /bin/sh
|
#!/bin/sh
|
||||||
#
|
|
||||||
# install - install a program, script, or datafile
|
# install - install a program, script, or datafile
|
||||||
# This comes from X11R5 (mit/util/scripts/install.sh).
|
|
||||||
|
scriptversion=2009-04-28.21; # UTC
|
||||||
|
|
||||||
|
# This originates from X11R5 (mit/util/scripts/install.sh), which was
|
||||||
|
# later released in X11R6 (xc/config/util/install.sh) with the
|
||||||
|
# following copyright and license.
|
||||||
#
|
#
|
||||||
# Copyright 1991 by the Massachusetts Institute of Technology
|
# Copyright (C) 1994 X Consortium
|
||||||
#
|
#
|
||||||
# Permission to use, copy, modify, distribute, and sell this software and its
|
# Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
# documentation for any purpose is hereby granted without fee, provided that
|
# of this software and associated documentation files (the "Software"), to
|
||||||
# the above copyright notice appear in all copies and that both that
|
# deal in the Software without restriction, including without limitation the
|
||||||
# copyright notice and this permission notice appear in supporting
|
# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
|
||||||
# documentation, and that the name of M.I.T. not be used in advertising or
|
# sell copies of the Software, and to permit persons to whom the Software is
|
||||||
# publicity pertaining to distribution of the software without specific,
|
# furnished to do so, subject to the following conditions:
|
||||||
# written prior permission. M.I.T. makes no representations about the
|
#
|
||||||
# suitability of this software for any purpose. It is provided "as is"
|
# The above copyright notice and this permission notice shall be included in
|
||||||
# without express or implied warranty.
|
# all copies or substantial portions of the Software.
|
||||||
|
#
|
||||||
|
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
|
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||||
|
# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
|
||||||
|
# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
|
||||||
|
# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||||
|
#
|
||||||
|
# Except as contained in this notice, the name of the X Consortium shall not
|
||||||
|
# be used in advertising or otherwise to promote the sale, use or other deal-
|
||||||
|
# ings in this Software without prior written authorization from the X Consor-
|
||||||
|
# tium.
|
||||||
|
#
|
||||||
|
#
|
||||||
|
# FSF changes to this file are in the public domain.
|
||||||
#
|
#
|
||||||
# Calling this script install-sh is preferred over install.sh, to prevent
|
# Calling this script install-sh is preferred over install.sh, to prevent
|
||||||
# `make' implicit rules from creating a file called install from it
|
# `make' implicit rules from creating a file called install from it
|
||||||
# when there is no Makefile.
|
# when there is no Makefile.
|
||||||
#
|
#
|
||||||
# This script is compatible with the BSD install script, but was written
|
# This script is compatible with the BSD install script, but was written
|
||||||
# from scratch. It can only install one file at a time, a restriction
|
# from scratch.
|
||||||
# shared with many OS's install programs.
|
|
||||||
|
|
||||||
|
nl='
|
||||||
|
'
|
||||||
|
IFS=" "" $nl"
|
||||||
|
|
||||||
# set DOITPROG to echo to test this script
|
# set DOITPROG to echo to test this script
|
||||||
|
|
||||||
# Don't use :- since 4.3BSD and earlier shells don't like it.
|
# Don't use :- since 4.3BSD and earlier shells don't like it.
|
||||||
doit="${DOITPROG-}"
|
doit=${DOITPROG-}
|
||||||
|
if test -z "$doit"; then
|
||||||
|
doit_exec=exec
|
||||||
|
else
|
||||||
|
doit_exec=$doit
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Put in absolute file names if you don't have them in your path;
|
||||||
|
# or use environment vars.
|
||||||
|
|
||||||
# put in absolute paths if you don't have them in your path; or use env. vars.
|
chgrpprog=${CHGRPPROG-chgrp}
|
||||||
|
chmodprog=${CHMODPROG-chmod}
|
||||||
|
chownprog=${CHOWNPROG-chown}
|
||||||
|
cmpprog=${CMPPROG-cmp}
|
||||||
|
cpprog=${CPPROG-cp}
|
||||||
|
mkdirprog=${MKDIRPROG-mkdir}
|
||||||
|
mvprog=${MVPROG-mv}
|
||||||
|
rmprog=${RMPROG-rm}
|
||||||
|
stripprog=${STRIPPROG-strip}
|
||||||
|
|
||||||
mvprog="${MVPROG-mv}"
|
posix_glob='?'
|
||||||
cpprog="${CPPROG-cp}"
|
initialize_posix_glob='
|
||||||
chmodprog="${CHMODPROG-chmod}"
|
test "$posix_glob" != "?" || {
|
||||||
chownprog="${CHOWNPROG-chown}"
|
if (set -f) 2>/dev/null; then
|
||||||
chgrpprog="${CHGRPPROG-chgrp}"
|
posix_glob=
|
||||||
stripprog="${STRIPPROG-strip}"
|
else
|
||||||
rmprog="${RMPROG-rm}"
|
posix_glob=:
|
||||||
mkdirprog="${MKDIRPROG-mkdir}"
|
fi
|
||||||
|
}
|
||||||
|
'
|
||||||
|
|
||||||
transformbasename=""
|
posix_mkdir=
|
||||||
transform_arg=""
|
|
||||||
instcmd="$mvprog"
|
# Desired mode of installed file.
|
||||||
chmodcmd="$chmodprog 0755"
|
mode=0755
|
||||||
chowncmd=""
|
|
||||||
chgrpcmd=""
|
chgrpcmd=
|
||||||
stripcmd=""
|
chmodcmd=$chmodprog
|
||||||
|
chowncmd=
|
||||||
|
mvcmd=$mvprog
|
||||||
rmcmd="$rmprog -f"
|
rmcmd="$rmprog -f"
|
||||||
mvcmd="$mvprog"
|
stripcmd=
|
||||||
src=""
|
|
||||||
dst=""
|
|
||||||
dir_arg=""
|
|
||||||
|
|
||||||
while [ x"$1" != x ]; do
|
src=
|
||||||
|
dst=
|
||||||
|
dir_arg=
|
||||||
|
dst_arg=
|
||||||
|
|
||||||
|
copy_on_change=false
|
||||||
|
no_target_directory=
|
||||||
|
|
||||||
|
usage="\
|
||||||
|
Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
|
||||||
|
or: $0 [OPTION]... SRCFILES... DIRECTORY
|
||||||
|
or: $0 [OPTION]... -t DIRECTORY SRCFILES...
|
||||||
|
or: $0 [OPTION]... -d DIRECTORIES...
|
||||||
|
|
||||||
|
In the 1st form, copy SRCFILE to DSTFILE.
|
||||||
|
In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
|
||||||
|
In the 4th, create DIRECTORIES.
|
||||||
|
|
||||||
|
Options:
|
||||||
|
--help display this help and exit.
|
||||||
|
--version display version info and exit.
|
||||||
|
|
||||||
|
-c (ignored)
|
||||||
|
-C install only if different (preserve the last data modification time)
|
||||||
|
-d create directories instead of installing files.
|
||||||
|
-g GROUP $chgrpprog installed files to GROUP.
|
||||||
|
-m MODE $chmodprog installed files to MODE.
|
||||||
|
-o USER $chownprog installed files to USER.
|
||||||
|
-s $stripprog installed files.
|
||||||
|
-t DIRECTORY install into DIRECTORY.
|
||||||
|
-T report an error if DSTFILE is a directory.
|
||||||
|
|
||||||
|
Environment variables override the default commands:
|
||||||
|
CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
|
||||||
|
RMPROG STRIPPROG
|
||||||
|
"
|
||||||
|
|
||||||
|
while test $# -ne 0; do
|
||||||
case $1 in
|
case $1 in
|
||||||
-c) instcmd="$cpprog"
|
-c) ;;
|
||||||
shift
|
|
||||||
continue;;
|
|
||||||
|
|
||||||
-d) dir_arg=true
|
-C) copy_on_change=true;;
|
||||||
shift
|
|
||||||
continue;;
|
|
||||||
|
|
||||||
-m) chmodcmd="$chmodprog $2"
|
-d) dir_arg=true;;
|
||||||
shift
|
|
||||||
shift
|
|
||||||
continue;;
|
|
||||||
|
|
||||||
-o) chowncmd="$chownprog $2"
|
|
||||||
shift
|
|
||||||
shift
|
|
||||||
continue;;
|
|
||||||
|
|
||||||
-g) chgrpcmd="$chgrpprog $2"
|
-g) chgrpcmd="$chgrpprog $2"
|
||||||
shift
|
shift;;
|
||||||
shift
|
|
||||||
continue;;
|
|
||||||
|
|
||||||
-s) stripcmd="$stripprog"
|
--help) echo "$usage"; exit $?;;
|
||||||
shift
|
|
||||||
continue;;
|
|
||||||
|
|
||||||
-t=*) transformarg=`echo $1 | sed 's/-t=//'`
|
-m) mode=$2
|
||||||
shift
|
case $mode in
|
||||||
continue;;
|
*' '* | *' '* | *'
|
||||||
|
'* | *'*'* | *'?'* | *'['*)
|
||||||
-b=*) transformbasename=`echo $1 | sed 's/-b=//'`
|
echo "$0: invalid mode: $mode" >&2
|
||||||
shift
|
exit 1;;
|
||||||
continue;;
|
|
||||||
|
|
||||||
*) if [ x"$src" = x ]
|
|
||||||
then
|
|
||||||
src=$1
|
|
||||||
else
|
|
||||||
# this colon is to work around a 386BSD /bin/sh bug
|
|
||||||
:
|
|
||||||
dst=$1
|
|
||||||
fi
|
|
||||||
shift
|
|
||||||
continue;;
|
|
||||||
esac
|
esac
|
||||||
done
|
shift;;
|
||||||
|
|
||||||
if [ x"$src" = x ]
|
-o) chowncmd="$chownprog $2"
|
||||||
then
|
shift;;
|
||||||
echo "install: no input file specified"
|
|
||||||
exit 1
|
|
||||||
else
|
|
||||||
true
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ x"$dir_arg" != x ]; then
|
-s) stripcmd=$stripprog;;
|
||||||
dst=$src
|
|
||||||
src=""
|
|
||||||
|
|
||||||
if [ -d $dst ]; then
|
-t) dst_arg=$2
|
||||||
instcmd=:
|
shift;;
|
||||||
else
|
|
||||||
instcmd=mkdir
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
|
|
||||||
# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
|
-T) no_target_directory=true;;
|
||||||
# might cause directories to be created, which would be especially bad
|
|
||||||
# if $src (and thus $dsttmp) contains '*'.
|
|
||||||
|
|
||||||
if [ -f $src -o -d $src ]
|
--version) echo "$0 $scriptversion"; exit $?;;
|
||||||
then
|
|
||||||
true
|
|
||||||
else
|
|
||||||
echo "install: $src does not exist"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ x"$dst" = x ]
|
--) shift
|
||||||
then
|
break;;
|
||||||
echo "install: no destination specified"
|
|
||||||
exit 1
|
|
||||||
else
|
|
||||||
true
|
|
||||||
fi
|
|
||||||
|
|
||||||
# If destination is a directory, append the input filename; if your system
|
-*) echo "$0: invalid option: $1" >&2
|
||||||
# does not like double slashes in filenames, you may need to add some logic
|
exit 1;;
|
||||||
|
|
||||||
if [ -d $dst ]
|
*) break;;
|
||||||
then
|
esac
|
||||||
dst="$dst"/`basename $src`
|
|
||||||
else
|
|
||||||
true
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
## this sed command emulates the dirname command
|
|
||||||
dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
|
|
||||||
|
|
||||||
# Make sure that the destination directory exists.
|
|
||||||
# this part is taken from Noah Friedman's mkinstalldirs script
|
|
||||||
|
|
||||||
# Skip lots of stat calls in the usual case.
|
|
||||||
if [ ! -d "$dstdir" ]; then
|
|
||||||
defaultIFS='
|
|
||||||
'
|
|
||||||
IFS="${IFS-${defaultIFS}}"
|
|
||||||
|
|
||||||
oIFS="${IFS}"
|
|
||||||
# Some sh's can't handle IFS=/ for some reason.
|
|
||||||
IFS='%'
|
|
||||||
set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'`
|
|
||||||
IFS="${oIFS}"
|
|
||||||
|
|
||||||
pathcomp=''
|
|
||||||
|
|
||||||
while [ $# -ne 0 ] ; do
|
|
||||||
pathcomp="${pathcomp}${1}"
|
|
||||||
shift
|
shift
|
||||||
|
|
||||||
if [ ! -d "${pathcomp}" ] ;
|
|
||||||
then
|
|
||||||
$mkdirprog "${pathcomp}"
|
|
||||||
else
|
|
||||||
true
|
|
||||||
fi
|
|
||||||
|
|
||||||
pathcomp="${pathcomp}/"
|
|
||||||
done
|
done
|
||||||
|
|
||||||
|
if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
|
||||||
|
# When -d is used, all remaining arguments are directories to create.
|
||||||
|
# When -t is used, the destination is already specified.
|
||||||
|
# Otherwise, the last argument is the destination. Remove it from $@.
|
||||||
|
for arg
|
||||||
|
do
|
||||||
|
if test -n "$dst_arg"; then
|
||||||
|
# $@ is not empty: it contains at least $arg.
|
||||||
|
set fnord "$@" "$dst_arg"
|
||||||
|
shift # fnord
|
||||||
|
fi
|
||||||
|
shift # arg
|
||||||
|
dst_arg=$arg
|
||||||
|
done
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ x"$dir_arg" != x ]
|
if test $# -eq 0; then
|
||||||
then
|
if test -z "$dir_arg"; then
|
||||||
$doit $instcmd $dst &&
|
echo "$0: no input file specified." >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
# It's OK to call `install-sh -d' without argument.
|
||||||
|
# This can happen when creating conditional directories.
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi &&
|
if test -z "$dir_arg"; then
|
||||||
if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi &&
|
trap '(exit $?); exit' 1 2 13 15
|
||||||
if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi &&
|
|
||||||
if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi
|
|
||||||
else
|
|
||||||
|
|
||||||
# If we're going to rename the final executable, determine the name now.
|
# Set umask so as not to create temps with too-generous modes.
|
||||||
|
# However, 'strip' requires both read and write access to temps.
|
||||||
|
case $mode in
|
||||||
|
# Optimize common cases.
|
||||||
|
*644) cp_umask=133;;
|
||||||
|
*755) cp_umask=22;;
|
||||||
|
|
||||||
if [ x"$transformarg" = x ]
|
*[0-7])
|
||||||
then
|
if test -z "$stripcmd"; then
|
||||||
dstfile=`basename $dst`
|
u_plus_rw=
|
||||||
else
|
else
|
||||||
dstfile=`basename $dst $transformbasename |
|
u_plus_rw='% 200'
|
||||||
sed $transformarg`$transformbasename
|
fi
|
||||||
|
cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
|
||||||
|
*)
|
||||||
|
if test -z "$stripcmd"; then
|
||||||
|
u_plus_rw=
|
||||||
|
else
|
||||||
|
u_plus_rw=,u+rw
|
||||||
|
fi
|
||||||
|
cp_umask=$mode$u_plus_rw;;
|
||||||
|
esac
|
||||||
|
fi
|
||||||
|
|
||||||
|
for src
|
||||||
|
do
|
||||||
|
# Protect names starting with `-'.
|
||||||
|
case $src in
|
||||||
|
-*) src=./$src;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
if test -n "$dir_arg"; then
|
||||||
|
dst=$src
|
||||||
|
dstdir=$dst
|
||||||
|
test -d "$dstdir"
|
||||||
|
dstdir_status=$?
|
||||||
|
else
|
||||||
|
|
||||||
|
# Waiting for this to be detected by the "$cpprog $src $dsttmp" command
|
||||||
|
# might cause directories to be created, which would be especially bad
|
||||||
|
# if $src (and thus $dsttmp) contains '*'.
|
||||||
|
if test ! -f "$src" && test ! -d "$src"; then
|
||||||
|
echo "$0: $src does not exist." >&2
|
||||||
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# don't allow the sed command to completely eliminate the filename
|
if test -z "$dst_arg"; then
|
||||||
|
echo "$0: no destination specified." >&2
|
||||||
if [ x"$dstfile" = x ]
|
exit 1
|
||||||
then
|
|
||||||
dstfile=`basename $dst`
|
|
||||||
else
|
|
||||||
true
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Make a temp file name in the proper directory.
|
dst=$dst_arg
|
||||||
|
# Protect names starting with `-'.
|
||||||
|
case $dst in
|
||||||
|
-*) dst=./$dst;;
|
||||||
|
esac
|
||||||
|
|
||||||
dsttmp=$dstdir/#inst.$$#
|
# If destination is a directory, append the input filename; won't work
|
||||||
|
# if double slashes aren't ignored.
|
||||||
|
if test -d "$dst"; then
|
||||||
|
if test -n "$no_target_directory"; then
|
||||||
|
echo "$0: $dst_arg: Is a directory" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
dstdir=$dst
|
||||||
|
dst=$dstdir/`basename "$src"`
|
||||||
|
dstdir_status=0
|
||||||
|
else
|
||||||
|
# Prefer dirname, but fall back on a substitute if dirname fails.
|
||||||
|
dstdir=`
|
||||||
|
(dirname "$dst") 2>/dev/null ||
|
||||||
|
expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
|
||||||
|
X"$dst" : 'X\(//\)[^/]' \| \
|
||||||
|
X"$dst" : 'X\(//\)$' \| \
|
||||||
|
X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
|
||||||
|
echo X"$dst" |
|
||||||
|
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
|
||||||
|
s//\1/
|
||||||
|
q
|
||||||
|
}
|
||||||
|
/^X\(\/\/\)[^/].*/{
|
||||||
|
s//\1/
|
||||||
|
q
|
||||||
|
}
|
||||||
|
/^X\(\/\/\)$/{
|
||||||
|
s//\1/
|
||||||
|
q
|
||||||
|
}
|
||||||
|
/^X\(\/\).*/{
|
||||||
|
s//\1/
|
||||||
|
q
|
||||||
|
}
|
||||||
|
s/.*/./; q'
|
||||||
|
`
|
||||||
|
|
||||||
# Move or copy the file name to the temp name
|
test -d "$dstdir"
|
||||||
|
dstdir_status=$?
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
$doit $instcmd $src $dsttmp &&
|
obsolete_mkdir_used=false
|
||||||
|
|
||||||
trap "rm -f ${dsttmp}" 0 &&
|
if test $dstdir_status != 0; then
|
||||||
|
case $posix_mkdir in
|
||||||
|
'')
|
||||||
|
# Create intermediate dirs using mode 755 as modified by the umask.
|
||||||
|
# This is like FreeBSD 'install' as of 1997-10-28.
|
||||||
|
umask=`umask`
|
||||||
|
case $stripcmd.$umask in
|
||||||
|
# Optimize common cases.
|
||||||
|
*[2367][2367]) mkdir_umask=$umask;;
|
||||||
|
.*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
|
||||||
|
|
||||||
# and set any options; do chmod last to preserve setuid bits
|
*[0-7])
|
||||||
|
mkdir_umask=`expr $umask + 22 \
|
||||||
|
- $umask % 100 % 40 + $umask % 20 \
|
||||||
|
- $umask % 10 % 4 + $umask % 2
|
||||||
|
`;;
|
||||||
|
*) mkdir_umask=$umask,go-w;;
|
||||||
|
esac
|
||||||
|
|
||||||
# If any of these fail, we abort the whole thing. If we want to
|
# With -d, create the new directory with the user-specified mode.
|
||||||
# ignore errors from any of these, just make sure not to ignore
|
# Otherwise, rely on $mkdir_umask.
|
||||||
# errors from the above "$doit $instcmd $src $dsttmp" command.
|
if test -n "$dir_arg"; then
|
||||||
|
mkdir_mode=-m$mode
|
||||||
|
else
|
||||||
|
mkdir_mode=
|
||||||
|
fi
|
||||||
|
|
||||||
if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi &&
|
posix_mkdir=false
|
||||||
if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi &&
|
case $umask in
|
||||||
if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi &&
|
*[123567][0-7][0-7])
|
||||||
if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi &&
|
# POSIX mkdir -p sets u+wx bits regardless of umask, which
|
||||||
|
# is incompatible with FreeBSD 'install' when (umask & 300) != 0.
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
|
||||||
|
trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
|
||||||
|
|
||||||
# Now rename the file to the real destination.
|
if (umask $mkdir_umask &&
|
||||||
|
exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
|
||||||
|
then
|
||||||
|
if test -z "$dir_arg" || {
|
||||||
|
# Check for POSIX incompatibilities with -m.
|
||||||
|
# HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
|
||||||
|
# other-writeable bit of parent directory when it shouldn't.
|
||||||
|
# FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
|
||||||
|
ls_ld_tmpdir=`ls -ld "$tmpdir"`
|
||||||
|
case $ls_ld_tmpdir in
|
||||||
|
d????-?r-*) different_mode=700;;
|
||||||
|
d????-?--*) different_mode=755;;
|
||||||
|
*) false;;
|
||||||
|
esac &&
|
||||||
|
$mkdirprog -m$different_mode -p -- "$tmpdir" && {
|
||||||
|
ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
|
||||||
|
test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
then posix_mkdir=:
|
||||||
|
fi
|
||||||
|
rmdir "$tmpdir/d" "$tmpdir"
|
||||||
|
else
|
||||||
|
# Remove any dirs left behind by ancient mkdir implementations.
|
||||||
|
rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
|
||||||
|
fi
|
||||||
|
trap '' 0;;
|
||||||
|
esac;;
|
||||||
|
esac
|
||||||
|
|
||||||
$doit $rmcmd -f $dstdir/$dstfile &&
|
if
|
||||||
$doit $mvcmd $dsttmp $dstdir/$dstfile
|
$posix_mkdir && (
|
||||||
|
umask $mkdir_umask &&
|
||||||
|
$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
|
||||||
|
)
|
||||||
|
then :
|
||||||
|
else
|
||||||
|
|
||||||
fi &&
|
# The umask is ridiculous, or mkdir does not conform to POSIX,
|
||||||
|
# or it failed possibly due to a race condition. Create the
|
||||||
|
# directory the slow way, step by step, checking for races as we go.
|
||||||
|
|
||||||
|
case $dstdir in
|
||||||
|
/*) prefix='/';;
|
||||||
|
-*) prefix='./';;
|
||||||
|
*) prefix='';;
|
||||||
|
esac
|
||||||
|
|
||||||
exit 0
|
eval "$initialize_posix_glob"
|
||||||
|
|
||||||
|
oIFS=$IFS
|
||||||
|
IFS=/
|
||||||
|
$posix_glob set -f
|
||||||
|
set fnord $dstdir
|
||||||
|
shift
|
||||||
|
$posix_glob set +f
|
||||||
|
IFS=$oIFS
|
||||||
|
|
||||||
|
prefixes=
|
||||||
|
|
||||||
|
for d
|
||||||
|
do
|
||||||
|
test -z "$d" && continue
|
||||||
|
|
||||||
|
prefix=$prefix$d
|
||||||
|
if test -d "$prefix"; then
|
||||||
|
prefixes=
|
||||||
|
else
|
||||||
|
if $posix_mkdir; then
|
||||||
|
(umask=$mkdir_umask &&
|
||||||
|
$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
|
||||||
|
# Don't fail if two instances are running concurrently.
|
||||||
|
test -d "$prefix" || exit 1
|
||||||
|
else
|
||||||
|
case $prefix in
|
||||||
|
*\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
|
||||||
|
*) qprefix=$prefix;;
|
||||||
|
esac
|
||||||
|
prefixes="$prefixes '$qprefix'"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
prefix=$prefix/
|
||||||
|
done
|
||||||
|
|
||||||
|
if test -n "$prefixes"; then
|
||||||
|
# Don't fail if two instances are running concurrently.
|
||||||
|
(umask $mkdir_umask &&
|
||||||
|
eval "\$doit_exec \$mkdirprog $prefixes") ||
|
||||||
|
test -d "$dstdir" || exit 1
|
||||||
|
obsolete_mkdir_used=true
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
if test -n "$dir_arg"; then
|
||||||
|
{ test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
|
||||||
|
{ test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
|
||||||
|
{ test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
|
||||||
|
test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
|
||||||
|
else
|
||||||
|
|
||||||
|
# Make a couple of temp file names in the proper directory.
|
||||||
|
dsttmp=$dstdir/_inst.$$_
|
||||||
|
rmtmp=$dstdir/_rm.$$_
|
||||||
|
|
||||||
|
# Trap to clean up those temp files at exit.
|
||||||
|
trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
|
||||||
|
|
||||||
|
# Copy the file name to the temp name.
|
||||||
|
(umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
|
||||||
|
|
||||||
|
# and set any options; do chmod last to preserve setuid bits.
|
||||||
|
#
|
||||||
|
# If any of these fail, we abort the whole thing. If we want to
|
||||||
|
# ignore errors from any of these, just make sure not to ignore
|
||||||
|
# errors from the above "$doit $cpprog $src $dsttmp" command.
|
||||||
|
#
|
||||||
|
{ test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
|
||||||
|
{ test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
|
||||||
|
{ test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
|
||||||
|
{ test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
|
||||||
|
|
||||||
|
# If -C, don't bother to copy if it wouldn't change the file.
|
||||||
|
if $copy_on_change &&
|
||||||
|
old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` &&
|
||||||
|
new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` &&
|
||||||
|
|
||||||
|
eval "$initialize_posix_glob" &&
|
||||||
|
$posix_glob set -f &&
|
||||||
|
set X $old && old=:$2:$4:$5:$6 &&
|
||||||
|
set X $new && new=:$2:$4:$5:$6 &&
|
||||||
|
$posix_glob set +f &&
|
||||||
|
|
||||||
|
test "$old" = "$new" &&
|
||||||
|
$cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
|
||||||
|
then
|
||||||
|
rm -f "$dsttmp"
|
||||||
|
else
|
||||||
|
# Rename the file to the real destination.
|
||||||
|
$doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
|
||||||
|
|
||||||
|
# The rename failed, perhaps because mv can't rename something else
|
||||||
|
# to itself, or perhaps because mv is so ancient that it does not
|
||||||
|
# support -f.
|
||||||
|
{
|
||||||
|
# Now remove or move aside any old file at destination location.
|
||||||
|
# We try this two ways since rm can't unlink itself on some
|
||||||
|
# systems and the destination file might be busy for other
|
||||||
|
# reasons. In this case, the final cleanup might fail but the new
|
||||||
|
# file should still install successfully.
|
||||||
|
{
|
||||||
|
test ! -f "$dst" ||
|
||||||
|
$doit $rmcmd -f "$dst" 2>/dev/null ||
|
||||||
|
{ $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
|
||||||
|
{ $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
|
||||||
|
} ||
|
||||||
|
{ echo "$0: cannot unlink or rename $dst" >&2
|
||||||
|
(exit 1); exit 1
|
||||||
|
}
|
||||||
|
} &&
|
||||||
|
|
||||||
|
# Now rename the file to the real destination.
|
||||||
|
$doit $mvcmd "$dsttmp" "$dst"
|
||||||
|
}
|
||||||
|
fi || exit 1
|
||||||
|
|
||||||
|
trap '' 0
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
|
# Local variables:
|
||||||
|
# eval: (add-hook 'write-file-hooks 'time-stamp)
|
||||||
|
# time-stamp-start: "scriptversion="
|
||||||
|
# time-stamp-format: "%:y-%02m-%02d.%02H"
|
||||||
|
# time-stamp-time-zone: "UTC"
|
||||||
|
# time-stamp-end: "; # UTC"
|
||||||
|
# End:
|
||||||
|
|
|
@ -9,5 +9,5 @@ Version: @VERSION@
|
||||||
Description: libXML library version2.
|
Description: libXML library version2.
|
||||||
Requires:
|
Requires:
|
||||||
Libs: -L${libdir} -lxml2
|
Libs: -L${libdir} -lxml2
|
||||||
Libs.private: @THREAD_LIBS@ @Z_LIBS@ @ICONV_LIBS@ @M_LIBS@ @LIBS@
|
Libs.private: @THREAD_LIBS@ @Z_LIBS@ @ICONV_LIBS@ @M_LIBS@ @WIN32_EXTRA_LIBADD@ @LIBS@
|
||||||
Cflags: @XML_INCLUDEDIR@ @XML_CFLAGS@
|
Cflags: @XML_INCLUDEDIR@ @XML_CFLAGS@
|
||||||
|
|
6
reactos/lib/3rdparty/libxml2/libxml2.spec
vendored
6
reactos/lib/3rdparty/libxml2/libxml2.spec
vendored
|
@ -1,6 +1,6 @@
|
||||||
Summary: Library providing XML and HTML support
|
Summary: Library providing XML and HTML support
|
||||||
Name: libxml2
|
Name: libxml2
|
||||||
Version: 2.7.6
|
Version: 2.7.7
|
||||||
Release: 1
|
Release: 1
|
||||||
License: MIT
|
License: MIT
|
||||||
Group: Development/Libraries
|
Group: Development/Libraries
|
||||||
|
@ -127,6 +127,6 @@ rm -fr %{buildroot}
|
||||||
%doc doc/python.html
|
%doc doc/python.html
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Tue Oct 6 2009 Daniel Veillard <veillard@redhat.com>
|
* Mon Mar 15 2010 Daniel Veillard <veillard@redhat.com>
|
||||||
- upstream release 2.7.6 see http://xmlsoft.org/news.html
|
- upstream release 2.7.7 see http://xmlsoft.org/news.html
|
||||||
|
|
||||||
|
|
8
reactos/lib/3rdparty/libxml2/ltmain.sh
vendored
8
reactos/lib/3rdparty/libxml2/ltmain.sh
vendored
|
@ -1,6 +1,6 @@
|
||||||
# Generated from ltmain.m4sh.
|
# Generated from ltmain.m4sh.
|
||||||
|
|
||||||
# ltmain.sh (GNU libtool) 2.2.6
|
# ltmain.sh (GNU libtool) 2.2.6b
|
||||||
# Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
|
# Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
|
||||||
|
|
||||||
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc.
|
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc.
|
||||||
|
@ -65,7 +65,7 @@
|
||||||
# compiler: $LTCC
|
# compiler: $LTCC
|
||||||
# compiler flags: $LTCFLAGS
|
# compiler flags: $LTCFLAGS
|
||||||
# linker: $LD (gnu? $with_gnu_ld)
|
# linker: $LD (gnu? $with_gnu_ld)
|
||||||
# $progname: (GNU libtool) 2.2.6
|
# $progname: (GNU libtool) 2.2.6b
|
||||||
# automake: $automake_version
|
# automake: $automake_version
|
||||||
# autoconf: $autoconf_version
|
# autoconf: $autoconf_version
|
||||||
#
|
#
|
||||||
|
@ -73,9 +73,9 @@
|
||||||
|
|
||||||
PROGRAM=ltmain.sh
|
PROGRAM=ltmain.sh
|
||||||
PACKAGE=libtool
|
PACKAGE=libtool
|
||||||
VERSION=2.2.6
|
VERSION=2.2.6b
|
||||||
TIMESTAMP=""
|
TIMESTAMP=""
|
||||||
package_revision=1.3012
|
package_revision=1.3017
|
||||||
|
|
||||||
# Be Bourne compatible
|
# Be Bourne compatible
|
||||||
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
|
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
|
||||||
|
|
226
reactos/lib/3rdparty/libxml2/missing
vendored
226
reactos/lib/3rdparty/libxml2/missing
vendored
|
@ -1,6 +1,10 @@
|
||||||
#! /bin/sh
|
#! /bin/sh
|
||||||
# Common stub for a few missing GNU programs while installing.
|
# Common stub for a few missing GNU programs while installing.
|
||||||
# Copyright (C) 1996, 1997, 1999, 2000, 2002 Free Software Foundation, Inc.
|
|
||||||
|
scriptversion=2009-04-28.21; # UTC
|
||||||
|
|
||||||
|
# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
|
||||||
|
# 2008, 2009 Free Software Foundation, Inc.
|
||||||
# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
|
# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
|
||||||
|
|
||||||
# This program is free software; you can redistribute it and/or modify
|
# This program is free software; you can redistribute it and/or modify
|
||||||
|
@ -14,9 +18,7 @@
|
||||||
# GNU General Public License for more details.
|
# GNU General Public License for more details.
|
||||||
|
|
||||||
# You should have received a copy of the GNU General Public License
|
# You should have received a copy of the GNU General Public License
|
||||||
# along with this program; if not, write to the Free Software
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
|
|
||||||
# 02111-1307, USA.
|
|
||||||
|
|
||||||
# As a special exception to the GNU General Public License, if you
|
# As a special exception to the GNU General Public License, if you
|
||||||
# distribute this file as part of a program that contains a
|
# distribute this file as part of a program that contains a
|
||||||
|
@ -29,6 +31,8 @@ if test $# -eq 0; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
run=:
|
run=:
|
||||||
|
sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
|
||||||
|
sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
|
||||||
|
|
||||||
# In the cases where this matters, `missing' is being run in the
|
# In the cases where this matters, `missing' is being run in the
|
||||||
# srcdir already.
|
# srcdir already.
|
||||||
|
@ -38,18 +42,24 @@ else
|
||||||
configure_ac=configure.in
|
configure_ac=configure.in
|
||||||
fi
|
fi
|
||||||
|
|
||||||
case "$1" in
|
msg="missing on your system"
|
||||||
|
|
||||||
|
case $1 in
|
||||||
--run)
|
--run)
|
||||||
# Try to run requested program, and just exit if it succeeds.
|
# Try to run requested program, and just exit if it succeeds.
|
||||||
run=
|
run=
|
||||||
shift
|
shift
|
||||||
"$@" && exit 0
|
"$@" && exit 0
|
||||||
|
# Exit code 63 means version mismatch. This often happens
|
||||||
|
# when the user try to use an ancient version of a tool on
|
||||||
|
# a file that requires a minimum version. In this case we
|
||||||
|
# we should proceed has if the program had been absent, or
|
||||||
|
# if --run hadn't been passed.
|
||||||
|
if test $? = 63; then
|
||||||
|
run=:
|
||||||
|
msg="probably too old"
|
||||||
|
fi
|
||||||
;;
|
;;
|
||||||
esac
|
|
||||||
|
|
||||||
# If it does not exist, or fails to run (possibly an outdated version),
|
|
||||||
# try to emulate it.
|
|
||||||
case "$1" in
|
|
||||||
|
|
||||||
-h|--h|--he|--hel|--help)
|
-h|--h|--he|--hel|--help)
|
||||||
echo "\
|
echo "\
|
||||||
|
@ -67,6 +77,7 @@ Supported PROGRAM values:
|
||||||
aclocal touch file \`aclocal.m4'
|
aclocal touch file \`aclocal.m4'
|
||||||
autoconf touch file \`configure'
|
autoconf touch file \`configure'
|
||||||
autoheader touch file \`config.h.in'
|
autoheader touch file \`config.h.in'
|
||||||
|
autom4te touch the output file, or create a stub one
|
||||||
automake touch all \`Makefile.in' files
|
automake touch all \`Makefile.in' files
|
||||||
bison create \`y.tab.[ch]', if possible, from existing .[ch]
|
bison create \`y.tab.[ch]', if possible, from existing .[ch]
|
||||||
flex create \`lex.yy.c', if possible, from existing .c
|
flex create \`lex.yy.c', if possible, from existing .c
|
||||||
|
@ -74,11 +85,18 @@ Supported PROGRAM values:
|
||||||
lex create \`lex.yy.c', if possible, from existing .c
|
lex create \`lex.yy.c', if possible, from existing .c
|
||||||
makeinfo touch the output file
|
makeinfo touch the output file
|
||||||
tar try tar, gnutar, gtar, then tar without non-portable flags
|
tar try tar, gnutar, gtar, then tar without non-portable flags
|
||||||
yacc create \`y.tab.[ch]', if possible, from existing .[ch]"
|
yacc create \`y.tab.[ch]', if possible, from existing .[ch]
|
||||||
|
|
||||||
|
Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
|
||||||
|
\`g' are ignored when checking the name.
|
||||||
|
|
||||||
|
Send bug reports to <bug-automake@gnu.org>."
|
||||||
|
exit $?
|
||||||
;;
|
;;
|
||||||
|
|
||||||
-v|--v|--ve|--ver|--vers|--versi|--versio|--version)
|
-v|--v|--ve|--ver|--vers|--versi|--versio|--version)
|
||||||
echo "missing 0.4 - GNU automake"
|
echo "missing $scriptversion (GNU Automake)"
|
||||||
|
exit $?
|
||||||
;;
|
;;
|
||||||
|
|
||||||
-*)
|
-*)
|
||||||
|
@ -87,42 +105,69 @@ Supported PROGRAM values:
|
||||||
exit 1
|
exit 1
|
||||||
;;
|
;;
|
||||||
|
|
||||||
aclocal*)
|
esac
|
||||||
|
|
||||||
|
# normalize program name to check for.
|
||||||
|
program=`echo "$1" | sed '
|
||||||
|
s/^gnu-//; t
|
||||||
|
s/^gnu//; t
|
||||||
|
s/^g//; t'`
|
||||||
|
|
||||||
|
# Now exit if we have it, but it failed. Also exit now if we
|
||||||
|
# don't have it and --version was passed (most likely to detect
|
||||||
|
# the program). This is about non-GNU programs, so use $1 not
|
||||||
|
# $program.
|
||||||
|
case $1 in
|
||||||
|
lex*|yacc*)
|
||||||
|
# Not GNU programs, they don't have --version.
|
||||||
|
;;
|
||||||
|
|
||||||
|
tar*)
|
||||||
|
if test -n "$run"; then
|
||||||
|
echo 1>&2 "ERROR: \`tar' requires --run"
|
||||||
|
exit 1
|
||||||
|
elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
;;
|
||||||
|
|
||||||
|
*)
|
||||||
if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
|
if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
|
||||||
# We have it, but it failed.
|
# We have it, but it failed.
|
||||||
exit 1
|
exit 1
|
||||||
|
elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
|
||||||
|
# Could not run --version or --help. This is probably someone
|
||||||
|
# running `$TOOL --version' or `$TOOL --help' to check whether
|
||||||
|
# $TOOL exists and not knowing $TOOL uses missing.
|
||||||
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
# If it does not exist, or fails to run (possibly an outdated version),
|
||||||
|
# try to emulate it.
|
||||||
|
case $program in
|
||||||
|
aclocal*)
|
||||||
echo 1>&2 "\
|
echo 1>&2 "\
|
||||||
WARNING: \`$1' is missing on your system. You should only need it if
|
WARNING: \`$1' is $msg. You should only need it if
|
||||||
you modified \`acinclude.m4' or \`${configure_ac}'. You might want
|
you modified \`acinclude.m4' or \`${configure_ac}'. You might want
|
||||||
to install the \`Automake' and \`Perl' packages. Grab them from
|
to install the \`Automake' and \`Perl' packages. Grab them from
|
||||||
any GNU archive site."
|
any GNU archive site."
|
||||||
touch aclocal.m4
|
touch aclocal.m4
|
||||||
;;
|
;;
|
||||||
|
|
||||||
autoconf)
|
autoconf*)
|
||||||
if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
|
|
||||||
# We have it, but it failed.
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo 1>&2 "\
|
echo 1>&2 "\
|
||||||
WARNING: \`$1' is missing on your system. You should only need it if
|
WARNING: \`$1' is $msg. You should only need it if
|
||||||
you modified \`${configure_ac}'. You might want to install the
|
you modified \`${configure_ac}'. You might want to install the
|
||||||
\`Autoconf' and \`GNU m4' packages. Grab them from any GNU
|
\`Autoconf' and \`GNU m4' packages. Grab them from any GNU
|
||||||
archive site."
|
archive site."
|
||||||
touch configure
|
touch configure
|
||||||
;;
|
;;
|
||||||
|
|
||||||
autoheader)
|
autoheader*)
|
||||||
if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
|
|
||||||
# We have it, but it failed.
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo 1>&2 "\
|
echo 1>&2 "\
|
||||||
WARNING: \`$1' is missing on your system. You should only need it if
|
WARNING: \`$1' is $msg. You should only need it if
|
||||||
you modified \`acconfig.h' or \`${configure_ac}'. You might want
|
you modified \`acconfig.h' or \`${configure_ac}'. You might want
|
||||||
to install the \`Autoconf' and \`GNU m4' packages. Grab them
|
to install the \`Autoconf' and \`GNU m4' packages. Grab them
|
||||||
from any GNU archive site."
|
from any GNU archive site."
|
||||||
|
@ -130,7 +175,7 @@ WARNING: \`$1' is missing on your system. You should only need it if
|
||||||
test -z "$files" && files="config.h"
|
test -z "$files" && files="config.h"
|
||||||
touch_files=
|
touch_files=
|
||||||
for f in $files; do
|
for f in $files; do
|
||||||
case "$f" in
|
case $f in
|
||||||
*:*) touch_files="$touch_files "`echo "$f" |
|
*:*) touch_files="$touch_files "`echo "$f" |
|
||||||
sed -e 's/^[^:]*://' -e 's/:.*//'`;;
|
sed -e 's/^[^:]*://' -e 's/:.*//'`;;
|
||||||
*) touch_files="$touch_files $f.in";;
|
*) touch_files="$touch_files $f.in";;
|
||||||
|
@ -140,13 +185,8 @@ WARNING: \`$1' is missing on your system. You should only need it if
|
||||||
;;
|
;;
|
||||||
|
|
||||||
automake*)
|
automake*)
|
||||||
if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
|
|
||||||
# We have it, but it failed.
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo 1>&2 "\
|
echo 1>&2 "\
|
||||||
WARNING: \`$1' is missing on your system. You should only need it if
|
WARNING: \`$1' is $msg. You should only need it if
|
||||||
you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
|
you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
|
||||||
You might want to install the \`Automake' and \`Perl' packages.
|
You might want to install the \`Automake' and \`Perl' packages.
|
||||||
Grab them from any GNU archive site."
|
Grab them from any GNU archive site."
|
||||||
|
@ -155,21 +195,16 @@ WARNING: \`$1' is missing on your system. You should only need it if
|
||||||
while read f; do touch "$f"; done
|
while read f; do touch "$f"; done
|
||||||
;;
|
;;
|
||||||
|
|
||||||
autom4te)
|
autom4te*)
|
||||||
if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
|
|
||||||
# We have it, but it failed.
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo 1>&2 "\
|
echo 1>&2 "\
|
||||||
WARNING: \`$1' is needed, and you do not seem to have it handy on your
|
WARNING: \`$1' is needed, but is $msg.
|
||||||
system. You might have modified some files without having the
|
You might have modified some files without having the
|
||||||
proper tools for further handling them.
|
proper tools for further handling them.
|
||||||
You can get \`$1Help2man' as part of \`Autoconf' from any GNU
|
You can get \`$1' as part of \`Autoconf' from any GNU
|
||||||
archive site."
|
archive site."
|
||||||
|
|
||||||
file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
|
file=`echo "$*" | sed -n "$sed_output"`
|
||||||
test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
|
test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
|
||||||
if test -f "$file"; then
|
if test -f "$file"; then
|
||||||
touch $file
|
touch $file
|
||||||
else
|
else
|
||||||
|
@ -183,111 +218,108 @@ WARNING: \`$1' is needed, and you do not seem to have it handy on your
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
|
|
||||||
bison|yacc)
|
bison*|yacc*)
|
||||||
echo 1>&2 "\
|
echo 1>&2 "\
|
||||||
WARNING: \`$1' is missing on your system. You should only need it if
|
WARNING: \`$1' $msg. You should only need it if
|
||||||
you modified a \`.y' file. You may need the \`Bison' package
|
you modified a \`.y' file. You may need the \`Bison' package
|
||||||
in order for those modifications to take effect. You can get
|
in order for those modifications to take effect. You can get
|
||||||
\`Bison' from any GNU archive site."
|
\`Bison' from any GNU archive site."
|
||||||
rm -f y.tab.c y.tab.h
|
rm -f y.tab.c y.tab.h
|
||||||
if [ $# -ne 1 ]; then
|
if test $# -ne 1; then
|
||||||
eval LASTARG="\${$#}"
|
eval LASTARG="\${$#}"
|
||||||
case "$LASTARG" in
|
case $LASTARG in
|
||||||
*.y)
|
*.y)
|
||||||
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
|
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
|
||||||
if [ -f "$SRCFILE" ]; then
|
if test -f "$SRCFILE"; then
|
||||||
cp "$SRCFILE" y.tab.c
|
cp "$SRCFILE" y.tab.c
|
||||||
fi
|
fi
|
||||||
SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
|
SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
|
||||||
if [ -f "$SRCFILE" ]; then
|
if test -f "$SRCFILE"; then
|
||||||
cp "$SRCFILE" y.tab.h
|
cp "$SRCFILE" y.tab.h
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
fi
|
fi
|
||||||
if [ ! -f y.tab.h ]; then
|
if test ! -f y.tab.h; then
|
||||||
echo >y.tab.h
|
echo >y.tab.h
|
||||||
fi
|
fi
|
||||||
if [ ! -f y.tab.c ]; then
|
if test ! -f y.tab.c; then
|
||||||
echo 'main() { return 0; }' >y.tab.c
|
echo 'main() { return 0; }' >y.tab.c
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
|
|
||||||
lex|flex)
|
lex*|flex*)
|
||||||
echo 1>&2 "\
|
echo 1>&2 "\
|
||||||
WARNING: \`$1' is missing on your system. You should only need it if
|
WARNING: \`$1' is $msg. You should only need it if
|
||||||
you modified a \`.l' file. You may need the \`Flex' package
|
you modified a \`.l' file. You may need the \`Flex' package
|
||||||
in order for those modifications to take effect. You can get
|
in order for those modifications to take effect. You can get
|
||||||
\`Flex' from any GNU archive site."
|
\`Flex' from any GNU archive site."
|
||||||
rm -f lex.yy.c
|
rm -f lex.yy.c
|
||||||
if [ $# -ne 1 ]; then
|
if test $# -ne 1; then
|
||||||
eval LASTARG="\${$#}"
|
eval LASTARG="\${$#}"
|
||||||
case "$LASTARG" in
|
case $LASTARG in
|
||||||
*.l)
|
*.l)
|
||||||
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
|
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
|
||||||
if [ -f "$SRCFILE" ]; then
|
if test -f "$SRCFILE"; then
|
||||||
cp "$SRCFILE" lex.yy.c
|
cp "$SRCFILE" lex.yy.c
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
fi
|
fi
|
||||||
if [ ! -f lex.yy.c ]; then
|
if test ! -f lex.yy.c; then
|
||||||
echo 'main() { return 0; }' >lex.yy.c
|
echo 'main() { return 0; }' >lex.yy.c
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
|
|
||||||
help2man)
|
help2man*)
|
||||||
if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
|
|
||||||
# We have it, but it failed.
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo 1>&2 "\
|
echo 1>&2 "\
|
||||||
WARNING: \`$1' is missing on your system. You should only need it if
|
WARNING: \`$1' is $msg. You should only need it if
|
||||||
you modified a dependency of a manual page. You may need the
|
you modified a dependency of a manual page. You may need the
|
||||||
\`Help2man' package in order for those modifications to take
|
\`Help2man' package in order for those modifications to take
|
||||||
effect. You can get \`Help2man' from any GNU archive site."
|
effect. You can get \`Help2man' from any GNU archive site."
|
||||||
|
|
||||||
file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
|
file=`echo "$*" | sed -n "$sed_output"`
|
||||||
if test -z "$file"; then
|
test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
|
||||||
file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
|
if test -f "$file"; then
|
||||||
fi
|
|
||||||
if [ -f "$file" ]; then
|
|
||||||
touch $file
|
touch $file
|
||||||
else
|
else
|
||||||
test -z "$file" || exec >$file
|
test -z "$file" || exec >$file
|
||||||
echo ".ab help2man is required to generate this page"
|
echo ".ab help2man is required to generate this page"
|
||||||
exit 1
|
exit $?
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
|
|
||||||
makeinfo)
|
makeinfo*)
|
||||||
if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then
|
|
||||||
# We have makeinfo, but it failed.
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo 1>&2 "\
|
echo 1>&2 "\
|
||||||
WARNING: \`$1' is missing on your system. You should only need it if
|
WARNING: \`$1' is $msg. You should only need it if
|
||||||
you modified a \`.texi' or \`.texinfo' file, or any other file
|
you modified a \`.texi' or \`.texinfo' file, or any other file
|
||||||
indirectly affecting the aspect of the manual. The spurious
|
indirectly affecting the aspect of the manual. The spurious
|
||||||
call might also be the consequence of using a buggy \`make' (AIX,
|
call might also be the consequence of using a buggy \`make' (AIX,
|
||||||
DU, IRIX). You might want to install the \`Texinfo' package or
|
DU, IRIX). You might want to install the \`Texinfo' package or
|
||||||
the \`GNU make' package. Grab either from any GNU archive site."
|
the \`GNU make' package. Grab either from any GNU archive site."
|
||||||
file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
|
# The file to touch is that specified with -o ...
|
||||||
|
file=`echo "$*" | sed -n "$sed_output"`
|
||||||
|
test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
|
||||||
if test -z "$file"; then
|
if test -z "$file"; then
|
||||||
file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
|
# ... or it is the one specified with @setfilename ...
|
||||||
file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
|
infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
|
||||||
|
file=`sed -n '
|
||||||
|
/^@setfilename/{
|
||||||
|
s/.* \([^ ]*\) *$/\1/
|
||||||
|
p
|
||||||
|
q
|
||||||
|
}' $infile`
|
||||||
|
# ... or it is derived from the source name (dir/f.texi becomes f.info)
|
||||||
|
test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
|
||||||
fi
|
fi
|
||||||
|
# If the file does not exist, the user really needs makeinfo;
|
||||||
|
# let's fail without touching anything.
|
||||||
|
test -f $file || exit 1
|
||||||
touch $file
|
touch $file
|
||||||
;;
|
;;
|
||||||
|
|
||||||
tar)
|
tar*)
|
||||||
shift
|
shift
|
||||||
if test -n "$run"; then
|
|
||||||
echo 1>&2 "ERROR: \`tar' requires --run"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
# We have already tried tar in the generic part.
|
# We have already tried tar in the generic part.
|
||||||
# Look for gnutar/gtar before invocation to avoid ugly error
|
# Look for gnutar/gtar before invocation to avoid ugly error
|
||||||
|
@ -300,13 +332,13 @@ WARNING: \`$1' is missing on your system. You should only need it if
|
||||||
fi
|
fi
|
||||||
firstarg="$1"
|
firstarg="$1"
|
||||||
if shift; then
|
if shift; then
|
||||||
case "$firstarg" in
|
case $firstarg in
|
||||||
*o*)
|
*o*)
|
||||||
firstarg=`echo "$firstarg" | sed s/o//`
|
firstarg=`echo "$firstarg" | sed s/o//`
|
||||||
tar "$firstarg" "$@" && exit 0
|
tar "$firstarg" "$@" && exit 0
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
case "$firstarg" in
|
case $firstarg in
|
||||||
*h*)
|
*h*)
|
||||||
firstarg=`echo "$firstarg" | sed s/h//`
|
firstarg=`echo "$firstarg" | sed s/h//`
|
||||||
tar "$firstarg" "$@" && exit 0
|
tar "$firstarg" "$@" && exit 0
|
||||||
|
@ -323,10 +355,10 @@ WARNING: I can't seem to be able to run \`tar' with the given arguments.
|
||||||
|
|
||||||
*)
|
*)
|
||||||
echo 1>&2 "\
|
echo 1>&2 "\
|
||||||
WARNING: \`$1' is needed, and you do not seem to have it handy on your
|
WARNING: \`$1' is needed, and is $msg.
|
||||||
system. You might have modified some files without having the
|
You might have modified some files without having the
|
||||||
proper tools for further handling them. Check the \`README' file,
|
proper tools for further handling them. Check the \`README' file,
|
||||||
it often tells you about the needed prerequirements for installing
|
it often tells you about the needed prerequisites for installing
|
||||||
this package. You may also peek at any GNU archive site, in case
|
this package. You may also peek at any GNU archive site, in case
|
||||||
some other package would contain this missing \`$1' program."
|
some other package would contain this missing \`$1' program."
|
||||||
exit 1
|
exit 1
|
||||||
|
@ -334,3 +366,11 @@ WARNING: \`$1' is needed, and you do not seem to have it handy on your
|
||||||
esac
|
esac
|
||||||
|
|
||||||
exit 0
|
exit 0
|
||||||
|
|
||||||
|
# Local variables:
|
||||||
|
# eval: (add-hook 'write-file-hooks 'time-stamp)
|
||||||
|
# time-stamp-start: "scriptversion="
|
||||||
|
# time-stamp-format: "%:y-%02m-%02d.%02H"
|
||||||
|
# time-stamp-time-zone: "UTC"
|
||||||
|
# time-stamp-end: "; # UTC"
|
||||||
|
# End:
|
||||||
|
|
127
reactos/lib/3rdparty/libxml2/mkinstalldirs
vendored
127
reactos/lib/3rdparty/libxml2/mkinstalldirs
vendored
|
@ -1,28 +1,58 @@
|
||||||
#! /bin/sh
|
#! /bin/sh
|
||||||
# mkinstalldirs --- make directory hierarchy
|
# mkinstalldirs --- make directory hierarchy
|
||||||
# Author: Noah Friedman <friedman@prep.ai.mit.edu>
|
|
||||||
# Created: 1993-05-16
|
|
||||||
# Public domain
|
|
||||||
|
|
||||||
|
scriptversion=2009-04-28.21; # UTC
|
||||||
|
|
||||||
|
# Original author: Noah Friedman <friedman@prep.ai.mit.edu>
|
||||||
|
# Created: 1993-05-16
|
||||||
|
# Public domain.
|
||||||
|
#
|
||||||
|
# This file is maintained in Automake, please report
|
||||||
|
# bugs to <bug-automake@gnu.org> or send patches to
|
||||||
|
# <automake-patches@gnu.org>.
|
||||||
|
|
||||||
|
nl='
|
||||||
|
'
|
||||||
|
IFS=" "" $nl"
|
||||||
errstatus=0
|
errstatus=0
|
||||||
dirmode=""
|
dirmode=
|
||||||
|
|
||||||
usage="\
|
usage="\
|
||||||
Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..."
|
Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ...
|
||||||
|
|
||||||
|
Create each directory DIR (with mode MODE, if specified), including all
|
||||||
|
leading file name components.
|
||||||
|
|
||||||
|
Report bugs to <bug-automake@gnu.org>."
|
||||||
|
|
||||||
# process command line arguments
|
# process command line arguments
|
||||||
while test $# -gt 0 ; do
|
while test $# -gt 0 ; do
|
||||||
case "${1}" in
|
case $1 in
|
||||||
-h | --help | --h* ) # -h for help
|
-h | --help | --h*) # -h for help
|
||||||
echo "${usage}" 1>&2; exit 0 ;;
|
echo "$usage"
|
||||||
-m ) # -m PERM arg
|
exit $?
|
||||||
|
;;
|
||||||
|
-m) # -m PERM arg
|
||||||
shift
|
shift
|
||||||
test $# -eq 0 && { echo "${usage}" 1>&2; exit 1; }
|
test $# -eq 0 && { echo "$usage" 1>&2; exit 1; }
|
||||||
dirmode="${1}"
|
dirmode=$1
|
||||||
shift ;;
|
shift
|
||||||
-- ) shift; break ;; # stop option processing
|
;;
|
||||||
-* ) echo "${usage}" 1>&2; exit 1 ;; # unknown option
|
--version)
|
||||||
* ) break ;; # first non-opt arg
|
echo "$0 $scriptversion"
|
||||||
|
exit $?
|
||||||
|
;;
|
||||||
|
--) # stop option processing
|
||||||
|
shift
|
||||||
|
break
|
||||||
|
;;
|
||||||
|
-*) # unknown option
|
||||||
|
echo "$usage" 1>&2
|
||||||
|
exit 1
|
||||||
|
;;
|
||||||
|
*) # first non-opt arg
|
||||||
|
break
|
||||||
|
;;
|
||||||
esac
|
esac
|
||||||
done
|
done
|
||||||
|
|
||||||
|
@ -36,33 +66,63 @@ do
|
||||||
done
|
done
|
||||||
|
|
||||||
case $# in
|
case $# in
|
||||||
0) exit 0 ;;
|
0) exit 0 ;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
|
# Solaris 8's mkdir -p isn't thread-safe. If you mkdir -p a/b and
|
||||||
|
# mkdir -p a/c at the same time, both will detect that a is missing,
|
||||||
|
# one will create a, then the other will try to create a and die with
|
||||||
|
# a "File exists" error. This is a problem when calling mkinstalldirs
|
||||||
|
# from a parallel make. We use --version in the probe to restrict
|
||||||
|
# ourselves to GNU mkdir, which is thread-safe.
|
||||||
case $dirmode in
|
case $dirmode in
|
||||||
'')
|
'')
|
||||||
if mkdir -p -- . 2>/dev/null; then
|
if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
|
||||||
echo "mkdir -p -- $*"
|
echo "mkdir -p -- $*"
|
||||||
exec mkdir -p -- "$@"
|
exec mkdir -p -- "$@"
|
||||||
fi ;;
|
else
|
||||||
*)
|
# On NextStep and OpenStep, the `mkdir' command does not
|
||||||
if mkdir -m "$dirmode" -p -- . 2>/dev/null; then
|
# recognize any option. It will interpret all options as
|
||||||
|
# directories to create, and then abort because `.' already
|
||||||
|
# exists.
|
||||||
|
test -d ./-p && rmdir ./-p
|
||||||
|
test -d ./--version && rmdir ./--version
|
||||||
|
fi
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 &&
|
||||||
|
test ! -d ./--version; then
|
||||||
echo "mkdir -m $dirmode -p -- $*"
|
echo "mkdir -m $dirmode -p -- $*"
|
||||||
exec mkdir -m "$dirmode" -p -- "$@"
|
exec mkdir -m "$dirmode" -p -- "$@"
|
||||||
fi ;;
|
else
|
||||||
|
# Clean up after NextStep and OpenStep mkdir.
|
||||||
|
for d in ./-m ./-p ./--version "./$dirmode";
|
||||||
|
do
|
||||||
|
test -d $d && rmdir $d
|
||||||
|
done
|
||||||
|
fi
|
||||||
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
for file
|
for file
|
||||||
do
|
do
|
||||||
set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
|
case $file in
|
||||||
|
/*) pathcomp=/ ;;
|
||||||
|
*) pathcomp= ;;
|
||||||
|
esac
|
||||||
|
oIFS=$IFS
|
||||||
|
IFS=/
|
||||||
|
set fnord $file
|
||||||
shift
|
shift
|
||||||
|
IFS=$oIFS
|
||||||
|
|
||||||
pathcomp=
|
|
||||||
for d
|
for d
|
||||||
do
|
do
|
||||||
pathcomp="$pathcomp$d"
|
test "x$d" = x && continue
|
||||||
case "$pathcomp" in
|
|
||||||
-* ) pathcomp=./$pathcomp ;;
|
pathcomp=$pathcomp$d
|
||||||
|
case $pathcomp in
|
||||||
|
-*) pathcomp=./$pathcomp ;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
if test ! -d "$pathcomp"; then
|
if test ! -d "$pathcomp"; then
|
||||||
|
@ -75,8 +135,7 @@ do
|
||||||
else
|
else
|
||||||
if test ! -z "$dirmode"; then
|
if test ! -z "$dirmode"; then
|
||||||
echo "chmod $dirmode $pathcomp"
|
echo "chmod $dirmode $pathcomp"
|
||||||
|
lasterr=
|
||||||
lasterr=""
|
|
||||||
chmod "$dirmode" "$pathcomp" || lasterr=$?
|
chmod "$dirmode" "$pathcomp" || lasterr=$?
|
||||||
|
|
||||||
if test ! -z "$lasterr"; then
|
if test ! -z "$lasterr"; then
|
||||||
|
@ -86,7 +145,7 @@ do
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
pathcomp="$pathcomp/"
|
pathcomp=$pathcomp/
|
||||||
done
|
done
|
||||||
done
|
done
|
||||||
|
|
||||||
|
@ -94,6 +153,10 @@ exit $errstatus
|
||||||
|
|
||||||
# Local Variables:
|
# Local Variables:
|
||||||
# mode: shell-script
|
# mode: shell-script
|
||||||
# sh-indentation: 3
|
# sh-indentation: 2
|
||||||
|
# eval: (add-hook 'write-file-hooks 'time-stamp)
|
||||||
|
# time-stamp-start: "scriptversion="
|
||||||
|
# time-stamp-format: "%:y-%02m-%02d.%02H"
|
||||||
|
# time-stamp-time-zone: "UTC"
|
||||||
|
# time-stamp-end: "; # UTC"
|
||||||
# End:
|
# End:
|
||||||
# mkinstalldirs ends here
|
|
||||||
|
|
6
reactos/lib/3rdparty/libxml2/nanohttp.c
vendored
6
reactos/lib/3rdparty/libxml2/nanohttp.c
vendored
|
@ -478,8 +478,10 @@ xmlNanoHTTPSend(xmlNanoHTTPCtxtPtr ctxt, const char *xmt_ptr, int outlen)
|
||||||
* to retrying.
|
* to retrying.
|
||||||
*/
|
*/
|
||||||
#ifndef HAVE_POLL_H
|
#ifndef HAVE_POLL_H
|
||||||
|
#ifndef _WINSOCKAPI_
|
||||||
if (ctxt->fd > FD_SETSIZE)
|
if (ctxt->fd > FD_SETSIZE)
|
||||||
return -1;
|
return -1;
|
||||||
|
#endif
|
||||||
|
|
||||||
tv.tv_sec = timeout;
|
tv.tv_sec = timeout;
|
||||||
tv.tv_usec = 0;
|
tv.tv_usec = 0;
|
||||||
|
@ -600,8 +602,10 @@ xmlNanoHTTPRecv(xmlNanoHTTPCtxtPtr ctxt)
|
||||||
)
|
)
|
||||||
return (0);
|
return (0);
|
||||||
#else /* !HAVE_POLL_H */
|
#else /* !HAVE_POLL_H */
|
||||||
|
#ifndef _WINSOCKAPI_
|
||||||
if (ctxt->fd > FD_SETSIZE)
|
if (ctxt->fd > FD_SETSIZE)
|
||||||
return 0;
|
return 0;
|
||||||
|
#endif
|
||||||
|
|
||||||
tv.tv_sec = timeout;
|
tv.tv_sec = timeout;
|
||||||
tv.tv_usec = 0;
|
tv.tv_usec = 0;
|
||||||
|
@ -938,8 +942,10 @@ xmlNanoHTTPConnectAttempt(struct sockaddr *addr)
|
||||||
#pragma warning(push)
|
#pragma warning(push)
|
||||||
#pragma warning(disable: 4018)
|
#pragma warning(disable: 4018)
|
||||||
#endif
|
#endif
|
||||||
|
#ifndef _WINSOCKAPI_
|
||||||
if (s > FD_SETSIZE)
|
if (s > FD_SETSIZE)
|
||||||
return -1;
|
return -1;
|
||||||
|
#endif
|
||||||
FD_ZERO(&wfd);
|
FD_ZERO(&wfd);
|
||||||
FD_SET(s, &wfd);
|
FD_SET(s, &wfd);
|
||||||
|
|
||||||
|
|
49
reactos/lib/3rdparty/libxml2/parser.c
vendored
49
reactos/lib/3rdparty/libxml2/parser.c
vendored
|
@ -1864,7 +1864,7 @@ static void xmlSHRINK (xmlParserCtxtPtr ctxt) {
|
||||||
|
|
||||||
static void xmlGROW (xmlParserCtxtPtr ctxt) {
|
static void xmlGROW (xmlParserCtxtPtr ctxt) {
|
||||||
xmlParserInputGrow(ctxt->input, INPUT_CHUNK);
|
xmlParserInputGrow(ctxt->input, INPUT_CHUNK);
|
||||||
if ((*ctxt->input->cur == 0) &&
|
if ((ctxt->input->cur != NULL) && (*ctxt->input->cur == 0) &&
|
||||||
(xmlParserInputGrow(ctxt->input, INPUT_CHUNK) <= 0))
|
(xmlParserInputGrow(ctxt->input, INPUT_CHUNK) <= 0))
|
||||||
xmlPopInput(ctxt);
|
xmlPopInput(ctxt);
|
||||||
}
|
}
|
||||||
|
@ -11546,7 +11546,7 @@ xmldecl_done:
|
||||||
*/
|
*/
|
||||||
if ((ctxt->instate == XML_PARSER_START) && (ctxt->input != NULL) &&
|
if ((ctxt->instate == XML_PARSER_START) && (ctxt->input != NULL) &&
|
||||||
(ctxt->input->buf != NULL) && (ctxt->input->buf->encoder != NULL)) {
|
(ctxt->input->buf != NULL) && (ctxt->input->buf->encoder != NULL)) {
|
||||||
int len = 45;
|
unsigned int len = 45;
|
||||||
|
|
||||||
if ((xmlStrcasestr(BAD_CAST ctxt->input->buf->encoder->name,
|
if ((xmlStrcasestr(BAD_CAST ctxt->input->buf->encoder->name,
|
||||||
BAD_CAST "UTF-16")) ||
|
BAD_CAST "UTF-16")) ||
|
||||||
|
@ -11562,8 +11562,17 @@ xmldecl_done:
|
||||||
if (ctxt->input->buf->rawconsumed < len)
|
if (ctxt->input->buf->rawconsumed < len)
|
||||||
len -= ctxt->input->buf->rawconsumed;
|
len -= ctxt->input->buf->rawconsumed;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Change size for reading the initial declaration only
|
||||||
|
* if size is greater than len. Otherwise, memmove in xmlBufferAdd
|
||||||
|
* will blindly copy extra bytes from memory.
|
||||||
|
*/
|
||||||
|
if (size > len) {
|
||||||
remain = size - len;
|
remain = size - len;
|
||||||
size = len;
|
size = len;
|
||||||
|
} else {
|
||||||
|
remain = 0;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
res =xmlParserInputBufferPush(ctxt->input->buf, size, chunk);
|
res =xmlParserInputBufferPush(ctxt->input->buf, size, chunk);
|
||||||
if (res < 0) {
|
if (res < 0) {
|
||||||
|
@ -12870,20 +12879,20 @@ xmlParseInNodeContext(xmlNodePtr node, const char *data, int datalen,
|
||||||
if (doc->type == XML_DOCUMENT_NODE)
|
if (doc->type == XML_DOCUMENT_NODE)
|
||||||
ctxt = xmlCreateMemoryParserCtxt((char *) data, datalen);
|
ctxt = xmlCreateMemoryParserCtxt((char *) data, datalen);
|
||||||
#ifdef LIBXML_HTML_ENABLED
|
#ifdef LIBXML_HTML_ENABLED
|
||||||
else if (doc->type == XML_HTML_DOCUMENT_NODE)
|
else if (doc->type == XML_HTML_DOCUMENT_NODE) {
|
||||||
ctxt = htmlCreateMemoryParserCtxt((char *) data, datalen);
|
ctxt = htmlCreateMemoryParserCtxt((char *) data, datalen);
|
||||||
|
/*
|
||||||
|
* When parsing in context, it makes no sense to add implied
|
||||||
|
* elements like html/body/etc...
|
||||||
|
*/
|
||||||
|
options |= HTML_PARSE_NOIMPLIED;
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
else
|
else
|
||||||
return(XML_ERR_INTERNAL_ERROR);
|
return(XML_ERR_INTERNAL_ERROR);
|
||||||
|
|
||||||
if (ctxt == NULL)
|
if (ctxt == NULL)
|
||||||
return(XML_ERR_NO_MEMORY);
|
return(XML_ERR_NO_MEMORY);
|
||||||
fake = xmlNewComment(NULL);
|
|
||||||
if (fake == NULL) {
|
|
||||||
xmlFreeParserCtxt(ctxt);
|
|
||||||
return(XML_ERR_NO_MEMORY);
|
|
||||||
}
|
|
||||||
xmlAddChild(node, fake);
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Use input doc's dict if present, else assure XML_PARSE_NODICT is set.
|
* Use input doc's dict if present, else assure XML_PARSE_NODICT is set.
|
||||||
|
@ -12897,10 +12906,32 @@ xmlParseInNodeContext(xmlNodePtr node, const char *data, int datalen,
|
||||||
} else
|
} else
|
||||||
options |= XML_PARSE_NODICT;
|
options |= XML_PARSE_NODICT;
|
||||||
|
|
||||||
|
if (doc->encoding != NULL) {
|
||||||
|
xmlCharEncodingHandlerPtr hdlr;
|
||||||
|
|
||||||
|
if (ctxt->encoding != NULL)
|
||||||
|
xmlFree((xmlChar *) ctxt->encoding);
|
||||||
|
ctxt->encoding = xmlStrdup((const xmlChar *) doc->encoding);
|
||||||
|
|
||||||
|
hdlr = xmlFindCharEncodingHandler(doc->encoding);
|
||||||
|
if (hdlr != NULL) {
|
||||||
|
xmlSwitchToEncoding(ctxt, hdlr);
|
||||||
|
} else {
|
||||||
|
return(XML_ERR_UNSUPPORTED_ENCODING);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
xmlCtxtUseOptionsInternal(ctxt, options, NULL);
|
xmlCtxtUseOptionsInternal(ctxt, options, NULL);
|
||||||
xmlDetectSAX2(ctxt);
|
xmlDetectSAX2(ctxt);
|
||||||
ctxt->myDoc = doc;
|
ctxt->myDoc = doc;
|
||||||
|
|
||||||
|
fake = xmlNewComment(NULL);
|
||||||
|
if (fake == NULL) {
|
||||||
|
xmlFreeParserCtxt(ctxt);
|
||||||
|
return(XML_ERR_NO_MEMORY);
|
||||||
|
}
|
||||||
|
xmlAddChild(node, fake);
|
||||||
|
|
||||||
if (node->type == XML_ELEMENT_NODE) {
|
if (node->type == XML_ELEMENT_NODE) {
|
||||||
nodePush(ctxt, node);
|
nodePush(ctxt, node);
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -1782,6 +1782,7 @@ xmlFreeParserCtxt(xmlParserCtxtPtr ctxt)
|
||||||
if (ctxt->spaceTab != NULL) xmlFree(ctxt->spaceTab);
|
if (ctxt->spaceTab != NULL) xmlFree(ctxt->spaceTab);
|
||||||
if (ctxt->nameTab != NULL) xmlFree((xmlChar * *)ctxt->nameTab);
|
if (ctxt->nameTab != NULL) xmlFree((xmlChar * *)ctxt->nameTab);
|
||||||
if (ctxt->nodeTab != NULL) xmlFree(ctxt->nodeTab);
|
if (ctxt->nodeTab != NULL) xmlFree(ctxt->nodeTab);
|
||||||
|
if (ctxt->nodeInfoTab != NULL) xmlFree(ctxt->nodeInfoTab);
|
||||||
if (ctxt->inputTab != NULL) xmlFree(ctxt->inputTab);
|
if (ctxt->inputTab != NULL) xmlFree(ctxt->inputTab);
|
||||||
if (ctxt->version != NULL) xmlFree((char *) ctxt->version);
|
if (ctxt->version != NULL) xmlFree((char *) ctxt->version);
|
||||||
if (ctxt->encoding != NULL) xmlFree((char *) ctxt->encoding);
|
if (ctxt->encoding != NULL) xmlFree((char *) ctxt->encoding);
|
||||||
|
|
6
reactos/lib/3rdparty/libxml2/relaxng.c
vendored
6
reactos/lib/3rdparty/libxml2/relaxng.c
vendored
|
@ -5369,7 +5369,8 @@ xmlRelaxNGParseNameClass(xmlRelaxNGParserCtxtPtr ctxt, xmlNodePtr node,
|
||||||
} else {
|
} else {
|
||||||
xmlRngPErr(ctxt, node, XML_RNGP_CHOICE_CONTENT,
|
xmlRngPErr(ctxt, node, XML_RNGP_CHOICE_CONTENT,
|
||||||
"expecting name, anyName, nsName or choice : got %s\n",
|
"expecting name, anyName, nsName or choice : got %s\n",
|
||||||
(node == NULL ? "nothing" : node->name), NULL);
|
(node == NULL ? (const xmlChar *) "nothing" : node->name),
|
||||||
|
NULL);
|
||||||
return (NULL);
|
return (NULL);
|
||||||
}
|
}
|
||||||
if (ret != def) {
|
if (ret != def) {
|
||||||
|
@ -9459,7 +9460,8 @@ xmlRelaxNGValidateInterleave(xmlRelaxNGValidCtxtPtr ctxt,
|
||||||
ctxt->states = NULL;
|
ctxt->states = NULL;
|
||||||
if (found == 0) {
|
if (found == 0) {
|
||||||
if (cur == NULL) {
|
if (cur == NULL) {
|
||||||
VALID_ERR2(XML_RELAXNG_ERR_INTEREXTRA, "noname");
|
VALID_ERR2(XML_RELAXNG_ERR_INTEREXTRA,
|
||||||
|
(const xmlChar *) "noname");
|
||||||
} else {
|
} else {
|
||||||
VALID_ERR2(XML_RELAXNG_ERR_INTEREXTRA, cur->name);
|
VALID_ERR2(XML_RELAXNG_ERR_INTEREXTRA, cur->name);
|
||||||
}
|
}
|
||||||
|
|
2
reactos/lib/3rdparty/libxml2/runtest.c
vendored
2
reactos/lib/3rdparty/libxml2/runtest.c
vendored
|
@ -3165,7 +3165,7 @@ rngTest(const char *filename,
|
||||||
const char *instance;
|
const char *instance;
|
||||||
xmlRelaxNGParserCtxtPtr ctxt;
|
xmlRelaxNGParserCtxtPtr ctxt;
|
||||||
xmlRelaxNGPtr schemas;
|
xmlRelaxNGPtr schemas;
|
||||||
int res = 0, len, ret;
|
int res = 0, len, ret = 0;
|
||||||
char pattern[500];
|
char pattern[500];
|
||||||
char prefix[500];
|
char prefix[500];
|
||||||
char result[500];
|
char result[500];
|
||||||
|
|
10
reactos/lib/3rdparty/libxml2/tree.c
vendored
10
reactos/lib/3rdparty/libxml2/tree.c
vendored
|
@ -3527,7 +3527,7 @@ xmlPreviousElementSibling(xmlNodePtr node) {
|
||||||
while (node != NULL) {
|
while (node != NULL) {
|
||||||
if (node->type == XML_ELEMENT_NODE)
|
if (node->type == XML_ELEMENT_NODE)
|
||||||
return(node);
|
return(node);
|
||||||
node = node->next;
|
node = node->prev;
|
||||||
}
|
}
|
||||||
return(NULL);
|
return(NULL);
|
||||||
}
|
}
|
||||||
|
@ -4188,6 +4188,8 @@ xmlStaticCopyNode(const xmlNodePtr node, xmlDocPtr doc, xmlNodePtr parent,
|
||||||
|
|
||||||
while (root->parent != NULL) root = root->parent;
|
while (root->parent != NULL) root = root->parent;
|
||||||
ret->ns = xmlNewNs(root, ns->href, ns->prefix);
|
ret->ns = xmlNewNs(root, ns->href, ns->prefix);
|
||||||
|
} else {
|
||||||
|
ret->ns = xmlNewReconciliedNs(doc, ret, node->ns);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
/*
|
/*
|
||||||
|
@ -5056,7 +5058,7 @@ xmlNodeSetName(xmlNodePtr cur, const xmlChar *name) {
|
||||||
void
|
void
|
||||||
xmlNodeSetBase(xmlNodePtr cur, const xmlChar* uri) {
|
xmlNodeSetBase(xmlNodePtr cur, const xmlChar* uri) {
|
||||||
xmlNsPtr ns;
|
xmlNsPtr ns;
|
||||||
const xmlChar* fixed;
|
xmlChar* fixed;
|
||||||
|
|
||||||
if (cur == NULL) return;
|
if (cur == NULL) return;
|
||||||
switch(cur->type) {
|
switch(cur->type) {
|
||||||
|
@ -5103,7 +5105,7 @@ xmlNodeSetBase(xmlNodePtr cur, const xmlChar* uri) {
|
||||||
fixed = xmlPathToURI(uri);
|
fixed = xmlPathToURI(uri);
|
||||||
if (fixed != NULL) {
|
if (fixed != NULL) {
|
||||||
xmlSetNsProp(cur, ns, BAD_CAST "base", fixed);
|
xmlSetNsProp(cur, ns, BAD_CAST "base", fixed);
|
||||||
xmlFree((xmlChar *)fixed);
|
xmlFree(fixed);
|
||||||
} else {
|
} else {
|
||||||
xmlSetNsProp(cur, ns, BAD_CAST "base", uri);
|
xmlSetNsProp(cur, ns, BAD_CAST "base", uri);
|
||||||
}
|
}
|
||||||
|
@ -5122,7 +5124,7 @@ xmlNodeSetBase(xmlNodePtr cur, const xmlChar* uri) {
|
||||||
* and
|
* and
|
||||||
* 5.1.2. Base URI from the Encapsulating Entity
|
* 5.1.2. Base URI from the Encapsulating Entity
|
||||||
* However it does not return the document base (5.1.3), use
|
* However it does not return the document base (5.1.3), use
|
||||||
* xmlDocumentGetBase() for this
|
* doc->URL in this case
|
||||||
*
|
*
|
||||||
* Returns a pointer to the base URL, or NULL if not found
|
* Returns a pointer to the base URL, or NULL if not found
|
||||||
* It's up to the caller to free the memory with xmlFree().
|
* It's up to the caller to free the memory with xmlFree().
|
||||||
|
|
3
reactos/lib/3rdparty/libxml2/valid.c
vendored
3
reactos/lib/3rdparty/libxml2/valid.c
vendored
|
@ -2679,7 +2679,8 @@ xmlIsID(xmlDocPtr doc, xmlNodePtr elem, xmlAttrPtr attr) {
|
||||||
(!strcmp((char *) attr->ns->prefix, "xml")))
|
(!strcmp((char *) attr->ns->prefix, "xml")))
|
||||||
return(1);
|
return(1);
|
||||||
if (doc == NULL) return(0);
|
if (doc == NULL) return(0);
|
||||||
if ((doc->intSubset == NULL) && (doc->extSubset == NULL)) {
|
if ((doc->intSubset == NULL) && (doc->extSubset == NULL) &&
|
||||||
|
(doc->type != XML_HTML_DOCUMENT_NODE)) {
|
||||||
return(0);
|
return(0);
|
||||||
} else if (doc->type == XML_HTML_DOCUMENT_NODE) {
|
} else if (doc->type == XML_HTML_DOCUMENT_NODE) {
|
||||||
if ((xmlStrEqual(BAD_CAST "id", attr->name)) ||
|
if ((xmlStrEqual(BAD_CAST "id", attr->name)) ||
|
||||||
|
|
1
reactos/lib/3rdparty/libxml2/xinclude.c
vendored
1
reactos/lib/3rdparty/libxml2/xinclude.c
vendored
|
@ -2479,7 +2479,6 @@ xmlXIncludeProcessTreeFlagsData(xmlNodePtr tree, int flags, void *data) {
|
||||||
*/
|
*/
|
||||||
int
|
int
|
||||||
xmlXIncludeProcessFlagsData(xmlDocPtr doc, int flags, void *data) {
|
xmlXIncludeProcessFlagsData(xmlDocPtr doc, int flags, void *data) {
|
||||||
xmlXIncludeCtxtPtr ctxt;
|
|
||||||
xmlNodePtr tree;
|
xmlNodePtr tree;
|
||||||
|
|
||||||
if (doc == NULL)
|
if (doc == NULL)
|
||||||
|
|
4
reactos/lib/3rdparty/libxml2/xmlIO.c
vendored
4
reactos/lib/3rdparty/libxml2/xmlIO.c
vendored
|
@ -2518,6 +2518,9 @@ __xmlParserInputBufferCreateFilename(const char *URI, xmlCharEncoding enc) {
|
||||||
#ifdef HAVE_ZLIB_H
|
#ifdef HAVE_ZLIB_H
|
||||||
if ((xmlInputCallbackTable[i].opencallback == xmlGzfileOpen) &&
|
if ((xmlInputCallbackTable[i].opencallback == xmlGzfileOpen) &&
|
||||||
(strcmp(URI, "-") != 0)) {
|
(strcmp(URI, "-") != 0)) {
|
||||||
|
#if defined(ZLIB_VERNUM) && ZLIB_VERNUM >= 0x1230
|
||||||
|
ret->compressed = !gzdirect(context);
|
||||||
|
#else
|
||||||
if (((z_stream *)context)->avail_in > 4) {
|
if (((z_stream *)context)->avail_in > 4) {
|
||||||
char *cptr, buff4[4];
|
char *cptr, buff4[4];
|
||||||
cptr = (char *) ((z_stream *)context)->next_in;
|
cptr = (char *) ((z_stream *)context)->next_in;
|
||||||
|
@ -2529,6 +2532,7 @@ __xmlParserInputBufferCreateFilename(const char *URI, xmlCharEncoding enc) {
|
||||||
gzrewind(context);
|
gzrewind(context);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
142
reactos/lib/3rdparty/libxml2/xmllint.c
vendored
142
reactos/lib/3rdparty/libxml2/xmllint.c
vendored
|
@ -108,15 +108,16 @@
|
||||||
|
|
||||||
typedef enum {
|
typedef enum {
|
||||||
XMLLINT_RETURN_OK = 0, /* No error */
|
XMLLINT_RETURN_OK = 0, /* No error */
|
||||||
XMLLINT_ERR_UNCLASS, /* Unclassified */
|
XMLLINT_ERR_UNCLASS = 1, /* Unclassified */
|
||||||
XMLLINT_ERR_DTD, /* Error in DTD */
|
XMLLINT_ERR_DTD = 2, /* Error in DTD */
|
||||||
XMLLINT_ERR_VALID, /* Validation error */
|
XMLLINT_ERR_VALID = 3, /* Validation error */
|
||||||
XMLLINT_ERR_RDFILE, /* CtxtReadFile error */
|
XMLLINT_ERR_RDFILE = 4, /* CtxtReadFile error */
|
||||||
XMLLINT_ERR_SCHEMACOMP, /* Schema compilation */
|
XMLLINT_ERR_SCHEMACOMP = 5, /* Schema compilation */
|
||||||
XMLLINT_ERR_OUT, /* Error writing output */
|
XMLLINT_ERR_OUT = 6, /* Error writing output */
|
||||||
XMLLINT_ERR_SCHEMAPAT, /* Error in schema pattern */
|
XMLLINT_ERR_SCHEMAPAT = 7, /* Error in schema pattern */
|
||||||
XMLLINT_ERR_RDREGIS, /* Error in Reader registration */
|
XMLLINT_ERR_RDREGIS = 8, /* Error in Reader registration */
|
||||||
XMLLINT_ERR_MEM /* Out of memory error */
|
XMLLINT_ERR_MEM = 9, /* Out of memory error */
|
||||||
|
XMLLINT_ERR_XPATH = 10 /* XPath evaluation error */
|
||||||
} xmllintReturnCode;
|
} xmllintReturnCode;
|
||||||
#ifdef LIBXML_DEBUG_ENABLED
|
#ifdef LIBXML_DEBUG_ENABLED
|
||||||
static int shell = 0;
|
static int shell = 0;
|
||||||
|
@ -201,6 +202,9 @@ static const char *pattern = NULL;
|
||||||
static xmlPatternPtr patternc = NULL;
|
static xmlPatternPtr patternc = NULL;
|
||||||
static xmlStreamCtxtPtr patstream = NULL;
|
static xmlStreamCtxtPtr patstream = NULL;
|
||||||
#endif
|
#endif
|
||||||
|
#ifdef LIBXML_XPATH_ENABLED
|
||||||
|
static const char *xpathquery = NULL;
|
||||||
|
#endif
|
||||||
static int options = XML_PARSE_COMPACT;
|
static int options = XML_PARSE_COMPACT;
|
||||||
static int sax = 0;
|
static int sax = 0;
|
||||||
static int oldxml10 = 0;
|
static int oldxml10 = 0;
|
||||||
|
@ -2050,6 +2054,100 @@ static void walkDoc(xmlDocPtr doc) {
|
||||||
}
|
}
|
||||||
#endif /* LIBXML_READER_ENABLED */
|
#endif /* LIBXML_READER_ENABLED */
|
||||||
|
|
||||||
|
#ifdef LIBXML_XPATH_ENABLED
|
||||||
|
/************************************************************************
|
||||||
|
* *
|
||||||
|
* XPath Query *
|
||||||
|
* *
|
||||||
|
************************************************************************/
|
||||||
|
|
||||||
|
static void doXPathDump(xmlXPathObjectPtr cur) {
|
||||||
|
switch(cur->type) {
|
||||||
|
case XPATH_NODESET: {
|
||||||
|
int i;
|
||||||
|
xmlNodePtr node;
|
||||||
|
#ifdef LIBXML_OUTPUT_ENABLED
|
||||||
|
xmlSaveCtxtPtr ctxt;
|
||||||
|
|
||||||
|
if (cur->nodesetval->nodeNr <= 0) {
|
||||||
|
fprintf(stderr, "XPath set is empty\n");
|
||||||
|
progresult = XMLLINT_ERR_XPATH;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
ctxt = xmlSaveToFd(1, NULL, 0);
|
||||||
|
if (ctxt == NULL) {
|
||||||
|
fprintf(stderr, "Out of memory for XPath\n");
|
||||||
|
progresult = XMLLINT_ERR_MEM;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
for (i = 0;i < cur->nodesetval->nodeNr;i++) {
|
||||||
|
node = cur->nodesetval->nodeTab[i];
|
||||||
|
xmlSaveTree(ctxt, node);
|
||||||
|
}
|
||||||
|
xmlSaveClose(ctxt);
|
||||||
|
#else
|
||||||
|
printf("xpath returned %d nodes\n", cur->nodesetval->nodeNr);
|
||||||
|
#endif
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case XPATH_BOOLEAN:
|
||||||
|
if (cur->boolval) printf("true");
|
||||||
|
else printf("false");
|
||||||
|
break;
|
||||||
|
case XPATH_NUMBER:
|
||||||
|
switch (xmlXPathIsInf(cur->floatval)) {
|
||||||
|
case 1:
|
||||||
|
printf("Infinity");
|
||||||
|
break;
|
||||||
|
case -1:
|
||||||
|
printf("-Infinity");
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
if (xmlXPathIsNaN(cur->floatval)) {
|
||||||
|
printf("NaN");
|
||||||
|
} else {
|
||||||
|
printf("%0g", cur->floatval);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case XPATH_STRING:
|
||||||
|
printf("%s", (const char *) cur->stringval);
|
||||||
|
break;
|
||||||
|
case XPATH_UNDEFINED:
|
||||||
|
fprintf(stderr, "XPath Object is uninitialized\n");
|
||||||
|
progresult = XMLLINT_ERR_XPATH;
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
fprintf(stderr, "XPath object of unexpected type\n");
|
||||||
|
progresult = XMLLINT_ERR_XPATH;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static void doXPathQuery(xmlDocPtr doc, const char *query) {
|
||||||
|
xmlXPathContextPtr ctxt;
|
||||||
|
xmlXPathObjectPtr res;
|
||||||
|
|
||||||
|
ctxt = xmlXPathNewContext(doc);
|
||||||
|
if (ctxt == NULL) {
|
||||||
|
fprintf(stderr, "Out of memory for XPath\n");
|
||||||
|
progresult = XMLLINT_ERR_MEM;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
ctxt->node = xmlDocGetRootElement(doc);
|
||||||
|
res = xmlXPathEval(BAD_CAST query, ctxt);
|
||||||
|
xmlXPathFreeContext(ctxt);
|
||||||
|
|
||||||
|
if (res == NULL) {
|
||||||
|
fprintf(stderr, "XPath evaluation failure\n");
|
||||||
|
progresult = XMLLINT_ERR_XPATH;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
doXPathDump(res);
|
||||||
|
xmlXPathFreeObject(res);
|
||||||
|
}
|
||||||
|
#endif /* LIBXML_XPATH_ENABLED */
|
||||||
|
|
||||||
/************************************************************************
|
/************************************************************************
|
||||||
* *
|
* *
|
||||||
* Tree Test processing *
|
* Tree Test processing *
|
||||||
|
@ -2318,6 +2416,12 @@ static void parseAndPrintFile(char *filename, xmlParserCtxtPtr rectxt) {
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef LIBXML_XPATH_ENABLED
|
||||||
|
if (xpathquery != NULL) {
|
||||||
|
doXPathQuery(doc, xpathquery);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef LIBXML_DEBUG_ENABLED
|
#ifdef LIBXML_DEBUG_ENABLED
|
||||||
#ifdef LIBXML_XPATH_ENABLED
|
#ifdef LIBXML_XPATH_ENABLED
|
||||||
/*
|
/*
|
||||||
|
@ -2551,8 +2655,11 @@ static void parseAndPrintFile(char *filename, xmlParserCtxtPtr rectxt) {
|
||||||
|
|
||||||
if (format)
|
if (format)
|
||||||
saveOpts |= XML_SAVE_FORMAT;
|
saveOpts |= XML_SAVE_FORMAT;
|
||||||
|
|
||||||
|
#if defined(LIBXML_HTML_ENABLED) || defined(LIBXML_VALID_ENABLED)
|
||||||
if (xmlout)
|
if (xmlout)
|
||||||
saveOpts |= XML_SAVE_AS_XML;
|
saveOpts |= XML_SAVE_AS_XML;
|
||||||
|
#endif
|
||||||
|
|
||||||
if (output == NULL)
|
if (output == NULL)
|
||||||
ctxt = xmlSaveToFd(1, encoding, saveOpts);
|
ctxt = xmlSaveToFd(1, encoding, saveOpts);
|
||||||
|
@ -2945,6 +3052,9 @@ static void usage(const char *name) {
|
||||||
#endif
|
#endif
|
||||||
printf("\t--sax: do not build a tree but work just at the SAX level\n");
|
printf("\t--sax: do not build a tree but work just at the SAX level\n");
|
||||||
printf("\t--oldxml10: use XML-1.0 parsing rules before the 5th edition\n");
|
printf("\t--oldxml10: use XML-1.0 parsing rules before the 5th edition\n");
|
||||||
|
#ifdef LIBXML_XPATH_ENABLED
|
||||||
|
printf("\t--xpath expr: evaluate the XPath expression, inply --noout\n");
|
||||||
|
#endif
|
||||||
|
|
||||||
printf("\nLibxml project home page: http://xmlsoft.org/\n");
|
printf("\nLibxml project home page: http://xmlsoft.org/\n");
|
||||||
printf("To report bugs or get some help check: http://xmlsoft.org/bugs.html\n");
|
printf("To report bugs or get some help check: http://xmlsoft.org/bugs.html\n");
|
||||||
|
@ -3284,6 +3394,13 @@ main(int argc, char **argv) {
|
||||||
(!strcmp(argv[i], "--pattern"))) {
|
(!strcmp(argv[i], "--pattern"))) {
|
||||||
i++;
|
i++;
|
||||||
pattern = argv[i];
|
pattern = argv[i];
|
||||||
|
#endif
|
||||||
|
#ifdef LIBXML_XPATH_ENABLED
|
||||||
|
} else if ((!strcmp(argv[i], "-xpath")) ||
|
||||||
|
(!strcmp(argv[i], "--xpath"))) {
|
||||||
|
i++;
|
||||||
|
noout++;
|
||||||
|
xpathquery = argv[i];
|
||||||
#endif
|
#endif
|
||||||
} else if ((!strcmp(argv[i], "-oldxml10")) ||
|
} else if ((!strcmp(argv[i], "-oldxml10")) ||
|
||||||
(!strcmp(argv[i], "--oldxml10"))) {
|
(!strcmp(argv[i], "--oldxml10"))) {
|
||||||
|
@ -3515,6 +3632,13 @@ main(int argc, char **argv) {
|
||||||
i++;
|
i++;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
#ifdef LIBXML_XPATH_ENABLED
|
||||||
|
if ((!strcmp(argv[i], "-xpath")) ||
|
||||||
|
(!strcmp(argv[i], "--xpath"))) {
|
||||||
|
i++;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
if ((timing) && (repeat))
|
if ((timing) && (repeat))
|
||||||
startTimer();
|
startTimer();
|
||||||
|
|
11
reactos/lib/3rdparty/libxml2/xmlregexp.c
vendored
11
reactos/lib/3rdparty/libxml2/xmlregexp.c
vendored
|
@ -4892,6 +4892,17 @@ xmlFAParseCharClassEsc(xmlRegParserCtxtPtr ctxt) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else if (ctxt->atom->type == XML_REGEXP_RANGES) {
|
} else if (ctxt->atom->type == XML_REGEXP_RANGES) {
|
||||||
|
switch (cur) {
|
||||||
|
case 'n':
|
||||||
|
cur = '\n';
|
||||||
|
break;
|
||||||
|
case 'r':
|
||||||
|
cur = '\r';
|
||||||
|
break;
|
||||||
|
case 't':
|
||||||
|
cur = '\t';
|
||||||
|
break;
|
||||||
|
}
|
||||||
xmlRegAtomAddRange(ctxt, ctxt->atom, ctxt->neg,
|
xmlRegAtomAddRange(ctxt, ctxt->atom, ctxt->neg,
|
||||||
XML_REGEXP_CHARVAL, cur, cur, NULL);
|
XML_REGEXP_CHARVAL, cur, cur, NULL);
|
||||||
}
|
}
|
||||||
|
|
2
reactos/lib/3rdparty/libxml2/xpath.c
vendored
2
reactos/lib/3rdparty/libxml2/xpath.c
vendored
|
@ -11333,6 +11333,7 @@ xmlXPathCompRelativeLocationPath
|
||||||
SKIP_BLANKS;
|
SKIP_BLANKS;
|
||||||
}
|
}
|
||||||
xmlXPathCompStep(ctxt);
|
xmlXPathCompStep(ctxt);
|
||||||
|
CHECK_ERROR;
|
||||||
SKIP_BLANKS;
|
SKIP_BLANKS;
|
||||||
while (CUR == '/') {
|
while (CUR == '/') {
|
||||||
if ((CUR == '/') && (NXT(1) == '/')) {
|
if ((CUR == '/') && (NXT(1) == '/')) {
|
||||||
|
@ -11392,6 +11393,7 @@ xmlXPathCompLocationPath(xmlXPathParserContextPtr ctxt) {
|
||||||
(CUR == '@') || (CUR == '*')))
|
(CUR == '@') || (CUR == '*')))
|
||||||
xmlXPathCompRelativeLocationPath(ctxt);
|
xmlXPathCompRelativeLocationPath(ctxt);
|
||||||
}
|
}
|
||||||
|
CHECK_ERROR;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
18
reactos/lib/3rdparty/zlib/deflate.h
vendored
18
reactos/lib/3rdparty/zlib/deflate.h
vendored
|
@ -290,12 +290,12 @@ typedef struct internal_state {
|
||||||
memory checker errors from longest match routines */
|
memory checker errors from longest match routines */
|
||||||
|
|
||||||
/* in trees.c */
|
/* in trees.c */
|
||||||
void _tr_init OF((deflate_state *s));
|
void ZLIB_INTERNAL _tr_init OF((deflate_state *s));
|
||||||
int _tr_tally OF((deflate_state *s, unsigned dist, unsigned lc));
|
int ZLIB_INTERNAL _tr_tally OF((deflate_state *s, unsigned dist, unsigned lc));
|
||||||
void _tr_flush_block OF((deflate_state *s, charf *buf,
|
void ZLIB_INTERNAL _tr_flush_block OF((deflate_state *s, charf *buf,
|
||||||
ulg stored_len, int last));
|
ulg stored_len, int last));
|
||||||
void _tr_align OF((deflate_state *s));
|
void ZLIB_INTERNAL _tr_align OF((deflate_state *s));
|
||||||
void _tr_stored_block OF((deflate_state *s, charf *buf,
|
void ZLIB_INTERNAL _tr_stored_block OF((deflate_state *s, charf *buf,
|
||||||
ulg stored_len, int last));
|
ulg stored_len, int last));
|
||||||
|
|
||||||
#define d_code(dist) \
|
#define d_code(dist) \
|
||||||
|
@ -309,11 +309,11 @@ void _tr_stored_block OF((deflate_state *s, charf *buf,
|
||||||
/* Inline versions of _tr_tally for speed: */
|
/* Inline versions of _tr_tally for speed: */
|
||||||
|
|
||||||
#if defined(GEN_TREES_H) || !defined(STDC)
|
#if defined(GEN_TREES_H) || !defined(STDC)
|
||||||
extern uch _length_code[];
|
extern uch ZLIB_INTERNAL _length_code[];
|
||||||
extern uch _dist_code[];
|
extern uch ZLIB_INTERNAL _dist_code[];
|
||||||
#else
|
#else
|
||||||
extern const uch _length_code[];
|
extern const uch ZLIB_INTERNAL _length_code[];
|
||||||
extern const uch _dist_code[];
|
extern const uch ZLIB_INTERNAL _dist_code[];
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
# define _tr_tally_lit(s, c, flush) \
|
# define _tr_tally_lit(s, c, flush) \
|
||||||
|
|
6
reactos/lib/3rdparty/zlib/gzguts.h
vendored
6
reactos/lib/3rdparty/zlib/gzguts.h
vendored
|
@ -116,9 +116,9 @@ typedef struct {
|
||||||
typedef gz_state FAR *gz_statep;
|
typedef gz_state FAR *gz_statep;
|
||||||
|
|
||||||
/* shared functions */
|
/* shared functions */
|
||||||
void gz_error OF((gz_statep, int, const char *));
|
void ZLIB_INTERNAL gz_error OF((gz_statep, int, const char *));
|
||||||
#if defined UNDER_CE
|
#if defined UNDER_CE
|
||||||
char *gz_strwinerror OF((DWORD error));
|
char ZLIB_INTERNAL *gz_strwinerror OF((DWORD error));
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* GT_OFF(x), where x is an unsigned value, is true if x > maximum z_off64_t
|
/* GT_OFF(x), where x is an unsigned value, is true if x > maximum z_off64_t
|
||||||
|
@ -127,6 +127,6 @@ char *gz_strwinerror OF((DWORD error));
|
||||||
#ifdef INT_MAX
|
#ifdef INT_MAX
|
||||||
# define GT_OFF(x) (sizeof(int) == sizeof(z_off64_t) && (x) > INT_MAX)
|
# define GT_OFF(x) (sizeof(int) == sizeof(z_off64_t) && (x) > INT_MAX)
|
||||||
#else
|
#else
|
||||||
unsigned gz_intmax OF((void));
|
unsigned ZLIB_INTERNAL gz_intmax OF((void));
|
||||||
# define GT_OFF(x) (sizeof(int) == sizeof(z_off64_t) && (x) > gz_intmax())
|
# define GT_OFF(x) (sizeof(int) == sizeof(z_off64_t) && (x) > gz_intmax())
|
||||||
#endif
|
#endif
|
||||||
|
|
6
reactos/lib/3rdparty/zlib/gzlib.c
vendored
6
reactos/lib/3rdparty/zlib/gzlib.c
vendored
|
@ -26,7 +26,7 @@ local gzFile gz_open OF((const char *, int, const char *));
|
||||||
|
|
||||||
The gz_strwinerror function does not change the current setting of
|
The gz_strwinerror function does not change the current setting of
|
||||||
GetLastError. */
|
GetLastError. */
|
||||||
char *gz_strwinerror (error)
|
char ZLIB_INTERNAL *gz_strwinerror (error)
|
||||||
DWORD error;
|
DWORD error;
|
||||||
{
|
{
|
||||||
static char buf[1024];
|
static char buf[1024];
|
||||||
|
@ -482,7 +482,7 @@ void ZEXPORT gzclearerr(file)
|
||||||
memory). Simply save the error message as a static string. If there is an
|
memory). Simply save the error message as a static string. If there is an
|
||||||
allocation failure constructing the error message, then convert the error to
|
allocation failure constructing the error message, then convert the error to
|
||||||
out of memory. */
|
out of memory. */
|
||||||
void gz_error(state, err, msg)
|
void ZLIB_INTERNAL gz_error(state, err, msg)
|
||||||
gz_statep state;
|
gz_statep state;
|
||||||
int err;
|
int err;
|
||||||
const char *msg;
|
const char *msg;
|
||||||
|
@ -522,7 +522,7 @@ void gz_error(state, err, msg)
|
||||||
available) -- we need to do this to cover cases where 2's complement not
|
available) -- we need to do this to cover cases where 2's complement not
|
||||||
used, since C standard permits 1's complement and sign-bit representations,
|
used, since C standard permits 1's complement and sign-bit representations,
|
||||||
otherwise we could just use ((unsigned)-1) >> 1 */
|
otherwise we could just use ((unsigned)-1) >> 1 */
|
||||||
unsigned gz_intmax()
|
unsigned ZLIB_INTERNAL gz_intmax()
|
||||||
{
|
{
|
||||||
unsigned p, q;
|
unsigned p, q;
|
||||||
|
|
||||||
|
|
2
reactos/lib/3rdparty/zlib/inffast.c
vendored
2
reactos/lib/3rdparty/zlib/inffast.c
vendored
|
@ -64,7 +64,7 @@
|
||||||
requires strm->avail_out >= 258 for each loop to avoid checking for
|
requires strm->avail_out >= 258 for each loop to avoid checking for
|
||||||
output space.
|
output space.
|
||||||
*/
|
*/
|
||||||
void inflate_fast(strm, start)
|
void ZLIB_INTERNAL inflate_fast(strm, start)
|
||||||
z_streamp strm;
|
z_streamp strm;
|
||||||
unsigned start; /* inflate()'s starting value for strm->avail_out */
|
unsigned start; /* inflate()'s starting value for strm->avail_out */
|
||||||
{
|
{
|
||||||
|
|
2
reactos/lib/3rdparty/zlib/inffast.h
vendored
2
reactos/lib/3rdparty/zlib/inffast.h
vendored
|
@ -8,4 +8,4 @@
|
||||||
subject to change. Applications should only use zlib.h.
|
subject to change. Applications should only use zlib.h.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
void inflate_fast OF((z_streamp strm, unsigned start));
|
void ZLIB_INTERNAL inflate_fast OF((z_streamp strm, unsigned start));
|
||||||
|
|
2
reactos/lib/3rdparty/zlib/inftrees.c
vendored
2
reactos/lib/3rdparty/zlib/inftrees.c
vendored
|
@ -29,7 +29,7 @@ const char inflate_copyright[] =
|
||||||
table index bits. It will differ if the request is greater than the
|
table index bits. It will differ if the request is greater than the
|
||||||
longest code or if it is less than the shortest code.
|
longest code or if it is less than the shortest code.
|
||||||
*/
|
*/
|
||||||
int inflate_table(type, lens, codes, table, bits, work)
|
int ZLIB_INTERNAL inflate_table(type, lens, codes, table, bits, work)
|
||||||
codetype type;
|
codetype type;
|
||||||
unsigned short FAR *lens;
|
unsigned short FAR *lens;
|
||||||
unsigned codes;
|
unsigned codes;
|
||||||
|
|
2
reactos/lib/3rdparty/zlib/inftrees.h
vendored
2
reactos/lib/3rdparty/zlib/inftrees.h
vendored
|
@ -57,6 +57,6 @@ typedef enum {
|
||||||
DISTS
|
DISTS
|
||||||
} codetype;
|
} codetype;
|
||||||
|
|
||||||
int inflate_table OF((codetype type, unsigned short FAR *lens,
|
int ZLIB_INTERNAL inflate_table OF((codetype type, unsigned short FAR *lens,
|
||||||
unsigned codes, code FAR * FAR *table,
|
unsigned codes, code FAR * FAR *table,
|
||||||
unsigned FAR *bits, unsigned short FAR *work));
|
unsigned FAR *bits, unsigned short FAR *work));
|
||||||
|
|
10
reactos/lib/3rdparty/zlib/trees.c
vendored
10
reactos/lib/3rdparty/zlib/trees.c
vendored
|
@ -383,7 +383,7 @@ void gen_trees_header()
|
||||||
/* ===========================================================================
|
/* ===========================================================================
|
||||||
* Initialize the tree data structures for a new zlib stream.
|
* Initialize the tree data structures for a new zlib stream.
|
||||||
*/
|
*/
|
||||||
void _tr_init(s)
|
void ZLIB_INTERNAL _tr_init(s)
|
||||||
deflate_state *s;
|
deflate_state *s;
|
||||||
{
|
{
|
||||||
tr_static_init();
|
tr_static_init();
|
||||||
|
@ -868,7 +868,7 @@ local void send_all_trees(s, lcodes, dcodes, blcodes)
|
||||||
/* ===========================================================================
|
/* ===========================================================================
|
||||||
* Send a stored block
|
* Send a stored block
|
||||||
*/
|
*/
|
||||||
void _tr_stored_block(s, buf, stored_len, last)
|
void ZLIB_INTERNAL _tr_stored_block(s, buf, stored_len, last)
|
||||||
deflate_state *s;
|
deflate_state *s;
|
||||||
charf *buf; /* input block */
|
charf *buf; /* input block */
|
||||||
ulg stored_len; /* length of input block */
|
ulg stored_len; /* length of input block */
|
||||||
|
@ -893,7 +893,7 @@ void _tr_stored_block(s, buf, stored_len, last)
|
||||||
* To simplify the code, we assume the worst case of last real code encoded
|
* To simplify the code, we assume the worst case of last real code encoded
|
||||||
* on one bit only.
|
* on one bit only.
|
||||||
*/
|
*/
|
||||||
void _tr_align(s)
|
void ZLIB_INTERNAL _tr_align(s)
|
||||||
deflate_state *s;
|
deflate_state *s;
|
||||||
{
|
{
|
||||||
send_bits(s, STATIC_TREES<<1, 3);
|
send_bits(s, STATIC_TREES<<1, 3);
|
||||||
|
@ -922,7 +922,7 @@ void _tr_align(s)
|
||||||
* Determine the best encoding for the current block: dynamic trees, static
|
* Determine the best encoding for the current block: dynamic trees, static
|
||||||
* trees or store, and output the encoded block to the zip file.
|
* trees or store, and output the encoded block to the zip file.
|
||||||
*/
|
*/
|
||||||
void _tr_flush_block(s, buf, stored_len, last)
|
void ZLIB_INTERNAL _tr_flush_block(s, buf, stored_len, last)
|
||||||
deflate_state *s;
|
deflate_state *s;
|
||||||
charf *buf; /* input block, or NULL if too old */
|
charf *buf; /* input block, or NULL if too old */
|
||||||
ulg stored_len; /* length of input block */
|
ulg stored_len; /* length of input block */
|
||||||
|
@ -1023,7 +1023,7 @@ void _tr_flush_block(s, buf, stored_len, last)
|
||||||
* Save the match info and tally the frequency counts. Return true if
|
* Save the match info and tally the frequency counts. Return true if
|
||||||
* the current block must be flushed.
|
* the current block must be flushed.
|
||||||
*/
|
*/
|
||||||
int _tr_tally (s, dist, lc)
|
int ZLIB_INTERNAL _tr_tally (s, dist, lc)
|
||||||
deflate_state *s;
|
deflate_state *s;
|
||||||
unsigned dist; /* distance of matched string */
|
unsigned dist; /* distance of matched string */
|
||||||
unsigned lc; /* match length-MIN_MATCH or unmatched char (if dist==0) */
|
unsigned lc; /* match length-MIN_MATCH or unmatched char (if dist==0) */
|
||||||
|
|
4
reactos/lib/3rdparty/zlib/trees.h
vendored
4
reactos/lib/3rdparty/zlib/trees.h
vendored
|
@ -70,7 +70,7 @@ local const ct_data static_dtree[D_CODES] = {
|
||||||
{{19},{ 5}}, {{11},{ 5}}, {{27},{ 5}}, {{ 7},{ 5}}, {{23},{ 5}}
|
{{19},{ 5}}, {{11},{ 5}}, {{27},{ 5}}, {{ 7},{ 5}}, {{23},{ 5}}
|
||||||
};
|
};
|
||||||
|
|
||||||
const uch _dist_code[DIST_CODE_LEN] = {
|
const uch ZLIB_INTERNAL _dist_code[DIST_CODE_LEN] = {
|
||||||
0, 1, 2, 3, 4, 4, 5, 5, 6, 6, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8,
|
0, 1, 2, 3, 4, 4, 5, 5, 6, 6, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8,
|
||||||
8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 10, 10, 10, 10, 10, 10, 10, 10,
|
8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 10, 10, 10, 10, 10, 10, 10, 10,
|
||||||
10, 10, 10, 10, 10, 10, 10, 10, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
|
10, 10, 10, 10, 10, 10, 10, 10, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
|
||||||
|
@ -99,7 +99,7 @@ const uch _dist_code[DIST_CODE_LEN] = {
|
||||||
29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29
|
29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29
|
||||||
};
|
};
|
||||||
|
|
||||||
const uch _length_code[MAX_MATCH-MIN_MATCH+1]= {
|
const uch ZLIB_INTERNAL _length_code[MAX_MATCH-MIN_MATCH+1]= {
|
||||||
0, 1, 2, 3, 4, 5, 6, 7, 8, 8, 9, 9, 10, 10, 11, 11, 12, 12, 12, 12,
|
0, 1, 2, 3, 4, 5, 6, 7, 8, 8, 9, 9, 10, 10, 11, 11, 12, 12, 12, 12,
|
||||||
13, 13, 13, 13, 14, 14, 14, 14, 15, 15, 15, 15, 16, 16, 16, 16, 16, 16, 16, 16,
|
13, 13, 13, 13, 14, 14, 14, 14, 15, 15, 15, 15, 16, 16, 16, 16, 16, 16, 16, 16,
|
||||||
17, 17, 17, 17, 17, 17, 17, 17, 18, 18, 18, 18, 18, 18, 18, 18, 19, 19, 19, 19,
|
17, 17, 17, 17, 17, 17, 17, 17, 18, 18, 18, 18, 18, 18, 18, 18, 19, 19, 19, 19,
|
||||||
|
|
22
reactos/lib/3rdparty/zlib/zutil.c
vendored
22
reactos/lib/3rdparty/zlib/zutil.c
vendored
|
@ -117,9 +117,9 @@ uLong ZEXPORT zlibCompileFlags()
|
||||||
# ifndef verbose
|
# ifndef verbose
|
||||||
# define verbose 0
|
# define verbose 0
|
||||||
# endif
|
# endif
|
||||||
int z_verbose = verbose;
|
int ZLIB_INTERNAL z_verbose = verbose;
|
||||||
|
|
||||||
void z_error (m)
|
void ZLIB_INTERNAL z_error (m)
|
||||||
char *m;
|
char *m;
|
||||||
{
|
{
|
||||||
fprintf(stderr, "%s\n", m);
|
fprintf(stderr, "%s\n", m);
|
||||||
|
@ -146,7 +146,7 @@ const char * ZEXPORT zError(err)
|
||||||
|
|
||||||
#ifndef HAVE_MEMCPY
|
#ifndef HAVE_MEMCPY
|
||||||
|
|
||||||
void zmemcpy(dest, source, len)
|
void ZLIB_INTERNAL zmemcpy(dest, source, len)
|
||||||
Bytef* dest;
|
Bytef* dest;
|
||||||
const Bytef* source;
|
const Bytef* source;
|
||||||
uInt len;
|
uInt len;
|
||||||
|
@ -157,7 +157,7 @@ void zmemcpy(dest, source, len)
|
||||||
} while (--len != 0);
|
} while (--len != 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
int zmemcmp(s1, s2, len)
|
int ZLIB_INTERNAL zmemcmp(s1, s2, len)
|
||||||
const Bytef* s1;
|
const Bytef* s1;
|
||||||
const Bytef* s2;
|
const Bytef* s2;
|
||||||
uInt len;
|
uInt len;
|
||||||
|
@ -170,7 +170,7 @@ int zmemcmp(s1, s2, len)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
void zmemzero(dest, len)
|
void ZLIB_INTERNAL zmemzero(dest, len)
|
||||||
Bytef* dest;
|
Bytef* dest;
|
||||||
uInt len;
|
uInt len;
|
||||||
{
|
{
|
||||||
|
@ -213,7 +213,7 @@ local ptr_table table[MAX_PTR];
|
||||||
* a protected system like OS/2. Use Microsoft C instead.
|
* a protected system like OS/2. Use Microsoft C instead.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
voidpf zcalloc (voidpf opaque, unsigned items, unsigned size)
|
voidpf ZLIB_INTERNAL zcalloc (voidpf opaque, unsigned items, unsigned size)
|
||||||
{
|
{
|
||||||
voidpf buf = opaque; /* just to make some compilers happy */
|
voidpf buf = opaque; /* just to make some compilers happy */
|
||||||
ulg bsize = (ulg)items*size;
|
ulg bsize = (ulg)items*size;
|
||||||
|
@ -237,7 +237,7 @@ voidpf zcalloc (voidpf opaque, unsigned items, unsigned size)
|
||||||
return buf;
|
return buf;
|
||||||
}
|
}
|
||||||
|
|
||||||
void zcfree (voidpf opaque, voidpf ptr)
|
void ZLIB_INTERNAL zcfree (voidpf opaque, voidpf ptr)
|
||||||
{
|
{
|
||||||
int n;
|
int n;
|
||||||
if (*(ush*)&ptr != 0) { /* object < 64K */
|
if (*(ush*)&ptr != 0) { /* object < 64K */
|
||||||
|
@ -272,13 +272,13 @@ void zcfree (voidpf opaque, voidpf ptr)
|
||||||
# define _hfree hfree
|
# define _hfree hfree
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
voidpf zcalloc (voidpf opaque, uInt items, uInt size)
|
voidpf ZLIB_INTERNAL zcalloc (voidpf opaque, uInt items, uInt size)
|
||||||
{
|
{
|
||||||
if (opaque) opaque = 0; /* to make compiler happy */
|
if (opaque) opaque = 0; /* to make compiler happy */
|
||||||
return _halloc((long)items, size);
|
return _halloc((long)items, size);
|
||||||
}
|
}
|
||||||
|
|
||||||
void zcfree (voidpf opaque, voidpf ptr)
|
void ZLIB_INTERNAL zcfree (voidpf opaque, voidpf ptr)
|
||||||
{
|
{
|
||||||
if (opaque) opaque = 0; /* to make compiler happy */
|
if (opaque) opaque = 0; /* to make compiler happy */
|
||||||
_hfree(ptr);
|
_hfree(ptr);
|
||||||
|
@ -297,7 +297,7 @@ extern voidp calloc OF((uInt items, uInt size));
|
||||||
extern void free OF((voidpf ptr));
|
extern void free OF((voidpf ptr));
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
voidpf zcalloc (opaque, items, size)
|
voidpf ZLIB_INTERNAL zcalloc (opaque, items, size)
|
||||||
voidpf opaque;
|
voidpf opaque;
|
||||||
unsigned items;
|
unsigned items;
|
||||||
unsigned size;
|
unsigned size;
|
||||||
|
@ -307,7 +307,7 @@ voidpf zcalloc (opaque, items, size)
|
||||||
(voidpf)calloc(items, size);
|
(voidpf)calloc(items, size);
|
||||||
}
|
}
|
||||||
|
|
||||||
void zcfree (opaque, ptr)
|
void ZLIB_INTERNAL zcfree (opaque, ptr)
|
||||||
voidpf opaque;
|
voidpf opaque;
|
||||||
voidpf ptr;
|
voidpf ptr;
|
||||||
{
|
{
|
||||||
|
|
14
reactos/lib/3rdparty/zlib/zutil.h
vendored
14
reactos/lib/3rdparty/zlib/zutil.h
vendored
|
@ -236,16 +236,16 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
|
||||||
# define zmemzero(dest, len) memset(dest, 0, len)
|
# define zmemzero(dest, len) memset(dest, 0, len)
|
||||||
# endif
|
# endif
|
||||||
#else
|
#else
|
||||||
void zmemcpy OF((Bytef* dest, const Bytef* source, uInt len));
|
void ZLIB_INTERNAL zmemcpy OF((Bytef* dest, const Bytef* source, uInt len));
|
||||||
int zmemcmp OF((const Bytef* s1, const Bytef* s2, uInt len));
|
int ZLIB_INTERNAL zmemcmp OF((const Bytef* s1, const Bytef* s2, uInt len));
|
||||||
void zmemzero OF((Bytef* dest, uInt len));
|
void ZLIB_INTERNAL zmemzero OF((Bytef* dest, uInt len));
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* Diagnostic functions */
|
/* Diagnostic functions */
|
||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
# include <stdio.h>
|
# include <stdio.h>
|
||||||
extern int _verbose;
|
extern int ZLIB_INTERNAL z_verbose;
|
||||||
extern void z_error OF((char *m));
|
extern void ZLIB_INTERNAL z_error OF((char *m));
|
||||||
# define Assert(cond,msg) {if(!(cond)) z_error(msg);}
|
# define Assert(cond,msg) {if(!(cond)) z_error(msg);}
|
||||||
# define Trace(x) {if (z_verbose>=0) fprintf x ;}
|
# define Trace(x) {if (z_verbose>=0) fprintf x ;}
|
||||||
# define Tracev(x) {if (z_verbose>0) fprintf x ;}
|
# define Tracev(x) {if (z_verbose>0) fprintf x ;}
|
||||||
|
@ -262,9 +262,9 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
voidpf zcalloc OF((voidpf opaque, unsigned items,
|
voidpf ZLIB_INTERNAL zcalloc OF((voidpf opaque, unsigned items,
|
||||||
unsigned size));
|
unsigned size));
|
||||||
void zcfree OF((voidpf opaque, voidpf ptr));
|
void ZLIB_INTERNAL zcfree OF((voidpf opaque, voidpf ptr));
|
||||||
|
|
||||||
#define ZALLOC(strm, items, size) \
|
#define ZALLOC(strm, items, size) \
|
||||||
(*((strm)->zalloc))((strm)->opaque, (items), (size))
|
(*((strm)->zalloc))((strm)->opaque, (items), (size))
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue