 @@ -1,33 +1,34 @@
-/*	$NetBSD: comments.0,v 1.1 2019/04/04 15:27:35 kamil Exp $	*/
+/*	$NetBSD: comments.0,v 1.2 2021/03/14 01:34:13 rillig Exp $	*/
 /* $FreeBSD: head/usr.bin/indent/tests/comments.0 321383 2017-07-23 15:07:52Z pstef $ */
 typedef enum x {
 	aaaaaaaaaaaaaaaaaaaaaa = 1 << 0,	/* test a */
 	bbbbbbbbbbbbbbbbb = 1 << 1,	/* test b */
 	cccccccccccccc = 1 << 1,	/* test c */
 	dddddddddddddddddddddddddddddd = 1 << 2	/* test d */
 } x;
 /* See r303597, r303598, r309219, and r309343 */
 void t(void) {
 	/*
 	 * Old indent wrapped the URL near where this sentence ends.
+	 *
 	 * https://www.freebsd.org/cgi/man.cgi?query=indent&apropos=0&sektion=0&manpath=FreeBSD+12-current&arch=default&format=html
 	 */
 	/*
-	 * Old indent did not wrap to column 78
+	 * The default maximum line length for comments is 78, and the 'kk' at
 	 * the end makes the line exactly 78 bytes long.
+	 *
 	 * aaaaaa bbbbbb cccccc dddddd eeeeee ffffff ggggg hhhhh iiiii jjjj kk
 	 */
 	/*
 	 * Old indent unnecessarily removed the star comment continuation on the next line.
+	 *
 	 * *test*
 	 */
 	/* r309219 Go through linked list, freeing from the malloced (t[-1]) address. */
 	/* r309343	*/
+}

 @@ -1,37 +1,37 @@
-/*	$NetBSD: comments.0.stdout,v 1.1 2019/04/04 15:27:35 kamil Exp $	*/
+/*	$NetBSD: comments.0.stdout,v 1.2 2021/03/14 01:34:13 rillig Exp $	*/
 /* $FreeBSD: head/usr.bin/indent/tests/comments.0.stdout 334563 2018-06-03 15:28:55Z pstef $ */
 typedef enum x {
 	aaaaaaaaaaaaaaaaaaaaaa = 1 << 0,	/* test a */
 	bbbbbbbbbbbbbbbbb = 1 << 1,	/* test b */
 	cccccccccccccc = 1 << 1,	/* test c */
 	dddddddddddddddddddddddddddddd = 1 << 2	/* test d */
 } x;
 /* See r303597, r303598, r309219, and r309343 */
 void
 t(void)
