Wed Mar 4 02:02:15 2015 UTC ()

- handle section numbers that are not single digits
- don't allocate and free needlessly


(christos)

diff -r1.26 -r1.27 src/usr.sbin/makemandb/makemandb.c

--- src/usr.sbin/makemandb/makemandb.c 2015/03/02 13:51:24	1.26
+++ src/usr.sbin/makemandb/makemandb.c 2015/03/04 02:02:15	1.27

 @@ -1,33 +1,33 @@
-/*	$NetBSD: makemandb.c,v 1.26 2015/03/02 13:51:24 joerg Exp $	*/
+/*	$NetBSD: makemandb.c,v 1.27 2015/03/04 02:02:15 christos Exp $	*/
 /*
  * Copyright (c) 2011 Abhinav Upadhyay <er.abhinav.upadhyay@gmail.com>
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
+ *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: makemandb.c,v 1.26 2015/03/02 13:51:24 joerg Exp $");
+__RCSID("$NetBSD: makemandb.c,v 1.27 2015/03/04 02:02:15 christos Exp $");
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <assert.h>
 #include <ctype.h>
 #include <dirent.h>
 #include <err.h>
 #include <archive.h>
 #include <libgen.h>
 #include <md5.h>
 #include <stdio.h>
 #include <stdlib.h>
 @@ -980,32 +980,31 @@ pmdoc_Nd(const struct mdoc_node *n, mand
 	char *buf = NULL;
 	char *temp;
 	char *nd_text;
 	if (n == NULL || n->tok == MDOC_MAX)
 		return;
 	if (n->type == MDOC_TEXT) {
 		if (rec->xr_found && n->next) {
 			/*
 			 * An Xr macro was seen previously, so parse this
 			 * and the next node.
 			 */
-			temp = estrdup(n->string);
+			temp = n->string;
 			n = n->next;
 			easprintf(&buf, "%s(%s)", temp, n->string);
 			concat(&rec->name_desc, buf);
 			free(buf);
 			free(temp);
 		} else {
 			nd_text = estrdup(n->string);
 			replace_hyph(nd_text);
 			concat(&rec->name_desc, nd_text);
 			free(nd_text);
+		}
 		rec->xr_found = 0;
 	} else if (mdocs[n->tok] == pmdoc_Xr) {
 		/* Remember that we have encountered an Xr macro */
 		rec->xr_found = 1;
+	}
 	if (n->child)
 @@ -1042,33 +1041,28 @@ pmdoc_macro_handler(const struct mdoc_no
 		while (n->type != MDOC_TEXT && n->next)
 			n = n->next;
 		if (n && n->type != MDOC_TEXT)
 			return;
 		sn = n;
 		if (n->next)
 			n = n->next;
 		while (n->type != MDOC_TEXT && n->next)
 			n = n->next;
 		if (n && n->type == MDOC_TEXT) {
-			size_t len = strlen(sn->string);
+			char *buf;
-			char *buf = emalloc(len + 4);
+			easprintf(&buf, "%s(%s)", sn->string, n->string);
 			memcpy(buf, sn->string, len);
 			buf[len] = '(';
 			buf[len + 1] = n->string[0];
 			buf[len + 2] = ')';
 			buf[len + 3] = 0;
 			mdoc_parse_section(n->sec, buf, rec);
 			free(buf);
+		}
 		break;
 	/* Parse the .Pp macro to add a new line */
 	case MDOC_Pp:
 		if (n->type == MDOC_TEXT)
 			mdoc_parse_section(n->sec, "\n", rec);
 		break;
 	default:
 		break;