-/* $Id: man.c,v 1.31 2009/08/19 11:58:32 kristaps Exp $ */
+/* $Id: man.c,v 1.46 2009/11/02 08:40:31 kristaps Exp $ */
/*
* Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
*
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
+#include <sys/types.h>
+
#include <assert.h>
#include <ctype.h>
#include <stdarg.h>
#include <string.h>
#include "libman.h"
+#include "libmandoc.h"
const char *const __man_merrnames[WERRMAX] = {
"invalid character", /* WNPRINT */
- "system: malloc error", /* WNMEM */
"invalid manual section", /* WMSEC */
"invalid date format", /* WDATE */
"scope of prior line violated", /* WLNSCOPE */
"expected block head arguments", /* WHEADARGS */
"expected block body arguments", /* WBODYARGS */
"expected empty block head", /* WNHEADARGS */
- "unknown macro", /* WMACRO */
"ill-formed macro", /* WMACROFORM */
"scope open on exit", /* WEXITSCOPE */
- "no scope context" /* WNOSCOPE */
+ "no scope context", /* WNOSCOPE */
+ "literal context already open", /* WOLITERAL */
+ "no literal context open" /* WNLITERAL */
};
const char *const __man_macronames[MAN_MAX] = {
"R", "B", "I", "IR",
"RI", "na", "i", "sp",
"nf", "fi", "r", "RE",
- "RS"
+ "RS", "DT", "UC", "PD"
};
const char * const *man_macronames = __man_macronames;
static int man_ptext(struct man *, int, char *);
static int man_pmacro(struct man *, int, char *);
static void man_free1(struct man *);
-static int man_alloc1(struct man *);
+static void man_alloc1(struct man *);
static int pstring(struct man *, int, int,
const char *, size_t);
+static int macrowarn(struct man *, int, const char *);
+
+#ifdef __linux__
+extern size_t strlcpy(char *, const char *, size_t);
+#endif
const struct man_node *
}
-int
+void
man_reset(struct man *man)
{
man_free1(man);
- return(man_alloc1(man));
+ man_alloc1(man);
}
{
man_free1(man);
-
- if (man->htab)
- man_hash_free(man->htab);
free(man);
}
{
struct man *p;
- if (NULL == (p = calloc(1, sizeof(struct man))))
- return(NULL);
+ p = mandoc_calloc(1, sizeof(struct man));
- if ( ! man_alloc1(p)) {
- free(p);
- return(NULL);
- }
+ if (cb)
+ memcpy(&p->cb, cb, sizeof(struct man_cb));
+ man_hash_init();
p->data = data;
p->pflags = pflags;
- (void)memcpy(&p->cb, cb, sizeof(struct man_cb));
- if (NULL == (p->htab = man_hash_alloc())) {
- free(p);
- return(NULL);
- }
+ man_alloc1(p);
return(p);
}
}
-static int
+static void
man_alloc1(struct man *m)
{
- bzero(&m->meta, sizeof(struct man_meta));
+ memset(&m->meta, 0, sizeof(struct man_meta));
m->flags = 0;
- m->last = calloc(1, sizeof(struct man_node));
- if (NULL == m->last)
- return(0);
+ m->last = mandoc_calloc(1, sizeof(struct man_node));
m->first = m->last;
m->last->type = MAN_ROOT;
m->next = MAN_NEXT_CHILD;
- return(1);
}
{
struct man_node *p;
- p = calloc(1, sizeof(struct man_node));
- if (NULL == p)
- return(NULL);
-
+ p = mandoc_calloc(1, sizeof(struct man_node));
p->line = line;
p->pos = pos;
p->type = type;
struct man_node *p;
p = man_node_alloc(line, pos, MAN_ELEM, tok);
- if (NULL == p)
- return(0);
if ( ! man_node_append(m, p))
return(0);
m->next = MAN_NEXT_CHILD;
struct man_node *p;
p = man_node_alloc(line, pos, MAN_HEAD, tok);
- if (NULL == p)
- return(0);
if ( ! man_node_append(m, p))
return(0);
m->next = MAN_NEXT_CHILD;
struct man_node *p;
p = man_node_alloc(line, pos, MAN_BODY, tok);
- if (NULL == p)
- return(0);
if ( ! man_node_append(m, p))
return(0);
m->next = MAN_NEXT_CHILD;
struct man_node *p;
p = man_node_alloc(line, pos, MAN_BLOCK, tok);
- if (NULL == p)
- return(0);
if ( ! man_node_append(m, p))
return(0);
m->next = MAN_NEXT_CHILD;
size_t sv;
n = man_node_alloc(line, pos, MAN_TEXT, -1);
- if (NULL == n)
- return(0);
-
- n->string = malloc(len + 1);
- if (NULL == n->string) {
- free(n);
- return(0);
- }
-
+ n->string = mandoc_malloc(len + 1);
sv = strlcpy(n->string, p, len + 1);
/* Prohibit truncation. */
void
man_node_freelist(struct man_node *p)
{
+ struct man_node *n;
if (p->child)
man_node_freelist(p->child);
- if (p->next)
- man_node_freelist(p->next);
-
assert(0 == p->nchild);
+ n = p->next;
man_node_free(p);
+ if (n)
+ man_node_freelist(n);
}
{
int i, j;
+ /* Literal free-form text whitespace is preserved. */
+
+ if (MAN_LITERAL & m->flags) {
+ if ( ! man_word_alloc(m, line, 0, buf))
+ return(0);
+ goto descope;
+ }
+
/* First de-chunk and allocate words. */
for (i = 0; ' ' == buf[i]; i++)
* out the block scope (also if applicable).
*/
- /* XXX - this should be in man_action.c. */
-
if (MAN_ELINE & m->flags) {
m->flags &= ~MAN_ELINE;
if ( ! man_unscope(m, m->last->parent))
}
+static int
+macrowarn(struct man *m, int ln, const char *buf)
+{
+ if ( ! (MAN_IGN_MACRO & m->pflags))
+ return(man_verr(m, ln, 0,
+ "unknown macro: %s%s",
+ buf, strlen(buf) > 3 ? "..." : ""));
+ return(man_vwarn(m, ln, 0, "unknown macro: %s%s",
+ buf, strlen(buf) > 3 ? "..." : ""));
+}
+
+
int
man_pmacro(struct man *m, int ln, char *buf)
{
- int i, j, c, ppos, fl;
- char mac[5];
+ int i, j, c, ppos, fl;
+ char mac[5];
+ struct man_node *n;
/* Comments and empties are quickly ignored. */
fl = m->flags;
- if (0 == buf[1])
- goto out;
+ if ('\0' == buf[1])
+ return(1);
i = 1;
break;
else if (' ' == buf[i])
break;
+
+ /* Check for invalid characters. */
+
+ if (isgraph((u_char)buf[i]))
+ continue;
+ return(man_perr(m, ln, i, WNPRINT));
}
- mac[j] = 0;
+ mac[j] = '\0';
if (j == 4 || j < 1) {
if ( ! (MAN_IGN_MACRO & m->pflags)) {
return(1);
}
- if (MAN_MAX == (c = man_hash_find(m->htab, mac))) {
- if ( ! (MAN_IGN_MACRO & m->pflags)) {
- (void)man_perr(m, ln, ppos, WMACRO);
- goto err;
- }
- if ( ! man_pwarn(m, ln, ppos, WMACRO))
+ if (MAN_MAX == (c = man_hash_find(mac))) {
+ if ( ! macrowarn(m, ln, mac))
goto err;
return(1);
}
while (buf[i] && ' ' == buf[i])
i++;
+ /* Remove prior ELINE macro, if applicable. */
+
+ if (m->flags & MAN_ELINE) {
+ n = m->last;
+ assert(NULL == n->child);
+ assert(0 == n->nchild);
+ if ( ! man_nwarn(m, n, WLNSCOPE))
+ return(0);
+
+ if (n->prev) {
+ assert(n != n->parent->child);
+ assert(n == n->prev->next);
+ n->prev->next = NULL;
+ m->last = n->prev;
+ m->next = MAN_NEXT_SIBLING;
+ } else {
+ assert(n == n->parent->child);
+ n->parent->child = NULL;
+ m->last = n->parent;
+ m->next = MAN_NEXT_CHILD;
+ }
+
+ man_node_free(n);
+ m->flags &= ~MAN_ELINE;
+ }
+
/* Begin recursive parse sequence. */
assert(man_macros[c].fp);
/* Close out the block scope opened in the prior line. */
- /* XXX - this should be in man_action.c. */
-
assert(MAN_BLINE & m->flags);
m->flags &= ~MAN_BLINE;
git.ckatri.com / mandoc.git / blobdiff