 @@ -1,14 +1,14 @@
-/*	$NetBSD: indent.c,v 1.47 2021/03/13 00:26:56 rillig Exp $	*/
+/*	$NetBSD: indent.c,v 1.48 2021/03/13 09:21:57 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.47 2021/03/13 00:26:56 rillig Exp $");
+__RCSID("$NetBSD: indent.c,v 1.48 2021/03/13 09:21:57 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>
 @@ -1379,13 +1379,56 @@ indent_declaration(int cur_dec_ind, int
 	    pos = tpos;
+	}
+    }
     check_size_code(cur_dec_ind - pos + 1);
     while (pos < cur_dec_ind) {
 	*e_code++ = ' ';
 	pos++;
+    }
     if (e_code == startpos && ps.want_blank) {
 	*e_code++ = ' ';
 	ps.want_blank = false;
+    }
+}
 #ifdef debug
 void
 debug_printf(const char *fmt, ...)
+{
     FILE *f = output == stdout ? stderr : stdout;
     va_list ap;
     va_start(ap, fmt);
     vfprintf(f, fmt, ap);
     va_end(ap);
+}
 void
 debug_println(const char *fmt, ...)
+{
     FILE *f = output == stdout ? stderr : stdout;
     va_list ap;
     va_start(ap, fmt);
     vfprintf(f, fmt, ap);
     va_end(ap);
     fprintf(f, "\n");
+}
 void
 debug_vis_range(const char *prefix, const char *s, const char *e,
 		const char *suffix)
+{
     debug_printf("%s", prefix);
     for (const char *p = s; p < e; p++) {
 	if (isprint((unsigned char)*p) && *p != '\\' && *p != '"')
 	    debug_printf("%c", *p);
 	else if (*p == '\n')
 	    debug_printf("\\n");
 	else if (*p == '\t')
 	    debug_printf("\\t");
 	else
 	    debug_printf("\\x%02x", *p);
+    }
     debug_printf("%s", suffix);
+}
 #endif

 @@ -1,14 +1,14 @@
-/*	$NetBSD: indent.h,v 1.8 2021/03/13 00:26:56 rillig Exp $	*/
+/*	$NetBSD: indent.h,v 1.9 2021/03/13 09:21:57 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,45 +20,52 @@
  * 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.8 2021/03/13 00:26:56 rillig Exp $");
+__RCSID("$NetBSD: indent.h,v 1.9 2021/03/13 09:21:57 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 *);
 void	alloc_typenames(void);
 int	compute_code_column(void);
 int	compute_label_column(void);
 int	count_spaces(int, const char *);
 int	count_spaces_until(int, const char *, const char *);
 void	init_constant_tt(void);
 #ifdef debug
 void	debug_vis_range(const char *, const char *, const char *, const char *);
 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	set_defaults(void);
 void	set_option(char *);
 void	set_profile(const char *);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: io.c,v 1.35 2021/03/13 09:06:12 rillig Exp $	*/
+/*	$NetBSD: io.c,v 1.36 2021/03/13 09:21:57 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,81 +36,84 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #if 0
 #ifndef lint
 static char sccsid[] = "@(#)io.c	8.1 (Berkeley) 6/6/93";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
 #ifndef lint
 #if defined(__NetBSD__)
-__RCSID("$NetBSD: io.c,v 1.35 2021/03/13 09:06:12 rillig Exp $");
+__RCSID("$NetBSD: io.c,v 1.36 2021/03/13 09:21:57 rillig Exp $");
 #elif defined(__FreeBSD__)
 __FBSDID("$FreeBSD: head/usr.bin/indent/io.c 334927 2018-06-10 16:44:18Z pstef $");
 #endif
 #endif
 #include <ctype.h>
 #include <err.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdarg.h>
 #include "indent.h"
 int         comment_open;
 static int  paren_indent;
 static void
 output_char(char ch)
+{
     fputc(ch, output);
     debug_vis_range("output_char '", &ch, &ch + 1, "'\n");
+}
 static void
 output_range(const char *s, const char *e)
+{
     fwrite(s, 1, (size_t)(e - s), output);
     debug_vis_range("output_range \"", s, e, "\"\n");
+}
 static inline void
 output_string(const char *s)
+{
     output_range(s, s + strlen(s));
+}
 static int
 output_indent(int old_ind, int new_ind)
+{
     int ind = old_ind;
     if (opt.use_tabs) {
 	int tabsize = opt.tabsize;
 	int n = new_ind / tabsize - ind / tabsize;
 	if (n > 0)
 	    ind -= ind % tabsize;
 	for (int i = 0; i < n; i++) {
-	    output_char('\t');
+	    fputc('\t', output);
 	    ind += tabsize;
+	}
+    }
     for (; ind < new_ind; ind++)
-        output_char(' ');
+        fputc(' ', output);
     debug_println("output_indent %d", ind);
     return ind;
+}
 /*
  * dump_line is the routine that actually effects the printing of the new
  * source. It prints the label section, followed by the code section with
  * the appropriate nesting level, followed by any comments.
  */
 void
 dump_line(void)
