Proper resetting of memory.

Array boundary fixed (-W).

diff --git a/main.c b/main.c
index 6f36aa9c51fb76d000c88cf2f54dc77c4192e3a1..b509b72a544078c6dcc7c99893e2a3fdb39d7caf 100644 (file)
--- a/main.c
+++ b/main.c
@@ -1,4 +1,4 @@
-/* $Id: main.c,v 1.21 2009/04/02 16:42:35 kristaps Exp $ */
+/* $Id: main.c,v 1.22 2009/04/03 11:08:39 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@openbsd.org>
  *
@@ -42,6 +42,10 @@ extern       int               getsubopt(char **, char * const *, char **);
 # endif
 #endif
 
+typedef        int             (*out_mdoc)(void *, const struct mdoc *);
+typedef        int             (*out_man)(void *, const struct man *);
+typedef        void            (*out_free)(void *);
+
 struct buf {
        char             *buf;
        size_t            sz;
@@ -60,17 +64,24 @@ enum        outt {
 };
 
 struct curparse {
-       const char       *file;
-       int               fd;
+       const char       *file;         /* Current parse. */
+       int               fd;           /* Current parse. */
        int               wflags;
 #define        WARN_WALL         0x03          /* All-warnings mask. */
 #define        WARN_WCOMPAT     (1 << 0)       /* Compatibility warnings. */
 #define        WARN_WSYNTAX     (1 << 1)       /* Syntax warnings. */
 #define        WARN_WERR        (1 << 2)       /* Warnings->errors. */
-       int               fflags;
-       enum intt         inttype;
+       int               fflags;       /* Per-intt flags. */
+       enum intt         inttype;      /* Input parsers. */
        struct man       *man;
+       struct man       *lastman;
        struct mdoc      *mdoc;
+       struct mdoc      *lastmdoc;
+       enum outt         outtype;      /* Output devices. */
+       out_mdoc          outmdoc;
+       out_man           outman;
+       out_free          outfree;
+       void             *outdata;
 };
 
 #define        IGN_SCOPE        (1 << 0)       /* Ignore scope errors. */