+{
 	/*
 	 * Old indent wrapped the URL near where this sentence ends.
+	 *
 	 * https://www.freebsd.org/cgi/man.cgi?query=indent&apropos=0&sektion=0&manpath=FreeBSD+12-current&arch=default&format=html
 	 */
 	/*
-	 * Old indent did not wrap to column 78
+	 * The default maximum line length for comments is 78, and the 'kk' at
 	 * the end makes the line exactly 78 bytes long.
+	 *
-	 * aaaaaa bbbbbb cccccc dddddd eeeeee ffffff ggggg hhhhh iiiii jjjj
+	 * aaaaaa bbbbbb cccccc dddddd eeeeee ffffff ggggg hhhhh iiiii jjjj kk
 	 * kk
 	 */
 	/*
 	 * Old indent unnecessarily removed the star comment continuation on
 	 * the next line.
+	 *
 	 * *test*
 	 */
 	/*
 	 * r309219 Go through linked list, freeing from the malloced (t[-1])
 	 * address.
 	 */

	@@ -1,20 +1,20 @@		@@ -1,20 +1,20 @@
1	/* $NetBSD: opt-bap+sob.0.stdout,v 1.1 2021/03/08 22:13:05 rillig Exp $ */	1	/* $NetBSD: opt-bap+sob.0.stdout,v 1.2 2021/03/14 01:34:13 rillig Exp $ */
2	/* $FreeBSD$ */	2	/* $FreeBSD$ */
3		3
4	/*	4	/*
5	* As of 2021-03-08, the combination of -bap and -sob, which occurs in the	5	* As of 2021-03-08, the combination of -bap and -sob, which occurs in the
6	* example indent.pro from NetBSD, removes the empty line above the	6	* example indent.pro from NetBSD, removes the empty line above the separator.
7	* separator. Seen in games/cgram/cgram.c.	7	* Seen in games/cgram/cgram.c.
8	*/	8	*/
9		9
10	void	10	void
11	function1(void)	11	function1(void)
12	{	12	{
13	}	13	}
14	/* $ FIXME: Keep the empty line between the '}' and the '//'. */	14	/* $ FIXME: Keep the empty line between the '}' and the '//'. */
15	///// separator /////	15	///// separator /////
16		16
17	void	17	void
18	function2(void)	18	function2(void)
19	{	19	{
20	}	20	}

 @@ -1,10 +1,10 @@
-/* $NetBSD: token-keyword_do_else.0.stdout,v 1.1 2021/03/12 00:13:06 rillig Exp $ */
+/* $NetBSD: token-keyword_do_else.0.stdout,v 1.2 2021/03/14 01:34:13 rillig Exp $ */
 /* $FreeBSD$ */
 /*
- * Tests for the keyword 'do' or 'else'.  These two keywords are followed by
+ * Tests for the keyword 'do' or 'else'.  These two keywords are followed by a
- * a space.  In contrast to 'for', 'if' and 'while', the space is not
+ * space.  In contrast to 'for', 'if' and 'while', the space is not followed
- * followed by a parenthesized expression.
+ * by a parenthesized expression.
  */
 /* TODO: Add some code to be formatted. */

 @@ -1,8 +1,7 @@
-/* $NetBSD: opt-P.0.stdout,v 1.2 2021/03/07 10:12:18 rillig Exp $ */
+/* $NetBSD: opt-P.0.stdout,v 1.3 2021/03/14 01:34:13 rillig Exp $ */
 /* $FreeBSD$ */
 /*
- * Mentioning another profile via -P has no effect since only a single
+ * Mentioning another profile via -P has no effect since only a single profile
- * profile can be specified on the command line, and there is no 'include'
+ * can be specified on the command line, and there is no 'include' option.
  * option.
  */

 @@ -1,25 +1,21 @@
-/* $NetBSD: token-comment.0.stdout,v 1.2 2021/03/14 00:50:39 rillig Exp $ */
+/* $NetBSD: token-comment.0.stdout,v 1.3 2021/03/14 01:34:13 rillig Exp $ */
 /* $FreeBSD$ */
 /*
  * Tests for formatting comments.  C99 defines block comments and end-of-line
  * comments.  Indent further distinguishes box comments that are a special
  * kind of block comments.
  */
 /* TODO: Add some code to be formatted. */
 /* 456789 123456789 123456789 123456789 123456789 123456789 123456789 12345 */
 /* 456789 123456789 123456789 123456789 123456789 123456789 123456789 123456 */
 /* 456789 123456789 123456789 123456789 123456789 123456789 123456789 1234567 */
 /* $ XXX: The '12345678' should be kept on the main line since it adds up */
 /* $ XXX: to a line length of exactly 78, which according to the manual */
 /* $ XXX: page should be ok. */
 /*
- * 456789 123456789 123456789 123456789 123456789 123456789 123456789
+ * 456789 123456789 123456789 123456789 123456789 123456789 123456789 12345678
  * 12345678
  */
 /*
  * 456789 123456789 123456789 123456789 123456789 123456789 123456789
  * 123456789
  */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: pr_comment.c,v 1.31 2021/03/14 00:22:16 rillig Exp $	*/
+/*	$NetBSD: pr_comment.c,v 1.32 2021/03/14 01:34:13 rillig Exp $	*/
 /*-
  * SPDX-License-Identifier: BSD-4-Clause
+ *
  * Copyright (c) 1985 Sun Microsystems, Inc.
  * Copyright (c) 1980, 1993
  *	The Regents of the University of California.  All rights reserved.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -36,27 +36,27 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #if 0
 #ifndef lint
 static char sccsid[] = "@(#)pr_comment.c	8.1 (Berkeley) 6/6/93";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
 #ifndef lint
 #if defined(__NetBSD__)
-__RCSID("$NetBSD: pr_comment.c,v 1.31 2021/03/14 00:22:16 rillig Exp $");
+__RCSID("$NetBSD: pr_comment.c,v 1.32 2021/03/14 01:34:13 rillig Exp $");
 #elif defined(__FreeBSD__)
 __FBSDID("$FreeBSD: head/usr.bin/indent/pr_comment.c 334927 2018-06-10 16:44:18Z pstef $");
 #endif
 #endif
 #include <err.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include "indent.h"
 static void
 @@ -190,26 +190,31 @@ process_comment(void)
     *e_com++ = '/';
     *e_com++ = e_token[-1];
     if (*buf_ptr != ' ' && !ps.box_com)
 	*e_com++ = ' ';
     /*
      * Don't put a break delimiter if this is a one-liner that won't wrap.
      */
     if (break_delim)
 	for (t_ptr = buf_ptr; *t_ptr != '\0' && *t_ptr != '\n'; t_ptr++) {
 	    if (t_ptr >= buf_end)
 		fill_buffer();
 	    if (t_ptr[0] == '*' && t_ptr[1] == '/') {
 	        /*
 	         * XXX: This computation ignores the leading " * ", as well
 	         * as the trailing ' ' '*' '/'.  In simple cases, these cancel
 	         * out since they are equally long.
 	         */
 		int right_margin = indentation_after_range(ps.com_col - 1,
 		    buf_ptr, t_ptr + 2);
 		if (right_margin < adj_max_line_length)
 		    break_delim = false;
 		break;
+	    }
+	}
     if (break_delim) {
 	char       *t = e_com;
 	e_com = s_com + 2;
 	*e_com = 0;
 	if (opt.blanklines_before_blockcomments && ps.last_token != lbrace)
 @@ -331,27 +336,27 @@ process_comment(void)
 	    do {
 		check_size_comment(1, &last_bl);
 		*e_com = *buf_ptr++;
 		if (buf_ptr >= buf_end)
 		    fill_buffer();
 		if (*e_com == ' ' || *e_com == '\t')
 		    last_bl = e_com;	/* remember we saw a blank */
 		++e_com;
 		now_len++;
 	    } while (!memchr("*\n\r\b\t", *buf_ptr, 6) &&
 		(now_len < adj_max_line_length || !last_bl));
 	    ps.last_nl = false;
 	    /* XXX: signed character comparison '>' does not work for UTF-8 */
-	    if (now_len >= adj_max_line_length &&
+	    if (now_len > adj_max_line_length &&
 		    !ps.box_com && e_com[-1] > ' ') {
 		/*
 		 * the comment is too long, it must be broken up
 		 */
 		if (last_bl == NULL) {
 		    dump_line();
 		    if (!ps.box_com && opt.star_comment_cont)
 			*e_com++ = ' ', *e_com++ = '*', *e_com++ = ' ';
 		    break;
+		}
 		*e_com = '\0';
 		e_com = last_bl;
 		dump_line();