+{
     int cur_col, target_col;
     static int  not_first_line;
 @@ -186,29 +189,39 @@ dump_line(void)
 	    cur_col = 1;	/* there is no label section */
 	ps.pcase = false;
 	if (s_code != e_code) {	/* print code section, if any */
 	    if (comment_open) {
 		comment_open = 0;
 		output_string(".*/\n");
+	    }
 	    target_col = compute_code_column();
+	    {
 		int i;
-		for (i = 0; i < ps.p_l_follow; i++)
+		for (i = 0; i < ps.p_l_follow; i++) {
-		    if (ps.paren_indents[i] >= 0)
+		    if (ps.paren_indents[i] >= 0) {
-			ps.paren_indents[i] = -(ps.paren_indents[i] + target_col);
+			int ind = ps.paren_indents[i];
 			/*
 			 * XXX: this mix of 'indent' and 'column' smells like
 			 * an off-by-one error.
 			 */
 			ps.paren_indents[i] = -(ind + target_col);
 			debug_println(
 			    "setting pi[%d] from %d to %d for column %d",
 			    i, ind, ps.paren_indents[i], target_col);
+		    }
+		}
+	    }
 	    cur_col = 1 + output_indent(cur_col - 1, target_col - 1);
 	    output_range(s_code, e_code);
 	    cur_col = count_spaces(cur_col, s_code);
+	}
 	if (s_com != e_com) {		/* print comment, if any */
 	    int target = ps.com_col;
 	    char *com_st = s_com;
 	    target += ps.comment_delta;
 	    while (*com_st == '\t')	/* consider original indentation in
 				     * case this is a box comment */
 		com_st++, target += opt.tabsize;
 @@ -255,28 +268,31 @@ dump_line(void)
 					 * proper comment indentation */
     ps.ind_stmt = ps.in_stmt & ~ps.in_decl;	/* next line should be
 						 * indented if we have not
 						 * completed this stmt and if
 						 * we are not in the middle of
 						 * a declaration */
     ps.use_ff = false;
     ps.dumped_decl_indent = 0;
     *(e_lab = s_lab) = '\0';	/* reset buffers */
     *(e_code = s_code) = '\0';
     *(e_com = s_com = combuf + 1) = '\0';
     ps.ind_level = ps.i_l_follow;
     ps.paren_level = ps.p_l_follow;
-    if (ps.paren_level > 0)
+    if (ps.paren_level > 0) {
         /* TODO: explain what negative indentation means */
 	paren_indent = -ps.paren_indents[ps.paren_level - 1];
 	debug_println("paren_indent is now %d", paren_indent);
+    }
     not_first_line = 1;
+}
 int
 compute_code_column(void)
+{
     int target_col = opt.ind_size * ps.ind_level + 1;
     if (ps.paren_level) {
 	if (!opt.lineup_to_parens)
 	    target_col += opt.continuation_indent *
 		(2 * opt.continuation_indent == opt.ind_size ? 1 : ps.paren_level);
 	else if (opt.lineup_to_parens_always)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: lexi.c,v 1.38 2021/03/12 23:10:18 rillig Exp $	*/
+/*	$NetBSD: lexi.c,v 1.39 2021/03/13 09:21:57 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[] = "@(#)lexi.c	8.1 (Berkeley) 6/6/93";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
 #ifndef lint
 #if defined(__NetBSD__)
-__RCSID("$NetBSD: lexi.c,v 1.38 2021/03/12 23:10:18 rillig Exp $");
+__RCSID("$NetBSD: lexi.c,v 1.39 2021/03/13 09:21:57 rillig Exp $");
 #elif defined(__FreeBSD__)
 __FBSDID("$FreeBSD: head/usr.bin/indent/lexi.c 337862 2018-08-15 18:19:45Z pstef $");
 #endif
 #endif
 /*
  * Here we have the token scanner for indent.  It scans off one token and puts
  * it in the global variable "token".  It returns a code, indicating the type
  * of token scanned.
  */
 #include <assert.h>
 #include <err.h>
 @@ -251,52 +251,42 @@ token_type_name(token_type tk)
 	"stmt", "stmt_list", "keyword_else", "keyword_do", "do_stmt",
 	"if_expr_stmt", "if_expr_stmt_else", "period", "string_prefix",
 	"storage_class", "funcname", "type_def", "keyword_struct_union_enum"
     };
     assert(0 <= tk && tk < sizeof name / sizeof name[0]);
     return name[tk];
+}
 static void
 print_buf(const char *name, const char *s, const char *e)
+{
-    if (s == e)
+    if (s < e) {
-	return;
+	debug_printf(" %s ", name);
 	debug_vis_range("\"", s, e, "\"");
     printf(" %s \"", name);
     for (const char *p = s; p < e; p++) {
 	if (isprint((unsigned char)*p) && *p != '\\' && *p != '"')
 	    printf("%c", *p);
 	else if (*p == '\n')
 	    printf("\\n");
 	else if (*p == '\t')
 	    printf("\\t");
 	else
 	    printf("\\x%02x", *p);
+    }
     printf("\"");
+}
 static token_type
 lexi_end(token_type code)
+{
-    printf("in line %d, lexi returns '%s'", line_no, token_type_name(code));
+    debug_printf("in line %d, lexi returns '%s'",
 	line_no, token_type_name(code));
     print_buf("token", s_token, e_token);
     print_buf("label", s_lab, e_lab);
     print_buf("code", s_code, e_code);
     print_buf("comment", s_com, e_com);
-    printf("\n");
+    debug_printf("\n");
     return code;
+}
 #else
 #  define lexi_end(tk) (tk)
 #endif
 token_type
 lexi(struct parser_state *state)
+{
     int         unary_delim;	/* this is set to 1 if the current token
 				 * forces a following operator to be unary */
     token_type  code;		/* internal code to be returned */