Security fix to prevent XSS attacks:

[mandoc.git] / html.h

diff --git a/html.h b/html.h
index 89dd7c635b4d038936c5afbc51bffe44d2632477..ca15f0f32164d9af57b0ae6965a6928612fe185e 100644 (file)
--- a/html.h
+++ b/html.h
@@ -1,6 +1,6 @@
-/*     $Id: html.h,v 1.41 2011/04/29 22:18:12 kristaps Exp $ */
+/*     $Id: html.h,v 1.51 2014/04/20 16:46:04 schwarze Exp $ */

 /*
 /*

- * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>

  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above


@@ -75,6 +75,7 @@ enum  htmlfont {
        HTMLFONT_NONE = 0,
        HTMLFONT_BOLD,
        HTMLFONT_ITALIC,
        HTMLFONT_NONE = 0,
        HTMLFONT_BOLD,
        HTMLFONT_ITALIC,

+       HTMLFONT_BI,

        HTMLFONT_MAX
 };
 
        HTMLFONT_MAX
 };
 


@@ -117,6 +118,7 @@ struct      html {
 #define        HTML_PREKEEP     (1 << 3)
 #define        HTML_NONOSPACE   (1 << 4) /* never add spaces */
 #define        HTML_LITERAL     (1 << 5) /* literal (e.g., <PRE>) context */
 #define        HTML_PREKEEP     (1 << 3)
 #define        HTML_NONOSPACE   (1 << 4) /* never add spaces */
 #define        HTML_LITERAL     (1 << 5) /* literal (e.g., <PRE>) context */

+#define        HTML_SKIPCHAR    (1 << 6) /* skip the next character */

        struct tagq       tags; /* stack of open tags */
        struct rofftbl    tbl; /* current table */
        struct tag       *tblt; /* current open table scope */
        struct tagq       tags; /* stack of open tags */
        struct rofftbl    tbl; /* current table */
        struct tag       *tblt; /* current open table scope */


@@ -129,32 +131,38 @@ struct    html {
        struct tag       *metaf; /* current open font scope */
        enum htmlfont     metal; /* last used font */
        enum htmlfont     metac; /* current font mode */
        struct tag       *metaf; /* current open font scope */
        enum htmlfont     metal; /* last used font */
        enum htmlfont     metac; /* current font mode */

-       enum htmltype     type;
+       enum htmltype     type; /* output media type */
+       int               oflags; /* output options */
+#define        HTML_FRAGMENT    (1 << 0) /* don't emit HTML/HEAD/BODY */

 };
 
 void             print_gen_decls(struct html *);
 void             print_gen_head(struct html *);
 };
 
 void             print_gen_decls(struct html *);
 void             print_gen_head(struct html *);

-struct tag      *print_otag(struct html *, enum htmltag, 
+struct tag      *print_otag(struct html *, enum htmltag,

                                int, const struct htmlpair *);
 void             print_tagq(struct html *, const struct tag *);
 void             print_stagq(struct html *, const struct tag *);
 void             print_text(struct html *, const char *);
 void             print_tblclose(struct html *);
 void             print_tbl(struct html *, const struct tbl_span *);
                                int, const struct htmlpair *);
 void             print_tagq(struct html *, const struct tag *);
 void             print_stagq(struct html *, const struct tag *);
 void             print_text(struct html *, const char *);
 void             print_tblclose(struct html *);
 void             print_tbl(struct html *, const struct tbl_span *);

+void             print_eqn(struct html *, const struct eqn *);

 
 

-void             bufcat_su(struct html *, const char *, 
-                       const struct roffsu *);
-void             buffmt_man(struct html *, 
-                       const char *, const char *);
-void             buffmt_includes(struct html *, const char *);
-void             buffmt(struct html *, const char *, ...);
+#if __GNUC__ - 0 >= 4
+__attribute__((__format__ (__printf__, 2, 3)))
+#endif
+void             bufcat_fmt(struct html *, const char *, ...);

 void             bufcat(struct html *, const char *);
 void             bufcat(struct html *, const char *);

-void             bufcat_style(struct html *, 
+void             bufcat_id(struct html *, const char *);
+void             bufcat_style(struct html *,

                        const char *, const char *);
                        const char *, const char *);

-void             bufncat(struct html *, const char *, size_t);
+void             bufcat_su(struct html *, const char *,
+                       const struct roffsu *);

 void             bufinit(struct html *);
 void             bufinit(struct html *);

+void             buffmt_man(struct html *,
+                       const char *, const char *);
+void             buffmt_includes(struct html *, const char *);

 
 

-void             html_idcat(char *, const char *, int);
+int              html_strlen(const char *);

 
 __END_DECLS
 
 
 __END_DECLS