===================================================================
RCS file: /cvs/mandoc/roff.c,v
retrieving revision 1.97
retrieving revision 1.99
diff -u -p -r1.97 -r1.99
--- mandoc/roff.c	2010/07/27 19:56:50	1.97
+++ mandoc/roff.c	2010/08/24 12:48:43	1.99
@@ -1,4 +1,4 @@
-/*	$Id: roff.c,v 1.97 2010/07/27 19:56:50 kristaps Exp $ */
+/*	$Id: roff.c,v 1.99 2010/08/24 12:48:43 kristaps Exp $ */
 /*
  * Copyright (c) 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org>
@@ -136,6 +136,7 @@ static	int		 roff_res(struct roff *, 
 				char **, size_t *, int);
 static	void		 roff_setstr(struct roff *,
 				const char *, const char *);
+static	char		*roff_strdup(const char *);
 
 /* See roff_hash_find() */
 
@@ -168,7 +169,7 @@ static	void		 roff_free1(struct roff *);
 static	enum rofft	 roff_hash_find(const char *);
 static	void		 roff_hash_init(void);
 static	void		 roffnode_cleanscope(struct roff *);
-static	int		 roffnode_push(struct roff *, 
+static	void		 roffnode_push(struct roff *, 
 				enum rofft, int, int);
 static	void		 roffnode_pop(struct roff *);
 static	enum rofft	 roff_parse(const char *, int *);
@@ -258,16 +259,12 @@ roffnode_pop(struct roff *r)
  * Push a roff node onto the instruction stack.  This must later be
  * removed with roffnode_pop().
  */
-static int
+static void
 roffnode_push(struct roff *r, enum rofft tok, int line, int col)
 {
 	struct roffnode	*p;
 
-	if (NULL == (p = calloc(1, sizeof(struct roffnode)))) {
-		(*r->msg)(MANDOCERR_MEM, r->data, line, col, NULL);
-		return(0);
-	}
-
+	p = mandoc_calloc(1, sizeof(struct roffnode));
 	p->tok = tok;
 	p->parent = r->last;
 	p->line = line;
@@ -275,7 +272,6 @@ roffnode_push(struct roff *r, enum rofft tok, int line
 	p->rule = p->parent ? p->parent->rule : ROFFRULE_DENY;
 
 	r->last = p;
-	return(1);
 }
 
 
@@ -307,15 +303,11 @@ roff_free(struct roff *r)
 
 
 struct roff *
-roff_alloc(struct regset *regs, const mandocmsg msg, void *data)
+roff_alloc(struct regset *regs, void *data, const mandocmsg msg)
 {
 	struct roff	*r;
 
-	if (NULL == (r = calloc(1, sizeof(struct roff)))) {
-		(*msg)(MANDOCERR_MEM, data, 0, 0, NULL);
-		return(0);
-	}
-
+	r = mandoc_calloc(1, sizeof(struct roff));
 	r->regs = regs;
 	r->msg = msg;
 	r->data = data;
@@ -650,8 +642,7 @@ roff_block(ROFF_ARGS)
 			pos++;
 	}
 
-	if ( ! roffnode_push(r, tok, ln, ppos))
-		return(ROFF_ERR);
+	roffnode_push(r, tok, ln, ppos);
 
 	if ('\0' == (*bufp)[pos])
 		return(ROFF_IGN);
@@ -673,13 +664,8 @@ roff_block(ROFF_ARGS)
 	if (1 == sz && '.' == (*bufp)[sv])
 		return(ROFF_IGN);
 
-	r->last->end = malloc(sz + 1);
+	r->last->end = mandoc_malloc(sz + 1);
 
-	if (NULL == r->last->end) {
-		(*r->msg)(MANDOCERR_MEM, r->data, ln, pos, NULL);
-		return(ROFF_ERR);
-	}
-
 	memcpy(r->last->end, *bufp + sv, sz);
 	r->last->end[(int)sz] = '\0';
 
@@ -905,8 +891,7 @@ roff_cond(ROFF_ARGS)
 		return(ROFF_ERR);
 	}
 
-	if ( ! roffnode_push(r, tok, ln, ppos))
-		return(ROFF_ERR);
+	roffnode_push(r, tok, ln, ppos);
 
 	r->last->rule = rule;
 
@@ -1051,6 +1036,27 @@ roff_nr(ROFF_ARGS)
 }
 
 
+static char *
+roff_strdup(const char *name)
+{
+	char		*namecopy, *sv;
+
+	/* 
+	 * This isn't a nice simple mandoc_strdup() because we must
+	 * handle roff's stupid double-escape rule. 
+	 */
+	sv = namecopy = mandoc_malloc(strlen(name) + 1);
+	while (*name) {
+		if ('\\' == *name && '\\' == *(name + 1))
+			name++;
+		*namecopy++ = *name++;
+	}
+
+	*namecopy = '\0';
+	return(sv);
+}
+
+
 static void
 roff_setstr(struct roff *r, const char *name, const char *string)
 {
@@ -1070,8 +1076,9 @@ roff_setstr(struct roff *r, const char *name, const ch
 	} else
 		free(n->string);
 
-	ROFF_DEBUG("roff: new symbol: [%s] = [%s]\n", name, string);
-	n->string = string ? strdup(string) : NULL;
+	/* Don't use mandoc_strdup: clean out double-escapes. */
+	n->string = string ? roff_strdup(string) : NULL;
+	ROFF_DEBUG("roff: new symbol: [%s] = [%s]\n", name, n->string);
 }