=================================================================== RCS file: /cvs/mandoc/main.c,v retrieving revision 1.79 retrieving revision 1.84 diff -u -p -r1.79 -r1.84 --- mandoc/main.c 2010/05/17 22:11:42 1.79 +++ mandoc/main.c 2010/06/07 10:52:44 1.84 @@ -1,4 +1,4 @@ -/* $Id: main.c,v 1.79 2010/05/17 22:11:42 kristaps Exp $ */ +/* $Id: main.c,v 1.84 2010/06/07 10:52:44 kristaps Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons * @@ -97,12 +97,11 @@ struct curparse { static const char * const mandocerrs[MANDOCERR_MAX] = { "ok", "text should be uppercase", - "sections out of conentional order", + "sections out of conventional order", "section name repeats", "out of order prologue", "repeated prologue entry", "list type must come first", - "column syntax is inconsistent", "bad standard", "bad library", "bad escape sequence", @@ -111,7 +110,7 @@ static const char * const mandocerrs[MANDOCERR_MAX] = "superfluous width argument", "bad date argument", "bad width argument", - "unknown manual sction", + "unknown manual section", "section not in conventional manual section", "end of line whitespace", "scope open on exit", @@ -142,11 +141,12 @@ static const char * const mandocerrs[MANDOCERR_MAX] = "macro requires body argument(s)", "macro requires argument(s)", "no title in document", + "missing list type", "line argument(s) will be lost", "body argument(s) will be lost", + "column syntax is inconsistent", "missing font type", "missing display type", - "missing list type", "displays may not be nested", "no scope to rewind: syntax violated", "scope broken, syntax violated", @@ -395,7 +395,7 @@ read_whole_file(struct curparse *curp, struct buf *fb, *with_mmap = 1; fb->sz = (size_t)st.st_size; fb->buf = mmap(NULL, fb->sz, PROT_READ, - MAP_FILE, curp->fd, 0); + MAP_FILE|MAP_SHARED, curp->fd, 0); if (fb->buf != MAP_FAILED) return(1); } @@ -601,7 +601,7 @@ fdesc(struct curparse *curp) case (OUTT_LINT): break; default: - curp->outdata = ascii_alloc(80); + curp->outdata = ascii_alloc(curp->outopts); curp->outman = terminal_man; curp->outmdoc = terminal_mdoc; curp->outfree = terminal_free;