* mandoc: Do not indent by SIZE_MAX/2 when .ce occurs inside explicit
@ 2020-09-02 16:40 schwarze
0 siblings, 0 replies; only message in thread
From: schwarze @ 2020-09-02 16:40 UTC (permalink / raw)
To: source
Log Message:
-----------
Do not indent by SIZE_MAX/2 when .ce occurs inside explicit no-fill mode.
While here, drop two unused arguments from the function term_field();
the related work was already done by term_fill() before this commit.
I found the bug in an afl run
that was performed by Jan Schreiber <jes at posteo dot de>.
Modified Files:
--------------
mandoc:
term.c
mandoc/regress/roff/ce:
basic.in
basic.out_ascii
Revision Data
-------------
Index: term.c
===================================================================
RCS file: /home/cvs/mandoc/mandoc/term.c,v
retrieving revision 1.281
retrieving revision 1.282
diff -Lterm.c -Lterm.c -u -p -r1.281 -r1.282
--- term.c
+++ term.c
@@ -1,7 +1,7 @@
-/* $Id$ */
+/* $Id$ */
/*
* Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2010-2019 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2010-2020 Ingo Schwarze <schwarze@openbsd.org>
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
@@ -38,8 +38,7 @@ static void bufferc(struct termp *, ch
static void encode(struct termp *, const char *, size_t);
static void encode1(struct termp *, int);
static void endline(struct termp *);
-static void term_field(struct termp *, size_t, size_t,
- size_t, size_t);
+static void term_field(struct termp *, size_t, size_t);
static void term_fill(struct termp *, size_t *, size_t *,
size_t);
@@ -127,8 +126,7 @@ term_flushln(struct termp *p)
* and with the BRNEVER flag, never break it at all.
*/
- vtarget = p->flags & TERMP_BRNEVER ? SIZE_MAX :
- (p->flags & TERMP_NOBREAK) == 0 ? vfield :
+ vtarget = (p->flags & TERMP_NOBREAK) == 0 ? vfield :
p->maxrmargin > p->viscol + vbl ?
p->maxrmargin - p->viscol - vbl : 0;
@@ -137,7 +135,8 @@ term_flushln(struct termp *p)
* If there is whitespace only, print nothing.
*/
- term_fill(p, &nbr, &vbr, vtarget);
+ term_fill(p, &nbr, &vbr,
+ p->flags & TERMP_BRNEVER ? SIZE_MAX : vtarget);
if (nbr == 0)
break;
@@ -156,7 +155,7 @@ term_flushln(struct termp *p)
/* Finally, print the field content. */
- term_field(p, vbl, nbr, vbr, vtarget);
+ term_field(p, vbl, nbr);
/*
* If there is no text left in the field, exit the loop.
@@ -345,12 +344,10 @@ term_fill(struct termp *p, size_t *nbr,
/*
* Print the contents of one field
* with an indentation of vbl visual columns,
- * an input string length of nbr characters,
- * an output width of vbr visual columns,
- * and a desired field width of vtarget visual columns.
+ * and an input string length of nbr characters.
*/
static void
-term_field(struct termp *p, size_t vbl, size_t nbr, size_t vbr, size_t vtarget)
+term_field(struct termp *p, size_t vbl, size_t nbr)
{
size_t ic; /* Character position in the input buffer. */
size_t vis; /* Visual position of the current character. */
Index: basic.in
===================================================================
RCS file: /home/cvs/mandoc/mandoc/regress/roff/ce/basic.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lregress/roff/ce/basic.in -Lregress/roff/ce/basic.in -u -p -r1.1 -r1.2
--- regress/roff/ce/basic.in
+++ regress/roff/ce/basic.in
@@ -1,5 +1,5 @@
-.\" $OpenBSD: basic.in,v 1.1 2019/01/04 01:06:44 schwarze Exp $
-.TH CE-BASIC 1 "January 4, 2019"
+.\" $OpenBSD: basic.in,v 1.2 2020/09/02 16:36:48 schwarze Exp $
+.TH CE-BASIC 1 "September 2, 2020"
.SH NAME
ce-basic \- basic usage of the centering request
.SH DESCRIPTION
@@ -13,5 +13,15 @@ text
.rj 2
Text adjusted to the right margin
works in just the same way and isn't filled either.
+.PP
+.nf
+Now entering
+explicit no-fill mode.
+.ce 2
+Text is still
+not filled.
+.PP
+.fi
final
text
+in fill mode
Index: basic.out_ascii
===================================================================
RCS file: /home/cvs/mandoc/mandoc/regress/roff/ce/basic.out_ascii,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lregress/roff/ce/basic.out_ascii -Lregress/roff/ce/basic.out_ascii -u -p -r1.1 -r1.2
--- regress/roff/ce/basic.out_ascii
+++ regress/roff/ce/basic.out_ascii
@@ -12,8 +12,14 @@ D\bDE\bES\bSC\bCR\bRI\bIP\bPT\bTI\bIO\bON\bN
normal text
Text adjusted to the right margin
works in just the same way and isn't filled either.
- final text
+ Now entering
+ explicit no-fill mode.
+ Text is still
+ not filled.
+ final text in fill mode
-OpenBSD January 4, 2019 CE-BASIC(1)
+
+
+OpenBSD September 2, 2020 CE-BASIC(1)
--
To unsubscribe send an email to source+unsubscribe@mandoc.bsd.lv
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2020-09-02 16:40 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-09-02 16:40 mandoc: Do not indent by SIZE_MAX/2 when .ce occurs inside explicit schwarze
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).