From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from localhost (fantadrom.bsd.lv [local]);
	by fantadrom.bsd.lv (OpenSMTPD) with ESMTPA id 75d027d3;
	for <source@mdocml.bsd.lv>;
	Thu, 5 Mar 2015 03:19:26 -0500 (EST)
Date: Thu, 5 Mar 2015 03:19:26 -0500 (EST)
Message-Id: <16672372192787029914.enqueue@fantadrom.bsd.lv>
X-Mailinglist: mdocml-source
Reply-To: source@mdocml.bsd.lv
MIME-Version: 1.0
From: kristaps@mdocml.bsd.lv
To: source@mdocml.bsd.lv
Subject: texi2mdoc: Don't print out defindex tokens--just save them.
X-Mailer: activitymail 1.26, http://search.cpan.org/dist/activitymail/
Content-Type: text/plain; charset=utf-8

Log Message:
-----------
Don't print out defindex tokens--just save them.

Modified Files:
--------------
    texi2mdoc:
        main.c

Revision Data
-------------
Index: main.c
===================================================================
RCS file: /home/cvs/mdocml/texi2mdoc/main.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -Lmain.c -Lmain.c -u -p -r1.59 -r1.60
--- main.c
+++ main.c
@@ -342,6 +342,12 @@ static	const struct texitok __texitoks[T
 
 const	struct texitok *const texitoks = __texitoks;
 
+/*
+ * Texinfo has lots of indexes.
+ * You can add new ones in a variety of ways.
+ * We maintain an array of all of these index names (usually a few
+ * letters) and pass unknown commands through the array list.
+ */
 static void
 dodefindex(struct texi *p, enum texicmd cmd, size_t *pos)
 {
@@ -350,7 +356,6 @@ dodefindex(struct texi *p, enum texicmd 
 
 	while (*pos < BUFSZ(p) && isws(BUF(p)[*pos]))
 		advance(p, pos);
-
 	start = end = *pos;
 	while (end < BUFSZ(p) && ! ismspace(BUF(p)[end]))
 		end++;
@@ -358,18 +363,21 @@ dodefindex(struct texi *p, enum texicmd 
 	if (start == end) {
 		advanceeoln(p, pos, 1);
 		return;
-	} else if (NULL == (cp = malloc(end - start + 1)))
+	} 
+	
+	if (NULL == (cp = malloc(end - start + 1)))
 		texiabort(p, NULL);
-
 	memcpy(cp, &BUF(p)[start], end - start);
 	cp[end - start] = '\0';
 
+	/* FIXME: use reallocarray(). */
 	p->indexs = realloc(p->indexs, 
 		sizeof(char *) * (p->indexsz + 1));
-
 	if (NULL == p->indexs)
 		texiabort(p, NULL);
 	p->indexs[p->indexsz++] = cp;
+
+	advanceeoln(p, pos, 1);
 }
 
 static void
--
 To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv