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 ee0d7324
	for <source@mandoc.bsd.lv>;
	Sun, 14 Apr 2019 10:00:07 -0500 (EST)
Date: Sun, 14 Apr 2019 10:00:07 -0500 (EST)
X-Mailinglist: mandoc-source
Reply-To: source@mandoc.bsd.lv
MIME-Version: 1.0
From: schwarze@mandoc.bsd.lv
To: source@mandoc.bsd.lv
Subject: docbook2mdoc: Make <sbr> self-closing even without a trailing slash.
X-Mailer: activitymail 1.26, http://search.cpan.org/dist/activitymail/
Content-Type: text/plain; charset=utf-8
Message-ID: <e3fdd0c58ad2b2b9@fantadrom.bsd.lv>

Log Message:
-----------
Make <sbr> self-closing even without a trailing slash.
This logically merges parse.c rev. 1.23,
even though the physical code differs.

Modified Files:
--------------
    docbook2mdoc:
        statistics.c

Revision Data
-------------
Index: statistics.c
===================================================================
RCS file: /home/cvs/mdocml/docbook2mdoc/statistics.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -Lstatistics.c -Lstatistics.c -u -p -r1.24 -r1.25
--- statistics.c
+++ statistics.c
@@ -46,6 +46,8 @@
  *
  * Example usage:
  * statistics tgroup colspec < filenames.txt | grep colspec
+ *
+ * Synchronized with parse.c up to rev. 1.42.
  */
 
 struct entry {
@@ -304,6 +306,8 @@ parse_file(int fd, char *fname)
 					    stack[stacki - 1] : "ROOT",
 					    b + poff);
 					stack_push(b + poff);
+					if (strcmp(b + poff, "sbr") == 0)
+						elem_end = 1;
 				}
 				if (elem_end)
 					stack_pop(b + poff);
@@ -314,8 +318,8 @@ parse_file(int fd, char *fname)
 			}
 		}
 		assert(poff > 0);
-		memmove(b, b + poff, rlen - poff);
 		rlen -= poff;
+		memmove(b, b + poff, rlen);
 	}
 	if (rsz < 0)
 		perror(fname);
--
 To unsubscribe send an email to source+unsubscribe@mandoc.bsd.lv