lib/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2.git synced 2025-07-30 22:43:14 +03:00
Code Activity

Better entities and char ref encoding, error msg formatting, Daniel.

Browse Source
This commit is contained in:
Daniel Veillard
1998-11-16 01:04:26 +00:00
parent 242590ee5d
commit 8cc0d1f889
3 changed files with 49 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Sun Nov 15 19:59:47 EST 1998 Daniel Veillard <Daniel.Veillard@w3.org>
* parser.c, entities.c: improve entities and char ref encoding,
and cleanups of error messages.
Fri Nov 13 13:03:10 EST 1998 Daniel Veillard <Daniel.Veillard@w3.org> Fri Nov 13 13:03:10 EST 1998 Daniel Veillard <Daniel.Veillard@w3.org>
* parser.c, entities.c: simple bug hunting done during rpm2html and * parser.c, entities.c: simple bug hunting done during rpm2html and

40
entities.c
View File

@ -248,6 +248,15 @@ xmlEntityPtr xmlGetDocEntity(xmlDocPtr doc, const CHAR *name) {
return(NULL); return(NULL);
} }
/*
* [2] Char ::= #x9 | #xA | #xD | [#x20-#xD7FF] | [#xE000-#xFFFD]
* | [#x10000-#x10FFFF]
* any Unicode character, excluding the surrogate blocks, FFFE, and FFFF.
*/
#define IS_CHAR(c) \
(((c) == 0x09) || ((c) == 0x0a) || ((c) == 0x0d) || \
(((c) >= 0x20) && ((c) != 0xFFFE) && ((c) != 0xFFFF)))
/* /*
* xmlEncodeEntities : do a global encoding of a string, replacing the * xmlEncodeEntities : do a global encoding of a string, replacing the
* predefined entities and non ASCII values with their * predefined entities and non ASCII values with their
@ -255,6 +264,7 @@ xmlEntityPtr xmlGetDocEntity(xmlDocPtr doc, const CHAR *name) {
* TODO !!!! Once moved to UTF-8 internal encoding, the encoding of non-ascii * TODO !!!! Once moved to UTF-8 internal encoding, the encoding of non-ascii
* get erroneous. * get erroneous.
*/ */
CHAR *xmlEncodeEntities(xmlDocPtr doc, const CHAR *input) { CHAR *xmlEncodeEntities(xmlDocPtr doc, const CHAR *input) {
const CHAR *cur = input; const CHAR *cur = input;
CHAR *out = buffer; CHAR *out = buffer;
@ -310,6 +320,12 @@ CHAR *xmlEncodeEntities(xmlDocPtr doc, const CHAR *input) {
*out++ = 'o'; *out++ = 'o';
*out++ = 's'; *out++ = 's';
*out++ = ';'; *out++ = ';';
} else if (((*cur >= 0x20) && (*cur < 0x80)) ||
(*cur == '\n') || (*cur == '\r') || (*cur == '\t')) {
/*
* default case, just copy !
*/
*out++ = *cur;
#ifndef USE_UTF_8 #ifndef USE_UTF_8
} else if ((sizeof(CHAR) == 1) && (*cur >= 0x80)) { } else if ((sizeof(CHAR) == 1) && (*cur >= 0x80)) {
char buf[10], *ptr; char buf[10], *ptr;
@ -321,12 +337,26 @@ CHAR *xmlEncodeEntities(xmlDocPtr doc, const CHAR *input) {
ptr = buf; ptr = buf;
while (*ptr != 0) *out++ = *ptr++; while (*ptr != 0) *out++ = *ptr++;
#endif #endif
} else { } else if (IS_CHAR(*cur)) {
/* char buf[10], *ptr;
* default case, just copy !
*/ #ifdef HAVE_SNPRINTF
*out++ = *cur; snprintf(buf, 9, "&#%d;", *cur);
#else
sprintf(buf, "&#%d;", *cur);
#endif
ptr = buf;
while (*ptr != 0) *out++ = *ptr++;
} }
#if 0
else {
/*
* default case, this is not a valid char !
* Skip it...
*/
fprintf(stderr, "xmlEncodeEntities: invalid char %d\n", (int) *cur);
}
#endif
cur++; cur++;
} }
*out++ = 0; *out++ = 0;

15
parser.c
View File

@ -1080,7 +1080,7 @@ xmlParseQuotedString(xmlParserCtxtPtr ctxt) {
while (IS_CHAR(CUR) && (CUR != '"')) NEXT; while (IS_CHAR(CUR) && (CUR != '"')) NEXT;
if (CUR != '"') { if (CUR != '"') {
if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL)) if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL))
ctxt->sax->error(ctxt, "String not closed\"%.50s\n", q); ctxt->sax->error(ctxt, "String not closed \"%.50s\"\n", q);
} else { } else {
ret = xmlStrndup(q, CUR_PTR - q); ret = xmlStrndup(q, CUR_PTR - q);
NEXT; NEXT;
@ -1091,7 +1091,7 @@ xmlParseQuotedString(xmlParserCtxtPtr ctxt) {
while (IS_CHAR(CUR) && (CUR != '\'')) NEXT; while (IS_CHAR(CUR) && (CUR != '\'')) NEXT;
if (CUR != '\'') { if (CUR != '\'') {
if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL)) if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL))
ctxt->sax->error(ctxt, "String not closed\"%.50s\n", q); ctxt->sax->error(ctxt, "String not closed \"%.50s\"\n", q);
} else { } else {
ret = xmlStrndup(q, CUR_PTR - q); ret = xmlStrndup(q, CUR_PTR - q);
NEXT; NEXT;
@ -2253,7 +2253,8 @@ xmlParseCharRef(xmlParserCtxtPtr ctxt) {
val = val * 16 + (CUR - 'A') + 10; val = val * 16 + (CUR - 'A') + 10;
else { else {
if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL)) if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL))
ctxt->sax->error(ctxt, "xmlParseCharRef: invalid value\n"); ctxt->sax->error(ctxt,
"xmlParseCharRef: invalid hexa value\n");
val = 0; val = 0;
break; break;
} }
@ -2268,7 +2269,8 @@ xmlParseCharRef(xmlParserCtxtPtr ctxt) {
val = val * 10 + (CUR - '0'); val = val * 10 + (CUR - '0');
else { else {
if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL)) if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL))
ctxt->sax->error(ctxt, "xmlParseCharRef: invalid value\n"); ctxt->sax->error(ctxt,
"xmlParseCharRef: invalid decimal value\n");
val = 0; val = 0;
break; break;
} }
@ -2289,7 +2291,8 @@ xmlParseCharRef(xmlParserCtxtPtr ctxt) {
return(xmlStrndup(buf, 1)); return(xmlStrndup(buf, 1));
} else { } else {
if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL)) if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL))
ctxt->sax->error(ctxt, "xmlParseCharRef: invalid value"); ctxt->sax->error(ctxt, "xmlParseCharRef: invalid CHAR value %d\n",
val);
} }
return(NULL); return(NULL);
} }
@ -3932,7 +3935,7 @@ xmlParserAddNodeInfo(xmlParserCtxtPtr ctxt,
if ( tmp_buffer == NULL ) { if ( tmp_buffer == NULL ) {
if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL)) if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL))
ctxt->sax->error(ctxt, "Out of memory"); ctxt->sax->error(ctxt, "Out of memory\n");
return; return;
} }
ctxt->node_seq.buffer = tmp_buffer; ctxt->node_seq.buffer = tmp_buffer;