From b88f6b9593ad0a6fda85ca8d01b623583f714bcc Mon Sep 17 00:00:00 2001 From: Not Zed Date: Thu, 12 Jul 2001 05:02:11 +0000 Subject: Removed. (check_html_charset): Replaced with this. 2001-07-12 Not Zed * camel-mime-part-utils.c (extract_metatag_charset): Removed. (check_html_charset): Replaced with this. (simple_data_wrapper_construct_from_parser): Call check_html_charset if we dont have a charset on the content-type, and we have text/html data. (check_html_charset): We also need to do qp/base64 decoding ourselves, sigh. * camel-mime-utils.c (html_meta_param_list_decode): Removed. This was very wrong, the rules for mail headers vastly different from rules for decoding html elements. (rfc2184_decode): Move the malloc inside the iconv_open worked, otherwise we have a memleak. * camel-mime-filter-html.c (camel_mime_filter_html_finalize, init, run, reset): Changed to use camelhtmlparser, and fixed a tiny memleak. * camel-html-parser.c: Made the html indexer tokeniser re-usable. ONLY TO BE USED INTERNAL TO CAMEL HOWEVER. (tokenise_step): Slight fix to non-quoted values. svn path=/trunk/; revision=11028 --- camel/camel-html-parser.h | 78 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 78 insertions(+) create mode 100644 camel/camel-html-parser.h (limited to 'camel/camel-html-parser.h') diff --git a/camel/camel-html-parser.h b/camel/camel-html-parser.h new file mode 100644 index 0000000000..41ac2ac9ec --- /dev/null +++ b/camel/camel-html-parser.h @@ -0,0 +1,78 @@ +/* + * Copyright (C) 2001 Ximian Inc. + * + * Authors: Michael Zucchi + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public License + * as published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +/** WARNING + ** + ** DO NOT USE THIS CODE OUTSIDE OF CAMEL + ** + ** IT IS SUBJECT TO CHANGE OR MAY VANISH AT ANY TIME + **/ + +#ifndef _CAMEL_HTML_PARSER_H +#define _CAMEL_HTML_PARSER_H + +#include + +#define CAMEL_HTML_PARSER(obj) CAMEL_CHECK_CAST (obj, camel_html_parser_get_type (), CamelHTMLParser) +#define CAMEL_HTML_PARSER_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_html_parser_get_type (), CamelHTMLParserClass) +#define CAMEL_IS_HTML_PARSER(obj) CAMEL_CHECK_TYPE (obj, camel_html_parser_get_type ()) + +typedef struct _CamelHTMLParserClass CamelHTMLParserClass; +typedef struct _CamelHTMLParser CamelHTMLParser; + +/* Parser/tokeniser states */ +typedef enum _camel_html_parser_t { + CAMEL_HTML_PARSER_DATA, /* raw data */ + CAMEL_HTML_PARSER_ENT, /* entity in data */ + CAMEL_HTML_PARSER_ELEMENT, /* element (tag + attributes scanned) */ + CAMEL_HTML_PARSER_TAG, /* tag */ + CAMEL_HTML_PARSER_DTDENT, /* dtd entity? */ + CAMEL_HTML_PARSER_COMMENT0, /* start of comment */ + CAMEL_HTML_PARSER_COMMENT, /* body of comment */ + CAMEL_HTML_PARSER_ATTR0, /* start of attribute */ + CAMEL_HTML_PARSER_ATTR, /* attribute */ + CAMEL_HTML_PARSER_VAL0, /* start of value */ + CAMEL_HTML_PARSER_VAL, /* value */ + CAMEL_HTML_PARSER_VAL_ENT, /* entity in value */ + CAMEL_HTML_PARSER_EOD, /* end of current data */ + CAMEL_HTML_PARSER_EOF, /* end of file */ +} camel_html_parser_t; + +struct _CamelHTMLParser { + CamelObject parent; + + struct _CamelHTMLParserPrivate *priv; +}; + +struct _CamelHTMLParserClass { + CamelObjectClass parent_class; +}; + +guint camel_html_parser_get_type (void); +CamelHTMLParser *camel_html_parser_new (void); + +void camel_html_parser_set_data(CamelHTMLParser *hp, const char *start, int len, int last); +camel_html_parser_t camel_html_parser_step(CamelHTMLParser *hp, const char **datap, int *lenp); +const char *camel_html_parser_left(CamelHTMLParser *hp, int *lenp); +const char *camel_html_parser_tag(CamelHTMLParser *hp); +const char *camel_html_parser_attr(CamelHTMLParser *hp, const char *name); +const GPtrArray *camel_html_parser_attr_list(CamelHTMLParser *hp, const GPtrArray **values); + +#endif /* ! _CAMEL_HTML_PARSER_H */ -- cgit v1.2.3