[src/netbsd-7]: src/usr.sbin/makemandb Pull up following revision(s) (request...

[snj <snj%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/1a87ea35c4b4
branches:  netbsd-7
changeset: 799191:1a87ea35c4b4
user:      snj <snj%NetBSD.org@localhost>
date:      Tue Apr 14 04:26:04 2015 +0000

description:
Pull up following revision(s) (requested by christos in ticket #675):
        usr.sbin/makemandb/makemandb.c: revision 1.27
- handle section numbers that are not single digits
- don't allocate and free needlessly

diffstat:

 usr.sbin/makemandb/makemandb.c |  16 +++++-----------
 1 files changed, 5 insertions(+), 11 deletions(-)

diffs (48 lines):

diff -r 15066e57fae5 -r 1a87ea35c4b4 usr.sbin/makemandb/makemandb.c
--- a/usr.sbin/makemandb/makemandb.c    Tue Apr 14 04:24:58 2015 +0000
+++ b/usr.sbin/makemandb/makemandb.c    Tue Apr 14 04:26:04 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: makemandb.c,v 1.24.2.2 2015/03/15 22:44:28 snj Exp $   */
+/*     $NetBSD: makemandb.c,v 1.24.2.3 2015/04/14 04:26:04 snj Exp $   */
 /*
  * Copyright (c) 2011 Abhinav Upadhyay <er.abhinav.upadhyay%gmail.com@localhost>
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps%bsd.lv@localhost>
@@ -17,7 +17,7 @@
  */
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: makemandb.c,v 1.24.2.2 2015/03/15 22:44:28 snj Exp $");
+__RCSID("$NetBSD: makemandb.c,v 1.24.2.3 2015/04/14 04:26:04 snj Exp $");
 
 #include <sys/stat.h>
 #include <sys/types.h>
@@ -990,12 +990,11 @@
                         * 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);
@@ -1052,13 +1051,8 @@
                        n = n->next;
 
                if (n && n->type == MDOC_TEXT) {
-                       size_t len = strlen(sn->string);
-                       char *buf = emalloc(len + 4);
-                       memcpy(buf, sn->string, len);
-                       buf[len] = '(';
-                       buf[len + 1] = n->string[0];
-                       buf[len + 2] = ')';
-                       buf[len + 3] = 0;
+                       char *buf;
+                       easprintf(&buf, "%s(%s)", sn->string, n->string);
                        mdoc_parse_section(n->sec, buf, rec);
                        free(buf);
                }