@@ -78,17 +89,11 @@ struct      curparse {
 #define        IGN_MACRO        (1 << 2)       /* Ignore unknown macros. */
 #define        NO_IGN_MACRO     (1 << 3) 
 
-typedef        int             (*out_run)(void *, const struct man *,
-                               const struct mdoc *);
-typedef        void            (*out_free)(void *);
-
-extern char             *__progname;
-
 extern void             *ascii_alloc(void);
-extern int               terminal_run(void *, const struct man *, 
-                               const struct mdoc *);
-extern int               tree_run(void *, const struct man *,
-                               const struct mdoc *);
+extern int               tree_mdoc(void *, const struct mdoc *);
+extern int               tree_man(void *, const struct man *);
+extern int               terminal_mdoc(void *, const struct mdoc *);
+extern int               terminal_man(void *, const struct man *);
 extern void              terminal_free(void *);
 
 static int               foptions(int *, char *);
@@ -105,30 +110,27 @@ static    int               ffile(struct buf *, struct buf *,
                                const char *, struct curparse *);
 static int               fdesc(struct buf *, struct buf *,
                                struct curparse *);
-static int               pset(const char *, size_t, struct curparse *,
+static int               pset(const char *, int, struct curparse *,
                                struct man **, struct mdoc **);
 static struct man       *man_init(struct curparse *);
 static struct mdoc      *mdoc_init(struct curparse *);
 __dead static void       version(void);
 __dead static void       usage(void);
 
+extern char             *__progname;
+
 
 int
 main(int argc, char *argv[])
 {
        int              c, rc;
-       void            *outdata;
-       enum outt        outtype;
        struct buf       ln, blk;
-       out_run          outrun;
-       out_free         outfree;
        struct curparse  curp;
 
-       outtype = OUTT_ASCII;
-
        bzero(&curp, sizeof(struct curparse));
 
        curp.inttype = INTT_AUTO;
+       curp.outtype = OUTT_ASCII;
 
        /* LINTED */
        while (-1 != (c = getopt(argc, argv, "f:m:VW:T:")))
@@ -142,7 +144,7 @@ main(int argc, char *argv[])
                                return(0);
                        break;
                case ('T'):
-                       if ( ! toptions(&outtype, optarg))
+                       if ( ! toptions(&curp.outtype, optarg))
                                return(0);
                        break;
                case ('W'):
@@ -160,72 +162,39 @@ main(int argc, char *argv[])
        argc -= optind;
        argv += optind;
 
-       /*
-        * Allocate the appropriate front-end.  Note that utf8, latin1
-        * (both not yet implemented) and ascii all resolve to the
-        * terminal front-end with different encodings (see terminal.c).
-        * Not all frontends have cleanup or alloc routines.
-        */
-
-       switch (outtype) {
-       case (OUTT_TREE):
-               outdata = NULL;
-               outrun = tree_run;
-               outfree = NULL;
-               break;
-       case (OUTT_LINT):
-               outdata = NULL;
-               outrun = NULL;
-               outfree = NULL;
-               break;
-       default:
-               outdata = ascii_alloc();
-               outrun = terminal_run;
-               outfree = terminal_free;
-               break;
-       }
-
        /* Configure buffers. */
 
        bzero(&ln, sizeof(struct buf));
        bzero(&blk, sizeof(struct buf));
 
-       /*
-        * Main loop around available files.
-        */
-
-       if (NULL == *argv) {
-               rc = 0;
-               c = fstdin(&blk, &ln, &curp);
-
-               if (c && NULL == outrun)
-                       rc = 1;
-               /*else if (c && outrun && (*outrun)(outdata, curp.man, curp.mdoc))
-                       rc = 1;*/
-       } else {
-               while (*argv) {
-                       c = ffile(&blk, &ln, *argv, &curp);
-                       if ( ! c)
-                               break;
-                       /*if (outrun && ! (*outrun)(outdata, curp.man, curp.mdoc))
-                               break;*/
-                       if (curp.man)
-                               man_reset(curp.man);
-                       if (curp.mdoc && ! mdoc_reset(curp.mdoc)) {
-                               warnx("memory exhausted");
-                               break;
-                       }
-                       argv++;
+       rc = 1;
+
+       if (NULL == *argv)
+               if ( ! fstdin(&blk, &ln, &curp))
+                       rc = 0;
+
+       while (rc && *argv) {
+               if ( ! ffile(&blk, &ln, *argv, &curp))
+                       rc = 0;
+               argv++;
+               if (*argv && rc) {
+                       if (curp.lastman)
+                               if ( ! man_reset(curp.lastman))
+                                       rc = 0;
+                       if (curp.lastmdoc)
+                               if ( ! mdoc_reset(curp.lastmdoc))
+                                       rc = 0;
+                       curp.lastman = NULL;
+                       curp.lastmdoc = NULL;
                }
-               rc = NULL == *argv;
        }
 
        if (blk.buf)
                free(blk.buf);
        if (ln.buf)
                free(ln.buf);
-       if (outfree)
-               (*outfree)(outdata);
+       if (curp.outfree)
+               (*curp.outfree)(curp.outdata);
        if (curp.mdoc)
                mdoc_free(curp.mdoc);
        if (curp.man)
@@ -265,8 +234,7 @@ man_init(struct curparse *curp)
        mancb.man_err = merr;
        mancb.man_warn = manwarn;
 
-       /* Set command defaults. */
-       pflags = MAN_IGN_MACRO;
+       pflags = MAN_IGN_MACRO; /* XXX */
 
        if (curp->fflags & NO_IGN_MACRO)
                pflags &= ~MAN_IGN_MACRO;
@@ -289,7 +257,7 @@ mdoc_init(struct curparse *curp)
        mdoccb.mdoc_err = merr;
        mdoccb.mdoc_warn = mdocwarn;
 
-       pflags = 0;
+       pflags = 0; /* XXX */
 
        if (curp->fflags & IGN_SCOPE)
                pflags |= MDOC_IGN_SCOPE;
@@ -435,18 +403,55 @@ fdesc(struct buf *blk, struct buf *ln, struct curparse *curp)
 
        /* Note that a parser may not have been assigned, yet. */
 
-       if (mdoc)
-              return(mdoc_endparse(mdoc));
-       if (man)
-               return(man_endparse(man));
+       if ( ! (man || mdoc)) {
+               warnx("%s: not a manual", curp->file);
+               return(0);
+       }
 
-       warnx("%s: not a manual", curp->file);
-       return(0);
+       if (mdoc && ! mdoc_endparse(mdoc))
+               return(0);
+       if (man && ! man_endparse(man))
+               return(0);
+
+       /*
+        * If an output device hasn't been allocated, see if we should
+        * do so now.  Note that not all outtypes have functions, so
+        * this switch statement may be superfluous, but it's
+        * low-overhead enough not to matter very much.
+        */
+
+       if ( ! (curp->outman && curp->outmdoc)) {
+               switch (curp->outtype) {
+               case (OUTT_TREE):
+                       curp->outman = tree_man;
+                       curp->outmdoc = tree_mdoc;
+                       break;
+               case (OUTT_LINT):
+                       break;
+               default:
+                       curp->outdata = ascii_alloc();
+                       curp->outman = terminal_man;
+                       curp->outmdoc = terminal_mdoc;
+                       curp->outfree = terminal_free;
+                       break;
+               }
+       }
+
+       /* Execute the out device, if it exists. */
+
+       if (man && curp->outman)
+               if ( ! (*curp->outman)(curp->outdata, man))
+                       return(0);
+       if (mdoc && curp->outmdoc)
+               if ( ! (*curp->outmdoc)(curp->outdata, mdoc))
+                       return(0);
+
+       return(1);
 }
 
 
 static int
-pset(const char *buf, size_t pos, struct curparse *curp,
+pset(const char *buf, int pos, struct curparse *curp,
                struct man **man, struct mdoc **mdoc)
 {
 
@@ -467,14 +472,14 @@ pset(const char *buf, size_t pos, struct curparse *curp,
                        curp->mdoc = mdoc_init(curp);
                if (NULL == (*mdoc = curp->mdoc))
                        return(0);
-               warnx("inheriting -mdoc parser");
+               curp->lastmdoc = *mdoc;
                return(1);
        case (INTT_MAN):
                if (NULL == curp->man) 
                        curp->man = man_init(curp);
                if (NULL == (*man = curp->man))
                        return(0);
-               warnx("inheriting -man parser");
+               curp->lastman = *man;
                return(1);
        default:
                break;
@@ -485,6 +490,7 @@ pset(const char *buf, size_t pos, struct curparse *curp,
                        curp->mdoc = mdoc_init(curp);
                if (NULL == (*mdoc = curp->mdoc))
                        return(0);
+               curp->lastmdoc = *mdoc;
                return(1);
        } 
 
@@ -492,6 +498,7 @@ pset(const char *buf, size_t pos, struct curparse *curp,
                curp->man = man_init(curp);
        if (NULL == (*man = curp->man))
                return(0);
+       curp->lastman = *man;
        return(1);
 }
 
@@ -547,8 +554,8 @@ foptions(int *fflags, char *arg)
        toks[0] = "ign-scope";
        toks[1] = "ign-escape";
        toks[2] = "ign-macro";
-       toks[4] = "no-ign-macro";
-       toks[5] = NULL;
+       toks[3] = "no-ign-macro";
+       toks[4] = NULL;
 
        while (*arg) 
                switch (getsubopt(&arg, toks, &v)) {

diff --git a/man.c b/man.c
index 99af201279cf33e257b367b9bf1ea20be1f91502..e99353edb2140244b1bba3e5930cf07e51001d3a 100644 (file)
--- a/man.c
+++ b/man.c
@@ -1,4 +1,4 @@
-/* $Id: man.c,v 1.14 2009/04/02 06:51:44 kristaps Exp $ */
+/* $Id: man.c,v 1.15 2009/04/03 11:08:39 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@openbsd.org>
  *
@@ -62,12 +62,14 @@ man_meta(const struct man *m)
 }
 
 
-void
+int
 man_reset(struct man *man)
 {
 
        man_free1(man);
        man_alloc1(man);
+       /* TODO */
+       return(1);
 }
 
 

diff --git a/man.h b/man.h
index 2757101734a9b059e9e003b7ab2baa58790995f7..dc22d59c817ebaff82523b1eb072372796a1721b 100644 (file)
--- a/man.h
+++ b/man.h
@@ -1,4 +1,4 @@
-/* $Id: man.h,v 1.8 2009/04/02 06:51:44 kristaps Exp $ */
+/* $Id: man.h,v 1.9 2009/04/03 11:08:39 kristaps Exp $ */
 /*
  * Copyright (c) 2009 Kristaps Dzonsons <kristaps@openbsd.org>
  *
@@ -90,7 +90,7 @@ struct        man;
 
 void             man_free(struct man *);
 struct man      *man_alloc(void *, int, const struct man_cb *);
-void             man_reset(struct man *);
+int              man_reset(struct man *);
 int              man_parseln(struct man *, int, char *buf);
 int              man_endparse(struct man *);
 int              man_valid_post(struct man *);

diff --git a/mdoc_action.c b/mdoc_action.c
index c22fd086ceaa0f119eb29b71cb889f66516ad31d..c15771450e2a52c7394a62ca2e7451f50cf7453a 100644 (file)
--- a/mdoc_action.c
+++ b/mdoc_action.c
@@ -1,4 +1,4 @@
-/* $Id: mdoc_action.c,v 1.4 2009/04/02 16:37:40 kristaps Exp $ */
+/* $Id: mdoc_action.c,v 1.5 2009/04/03 11:08:39 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@openbsd.org>
  *
@@ -343,6 +343,8 @@ post_nm(POST_ARGS)
 
        if (m->meta.name)
                return(1);
+
+       buf[0] = 0;
        if ( ! concat(m, m->last->child, buf, sizeof(buf)))
                return(0);
        if (NULL == (m->meta.name = strdup(buf)))
@@ -366,6 +368,8 @@ post_sh(POST_ARGS)
 
        if (MDOC_HEAD != m->last->type)
                return(1);
+
+       buf[0] = 0;
        if ( ! concat(m, m->last->child, buf, sizeof(buf)))
                return(0);
        if (SEC_CUSTOM != (sec = mdoc_atosec(buf)))
@@ -694,6 +698,7 @@ post_dd(POST_ARGS)
 {
        char              buf[64];
 
+       buf[0] = 0;
        if ( ! concat(m, m->last->child, buf, sizeof(buf)))
                return(0);
 

diff --git a/term.c b/term.c
index 180c50752ea368e9bb0fba6374b1c2399f0ba741..21918bc701dfe20d3b998d905a467e81e3009c31 100644 (file)
--- a/term.c
+++ b/term.c
@@ -1,4 +1,4 @@
-/* $Id: term.c,v 1.71 2009/03/31 13:50:19 kristaps Exp $ */
+/* $Id: term.c,v 1.72 2009/04/03 11:08:39 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@openbsd.org>
  *
@@ -54,8 +54,7 @@ ascii_alloc(void)
 
 
 int
-terminal_run(void *arg, const struct man *man,
-               const struct mdoc *mdoc)
+terminal_man(void *arg, const struct man *man)
 {
        struct termp    *p;
 
@@ -64,12 +63,21 @@ terminal_run(void *arg, const struct man *man,
        if (NULL == p->symtab)
                p->symtab = term_ascii2htab();
 
-       if (man)
-               return(man_run(p, man));
-       if (mdoc)
-               return(mdoc_run(p, mdoc));
+       return(man_run(p, man));
+}
+
+
+int
+terminal_mdoc(void *arg, const struct mdoc *mdoc)
+{
+       struct termp    *p;
+
+       p = (struct termp *)arg;
+
+       if (NULL == p->symtab)
+               p->symtab = term_ascii2htab();
 
-       return(1);
+       return(mdoc_run(p, mdoc));
 }
 
 

diff --git a/tree.c b/tree.c
index 0d8835fba1165b3a4e700c848adeb9d0c877221a..eae406b3960827337d596f9ddc1193454bd05cf5 100644 (file)
--- a/tree.c
+++ b/tree.c
@@ -1,4 +1,4 @@
-/* $Id: tree.c,v 1.10 2009/03/23 15:20:51 kristaps Exp $ */
+/* $Id: tree.c,v 1.11 2009/04/03 11:08:39 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@openbsd.org>
  *
@@ -24,26 +24,32 @@
 #include "mdoc.h"
 #include "man.h"
 
-static void    tree_mdoc(const struct mdoc_node *, int);
-static void    tree_man(const struct man_node *, int);
+static void    print_mdoc(const struct mdoc_node *, int);
+static void    print_man(const struct man_node *, int);
 
 
 /* ARGSUSED */
 int
-tree_run(void *arg, const struct man *man,
-               const struct mdoc *mdoc)
+tree_mdoc(void *arg, const struct mdoc *mdoc)
 {
 
-       if (man)
-               tree_man(man_node(man), 0);
-       if (mdoc)
-               tree_mdoc(mdoc_node(mdoc), 0);
+       print_mdoc(mdoc_node(mdoc), 0);
+       return(1);
+}
+
+
+/* ARGSUSED */
+int
+tree_man(void *arg, const struct man *man)
+{
+
+       print_man(man_node(man), 0);
        return(1);
 }
 
 
 static void
-tree_mdoc(const struct mdoc_node *n, int indent)
+print_mdoc(const struct mdoc_node *n, int indent)
 {
        const char       *p, *t;
        int               i, j;
@@ -137,14 +143,14 @@ tree_mdoc(const struct mdoc_node *n, int indent)
        (void)printf(" %d:%d\n", n->line, n->pos);
 
        if (n->child)
-               tree_mdoc(n->child, indent + 1);
+               print_mdoc(n->child, indent + 1);
        if (n->next)
-               tree_mdoc(n->next, indent);
+               print_mdoc(n->next, indent);
 }
 
 
 static void
-tree_man(const struct man_node *n, int indent)
+print_man(const struct man_node *n, int indent)
 {
        const char       *p, *t;
        int               i;
@@ -184,7 +190,7 @@ tree_man(const struct man_node *n, int indent)
        (void)printf("%s (%s) %d:%d\n", p, t, n->line, n->pos);
 
        if (n->child)
-               tree_man(n->child, indent + 1);
+               print_man(n->child, indent + 1);
        if (n->next)
-               tree_man(n->next, indent);
+               print_man(n->next, indent);
 }