Do not read past the end of the buffer if an "f" layout font modifier

[mandoc.git] / libman.h

diff --git a/libman.h b/libman.h
index da939e9c175c0c482fc91b12b5b5270165bfe613..8d115b3abeda024fbadca745ce7fc4d4ad2acee0 100644 (file)
--- a/libman.h
+++ b/libman.h
@@ -1,6 +1,7 @@
-/*     $Id: libman.h,v 1.43 2010/08/20 01:02:07 schwarze Exp $ */
+/*     $Id: libman.h,v 1.67 2014/12/28 14:42:27 schwarze Exp $ */
 /*
- * Copyright (c) 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2014 Ingo Schwarze <schwarze@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -14,10 +15,6 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-#ifndef LIBMAN_H
-#define LIBMAN_H
-
-#include "man.h"
 
 enum   man_next {
        MAN_NEXT_SIBLING = 0,
@@ -25,23 +22,22 @@ enum        man_next {
 };
 
 struct man {
-       void            *data; /* private application data */
-       mandocmsg        msg; /* output message handler */
+       struct mparse   *parse; /* parse pointer */
+       const char      *defos; /* default OS argument for .TH */
+       int              quick; /* abort parse early */
        int              flags; /* parse flags */
-#define        MAN_HALT        (1 << 0) /* badness happened: die */
 #define        MAN_ELINE       (1 << 1) /* Next-line element scope. */
 #define        MAN_BLINE       (1 << 2) /* Next-line block scope. */
-#define        MAN_ILINE       (1 << 3) /* Ignored in next-line scope. */
 #define        MAN_LITERAL     (1 << 4) /* Literal input. */
-#define        MAN_BPLINE      (1 << 5)
+#define        MAN_NEWLINE     (1 << 6) /* first macro/text in a line */
        enum man_next    next; /* where to put the next node */
        struct man_node *last; /* the last parsed node */
        struct man_node *first; /* the first parsed node */
        struct man_meta  meta; /* document meta-data */
-       struct regset   *regs; /* registers */
+       struct roff     *roff;
 };
 
-#define        MACRO_PROT_ARGS   struct man *m, \
+#define        MACRO_PROT_ARGS   struct man *man, \
                          enum mant tok, \
                          int line, \
                          int ppos, \
@@ -49,46 +45,32 @@ struct      man {
                          char *buf
 
 struct man_macro {
-       int             (*fp)(MACRO_PROT_ARGS);
+       void            (*fp)(MACRO_PROT_ARGS);
        int               flags;
 #define        MAN_SCOPED       (1 << 0)
 #define        MAN_EXPLICIT     (1 << 1)       /* See blk_imp(). */
 #define        MAN_FSCOPED      (1 << 2)       /* See blk_imp(). */
 #define        MAN_NSCOPED      (1 << 3)       /* See in_line_eoln(). */
 #define        MAN_NOCLOSE      (1 << 4)       /* See blk_exp(). */
+#define        MAN_BSCOPE       (1 << 5)       /* Break BLINE scope. */
+#define        MAN_JOIN         (1 << 6)       /* Join arguments together. */
 };
 
 extern const struct man_macro *const man_macros;
 
 __BEGIN_DECLS
 
-#define                  man_pmsg(m, l, p, t) \
-                 (*(m)->msg)((t), (m)->data, (l), (p), NULL)
-#define                  man_nmsg(m, n, t) \
-                 (*(m)->msg)((t), (m)->data, (n)->line, (n)->pos, NULL)
-int              man_word_alloc(struct man *, int, int, const char *);
-int              man_block_alloc(struct man *, int, int, enum mant);
-int              man_head_alloc(struct man *, int, int, enum mant);
-int              man_body_alloc(struct man *, int, int, enum mant);
-int              man_elem_alloc(struct man *, int, int, enum mant);
+void             man_word_alloc(struct man *, int, int, const char *);
+void             man_word_append(struct man *, const char *);
+void             man_block_alloc(struct man *, int, int, enum mant);
+void             man_head_alloc(struct man *, int, int, enum mant);
+void             man_body_alloc(struct man *, int, int, enum mant);
+void             man_elem_alloc(struct man *, int, int, enum mant);
 void             man_node_delete(struct man *, struct man_node *);
 void             man_hash_init(void);
-enum   mant      man_hash_find(const char *);
-int              man_macroend(struct man *);
-int              man_args(struct man *, int, int *, char *, char **);
-#define        ARGS_ERROR      (-1)
-#define        ARGS_EOLN       (0)
-#define        ARGS_WORD       (1)
-#define        ARGS_QWORD      (1)
-int              man_vmsg(struct man *, enum mandocerr,
-                       int, int, const char *, ...);
-int              man_valid_post(struct man *);
-int              man_valid_pre(struct man *, struct man_node *);
-int              man_action_post(struct man *);
-int              man_action_pre(struct man *, struct man_node *);
-int              man_unscope(struct man *, 
-                       const struct man_node *, enum mandocerr);
+enum mant        man_hash_find(const char *);
+void             man_macroend(struct man *);
+void             man_valid_post(struct man *);
+void             man_unscope(struct man *, const struct man_node *);
 
 __END_DECLS
-
-#endif /*!LIBMAN_H*/