=================================================================== RCS file: /cvs/mandoc/main.c,v retrieving revision 1.87 retrieving revision 1.90 diff -u -p -r1.87 -r1.90 --- mandoc/main.c 2010/06/12 10:09:19 1.87 +++ mandoc/main.c 2010/06/26 15:22:19 1.90 @@ -1,6 +1,6 @@ -/* $Id: main.c,v 1.87 2010/06/12 10:09:19 kristaps Exp $ */ +/* $Id: main.c,v 1.90 2010/06/26 15:22:19 kristaps Exp $ */ /* - * Copyright (c) 2008, 2009 Kristaps Dzonsons + * Copyright (c) 2008, 2009 Kristaps Dzonsons * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -30,10 +30,11 @@ #include #include "mandoc.h" +#include "regs.h" +#include "main.h" #include "mdoc.h" #include "man.h" #include "roff.h" -#include "main.h" #define UNCONST(a) ((void *)(uintptr_t)(const void *)(a)) @@ -109,6 +110,7 @@ static const char * const mandocerrs[MANDOCERR_MAX] = "unterminated quoted string", "argument requires the width argument", "superfluous width argument", + "ignoring argument", "bad date argument", "bad width argument", "unknown manual section", @@ -449,11 +451,13 @@ fdesc(struct curparse *curp) struct man *man; struct mdoc *mdoc; struct roff *roff; + struct regset regs; man = NULL; mdoc = NULL; roff = NULL; memset(&ln, 0, sizeof(struct buf)); + memset(®s, 0, sizeof(struct regset)); /* * Two buffers: ln and buf. buf is the input file and may be @@ -536,7 +540,7 @@ fdesc(struct curparse *curp) of = 0; do { - re = roff_parseln(roff, lnn_start, + re = roff_parseln(roff, ®s, lnn_start, &ln.buf, &ln.sz, of, &of); } while (ROFF_RERUN == re);