 @@ -1,14 +1,14 @@
-/*	$NetBSD: indent.c,v 1.55 2021/03/13 13:14:14 rillig Exp $	*/
+/*	$NetBSD: indent.c,v 1.56 2021/03/13 13:25:23 rillig Exp $	*/
 /*-
  * SPDX-License-Identifier: BSD-4-Clause
+ *
  * Copyright (c) 1985 Sun Microsystems, Inc.
  * Copyright (c) 1976 Board of Trustees of the University of Illinois.
  * Copyright (c) 1980, 1993
  *	The Regents of the University of California.  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[] = "@(#)indent.c	5.17 (Berkeley) 6/7/93";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
 #ifndef lint
 #if defined(__NetBSD__)
-__RCSID("$NetBSD: indent.c,v 1.55 2021/03/13 13:14:14 rillig Exp $");
+__RCSID("$NetBSD: indent.c,v 1.56 2021/03/13 13:25:23 rillig Exp $");
 #elif defined(__FreeBSD__)
 __FBSDID("$FreeBSD: head/usr.bin/indent/indent.c 340138 2018-11-04 19:24:49Z oshogbo $");
 #endif
 #endif
 #include <sys/param.h>
 #if HAVE_CAPSICUM
 #include <sys/capsicum.h>
 #include <capsicum_helpers.h>
 #endif
 #include <err.h>
 #include <errno.h>
 #include <fcntl.h>
 @@ -202,27 +202,27 @@ search_brace(token_type *inout_type_code
 	     * has been scanned in this loop, force_nl should be false.
+	     *
 	     * However, the force_nl == true must be preserved if newline
 	     * is never scanned in this loop, so this assignment cannot be
 	     * done earlier.
 	     */
 	    *inout_force_nl = false;
 	case form_feed:
 	    break;
 	case comment:
 	    if (sc_end == NULL) {
 		/*
 		 * Copy everything from the start of the line, because
-		 * pr_comment() will use that to calculate original
+		 * process_comment() will use that to calculate original
 		 * indentation of a boxed comment.
 		 */
 		memcpy(sc_buf, in_buffer, buf_ptr - in_buffer - 4);
 		save_com = sc_buf + (buf_ptr - in_buffer - 4);
 		save_com[0] = save_com[1] = ' ';
 		sc_end = &save_com[2];
+	    }
 	    *inout_comment_buffered = true;
 	    *sc_end++ = '/';	/* copy in start of comment */
 	    *sc_end++ = '*';
 	    for (;;) {		/* loop until the end of the comment */
 		*sc_end = *buf_ptr++;
 		if (buf_ptr >= buf_end)
 @@ -1429,28 +1429,28 @@ main_loop(void)
 	    break;
 	case period:
 	    process_period();
 	    break;
 	case comma:
 	    process_comma(dec_ind, tabs_to_var, &force_nl);
 	    break;
 	case preprocessing:	/* '#' */
 	    process_preprocessing();
 	    break;
-	case comment:		/* we have gotten a '/' followed by '*' */
+	case comment:		/* the initial '/' '*' or '//' of a comment */
-	    pr_comment();
+	    process_comment();
 	    break;
 	default:
 	    break;
 	}			/* end of big switch stmt */
 	*e_code = '\0';		/* make sure code section is null terminated */
 	if (type_code != comment &&
 	    type_code != newline &&
 	    type_code != preprocessing)
 	    ps.last_token = type_code;
+    }
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: indent.h,v 1.13 2021/03/13 10:32:25 rillig Exp $	*/
+/*	$NetBSD: indent.h,v 1.14 2021/03/13 13:25:23 rillig Exp $	*/
 /*-
  * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
  * Copyright (c) 2001 Jens Schweikhardt
  * 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
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -20,27 +20,27 @@
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #if 0
 #if defined(__NetBSD__)
-__RCSID("$NetBSD: indent.h,v 1.13 2021/03/13 10:32:25 rillig Exp $");
+__RCSID("$NetBSD: indent.h,v 1.14 2021/03/13 13:25:23 rillig Exp $");
 #elif defined(__FreeBSD__)
 __FBSDID("$FreeBSD: head/usr.bin/indent/indent.h 336333 2018-07-16 05:46:50Z pstef $");
 #endif
 #endif
 #include "indent_codes.h"
 #include "indent_globs.h"
 #ifndef nitems
 #define nitems(array) (sizeof (array) / sizeof (array[0]))
 #endif
 void	add_typename(const char *);
 @@ -55,17 +55,17 @@ void	debug_vis_range(const char *, const
 void	debug_printf(const char *, ...) __printflike(1, 2);
 void	debug_println(const char *, ...) __printflike(1, 2);
 const char *token_type_name(token_type);
 #else
 #define debug_printf(fmt, ...) do { } while (false)
 #define debug_println(fmt, ...) do { } while (false)
 #define debug_vis_range(prefix, s, e, suffix) do { } while (false)
 #endif
 token_type lexi(struct parser_state *);
 void	diag(int, const char *, ...) __printflike(2, 3);
 void	dump_line(void);
 void	fill_buffer(void);
 void	parse(token_type);
-void	pr_comment(void);
+void	process_comment(void);
 void	set_defaults(void);
 void	set_option(char *);
 void	set_profile(const char *);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: indent_globs.h,v 1.18 2021/03/13 11:19:43 rillig Exp $	*/
+/*	$NetBSD: indent_globs.h,v 1.19 2021/03/13 13:25:23 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
 @@ -244,27 +244,27 @@ extern struct parser_state {
     int         i_l_follow;	/* the level to which ind_level should be set
 				 * after the current line is printed */
     int         in_decl;	/* set to true when we are in a declaration
 				 * stmt.  The processing of braces is then
 				 * slightly different */
     int         in_stmt;	/* set to 1 while in a stmt */
     int         ind_level;	/* the current indentation level */
     int         ind_stmt;	/* set to 1 if next line should have an extra
 				 * indentation level because we are in the
 				 * middle of a stmt */
     int         last_u_d;	/* set to true after scanning a token which
 				 * forces a following operator to be unary */
     int         out_coms;	/* the number of comments processed, set by
-				 * pr_comment */
+				 * process_comment */
     int         out_lines;	/* the number of lines written, set by
 				 * dump_line */
     int         p_l_follow;	/* used to remember how to indent following
 				 * statement */
     int         paren_level;	/* parenthesization level. used to indent
 				 * within statements */
     short       paren_indents[20];	/* column positions of each paren */
     int         pcase;		/* set to 1 if the current line label is a
 				 * case.  It is printed differently from a
 				 * regular label */
     int         search_brace;	/* set to true by parse when it is necessary
 				 * to buffer up all info up to the start of a
 				 * stmt after an if, while, etc */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: pr_comment.c,v 1.27 2021/03/13 11:27:01 rillig Exp $	*/
+/*	$NetBSD: pr_comment.c,v 1.28 2021/03/13 13:25:23 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.27 2021/03/13 11:27:01 rillig Exp $");
+__RCSID("$NetBSD: pr_comment.c,v 1.28 2021/03/13 13:25:23 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
 @@ -69,79 +69,66 @@ check_size_comment(size_t desired_size,
     size_t com_len = e_com - s_com;
     ssize_t blank_pos = *last_bl_ptr != NULL ? *last_bl_ptr - combuf : -1;
     combuf = realloc(combuf, nsize);
     if (combuf == NULL)
 	err(1, NULL);
     e_com = combuf + com_len + 1;
     if (blank_pos > 0)
 	*last_bl_ptr = combuf + blank_pos;
     l_com = combuf + nsize - 5;
     s_com = combuf + 1;
+}
 /*
- * NAME:
+ * Scan, reformat and output a single comment, which is either a block comment
- *	pr_comment
+ * starting with '/' '*' or an end-of-line comment starting with '//'.
+ *
- * FUNCTION:
+ * Try to keep comments from going over the maximum line length.  If a line is
- *	This routine takes care of scanning and printing comments.
+ * too long, move everything starting from the last blank to the next comment
  * line.  Blanks and tabs from the beginning of the input line are removed.
+ *
  * ALGORITHM:
  *	1) Decide where the comment should be aligned, and if lines should
  *	   be broken.
  *	2) If lines should not be broken and filled, just copy up to end of
  *	   comment.
- *	3) If lines should be filled, then scan thru input_buffer copying
+ *	3) If lines should be filled, then scan through the input buffer,
- *	   characters to com_buf.  Remember where the last blank, tab, or
+ *	   copying characters to com_buf.  Remember where the last blank,
- *	   newline was.  When line is filled, print up to last blank and
+ *	   tab, or newline was.  When line is filled, print up to last blank
- *	   continue copying.
+ *	   and continue copying.
  * HISTORY:
  *	November 1976	D A Willcox of CAC	Initial coding
  *	12/6/76		D A Willcox of CAC	Modification to handle
  *						UNIX-style comments
  */
 /*
  * this routine processes comments.  It makes an attempt to keep comments from
  * going over the max line length.  If a line is too long, it moves everything
  * from the last blank to the next comment line.  Blanks and tabs from the
  * beginning of the input line are removed
  */
 void
-pr_comment(void)
+process_comment(void)
+{
     int         adj_max_line_length; /* Adjusted max_line_length for comments
 				 * that spill over the right margin */
     char       *last_bl;	/* points to the last blank in the output
 				 * buffer */
     char       *t_ptr;		/* used for moving string */
     int         break_delim = opt.comment_delimiter_on_blankline;
     int         l_just_saw_decl = ps.just_saw_decl;
     adj_max_line_length = opt.max_line_length;
     ps.just_saw_decl = 0;
     last_bl = NULL;		/* no blanks found so far */
     ps.box_com = false;		/* at first, assume that we are not in
 				 * a boxed comment or some other
 				 * comment that should not be touched */
     ++ps.out_coms;		/* keep track of number of comments */
     /* Figure where to align and how to treat the comment */
-    if (ps.col_1 && !opt.format_col1_comments) {	/* if comment starts in column
+    if (ps.col_1 && !opt.format_col1_comments) { /* if the comment starts in
-						 * 1 it should not be touched */
+				 * column 1, it should not be touched */
 	ps.box_com = true;
 	break_delim = false;
 	ps.com_col = 1;
     } else {
 	if (*buf_ptr == '-' || *buf_ptr == '*' || e_token[-1] == '/' ||
 	    (*buf_ptr == '\n' && !opt.format_block_comments)) {
 	    ps.box_com = true;	/* A comment with a '-' or '*' immediately
 				 * after the /+* is assumed to be a boxed
 				 * comment. A comment with a newline
 				 * immediately after the /+* is assumed to
 				 * be a block comment and is treated as a
 				 * box comment unless format_block_comments
 				 * is nonzero (the default). */