 @@ -1,471 +1,471 @@
-/*	$NetBSD: io.c,v 1.44 2021/03/13 13:54:01 rillig Exp $	*/
+/*	$NetBSD: io.c,v 1.45 2021/03/13 13:55:42 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
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
  *    must display the following acknowledgement:
  *	This product includes software developed by the University of
  *	California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS 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
 #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.44 2021/03/13 13:54:01 rillig Exp $");
+__RCSID("$NetBSD: io.c,v 1.45 2021/03/13 13:55:42 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++) {
 	    fputc('\t', output);
 	    ind += tabsize;
+	}
+    }
     for (; ind < new_ind; ind++)
         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;
     static int  not_first_line;
     if (ps.procname[0]) {
 	ps.ind_level = 0;
 	ps.procname[0] = 0;
+    }
     if (s_code == e_code && s_lab == e_lab && s_com == e_com) {
 	if (suppress_blanklines > 0)
 	    suppress_blanklines--;
 	else {
 	    ps.bl_line = true;
 	    n_real_blanklines++;
+	}
     } else if (!inhibit_formatting) {
 	suppress_blanklines = 0;
 	ps.bl_line = false;
 	if (prefix_blankline_requested && not_first_line) {
 	    if (opt.swallow_optional_blanklines) {
 		if (n_real_blanklines == 1)
 		    n_real_blanklines = 0;
 	    } else {
 		if (n_real_blanklines == 0)
 		    n_real_blanklines = 1;
+	    }
+	}
 	while (--n_real_blanklines >= 0)
 	    output_char('\n');
 	n_real_blanklines = 0;
 	if (ps.ind_level == 0)
 	    ps.ind_stmt = 0;	/* this is a class A kludge. dont do
 				 * additional statement indentation if we are
 				 * at bracket level 0 */
 	if (e_lab != s_lab || e_code != s_code)
 	    ++code_lines;	/* keep count of lines with code */
 	if (e_lab != s_lab) {	/* print lab, if any */
 	    if (comment_open) {
 		comment_open = 0;
 		output_string(".*/\n");
+	    }
 	    while (e_lab > s_lab && (e_lab[-1] == ' ' || e_lab[-1] == '\t'))
 		e_lab--;
 	    *e_lab = '\0';
 	    cur_col = 1 + output_indent(0, compute_label_indent());
 	    if (s_lab[0] == '#' && (strncmp(s_lab, "#else", 5) == 0
 				    || strncmp(s_lab, "#endif", 6) == 0)) {
 		char *s = s_lab;
 		if (e_lab[-1] == '\n') e_lab--;
 		do {
 		    output_char(*s++);
 		} while (s < e_lab && 'a' <= *s && *s <= 'z');
 		while ((*s == ' ' || *s == '\t') && s < e_lab)
 		    s++;
 		if (s < e_lab) {
 		    if (s[0] == '/' && s[1] == '*') {
 			output_char('\t');
 			output_range(s, e_lab);
 		    } else {
 		        output_string("\t/* ");
 			output_range(s, e_lab);
 			output_string(" */");
+		    }
+		}
 	    } else
 	        output_range(s_lab, e_lab);
 	    cur_col = 1 + indentation_after(cur_col - 1, s_lab);
 	} else
 	    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");
+	    }
 	    int target_col = 1 + compute_code_indent();
+	    {
 		int i;
 		for (i = 0; i < ps.p_l_follow; i++) {
 		    if (ps.paren_indents[i] >= 0) {
 			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 = 1 + indentation_after(cur_col - 1, s_code);
+	}
 	if (s_com != e_com) {		/* print comment, if any */
-	    int target = ps.com_col;
+	    int target_col = ps.com_col;
 	    char *com_st = s_com;
-	    target += ps.comment_delta;
+	    target_col += ps.comment_delta;
 	    while (*com_st == '\t')	/* consider original indentation in
 				     * case this is a box comment */
-		com_st++, target += opt.tabsize;
+		com_st++, target_col += opt.tabsize;
-	    while (target <= 0)
+	    while (target_col <= 0)
 		if (*com_st == ' ')
-		    target++, com_st++;
+		    target_col++, com_st++;
 		else if (*com_st == '\t') {
-		    target = opt.tabsize * (1 + (target - 1) / opt.tabsize) + 1;
+		    target_col = opt.tabsize * (1 + (target_col - 1) / opt.tabsize) + 1;
 		    com_st++;
 		} else
-		    target = 1;
+		    target_col = 1;
-	    if (cur_col > target) {	/* if comment can't fit on this line,
+	    if (cur_col > target_col) {	/* if comment can't fit on this line,
 				     * put it on next line */
 		output_char('\n');
 		cur_col = 1;
 		++ps.out_lines;
+	    }
 	    while (e_com > com_st && isspace((unsigned char)e_com[-1]))
 		e_com--;
-	    (void)output_indent(cur_col - 1, target - 1);
+	    (void)output_indent(cur_col - 1, target_col - 1);
 	    output_range(com_st, e_com);
 	    ps.comment_delta = ps.n_comment_delta;
 	    ++ps.com_lines;	/* count lines with comments */
+	}
 	if (ps.use_ff)
 	    output_char('\014');
 	else
 	    output_char('\n');
 	++ps.out_lines;
 	if (ps.just_saw_decl == 1 && opt.blanklines_after_declarations) {
 	    prefix_blankline_requested = 1;
 	    ps.just_saw_decl = 0;
 	} else
 	    prefix_blankline_requested = postfix_blankline_requested;
 	postfix_blankline_requested = 0;
+    }
     /* keep blank lines after '//' comments */
     if (e_com - s_com > 1 && s_com[1] == '/')
 	output_range(s_token, e_token);
     ps.decl_on_line = ps.in_decl;	/* if we are in the middle of a
 					 * declaration, remember that fact for
 					 * 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) {
         /* 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_indent(void)
+{
     int target_ind = opt.indent_size * ps.ind_level;
     if (ps.paren_level != 0) {
 	if (!opt.lineup_to_parens)
 	    target_ind += opt.continuation_indent *
 		(2 * opt.continuation_indent == opt.indent_size ? 1 : ps.paren_level);
 	else if (opt.lineup_to_parens_always)
 	    /*
 	     * XXX: where does this '- 1' come from?  It looks strange but is
 	     * nevertheless needed for proper indentation, as demonstrated in
 	     * the test opt-lpl.0.
 	     */
 	    target_ind = paren_indent - 1;
 	else {
 	    int w;
 	    int t = paren_indent;
 	    if ((w = 1 + indentation_after(t - 1, s_code) - opt.max_line_length) > 0
 		&& 1 + indentation_after(target_ind, s_code) <= opt.max_line_length) {
 		t -= w + 1;
 		if (t > target_ind + 1)
 		    target_ind = t - 1;
 	    } else
 		target_ind = t - 1;
+	}
     } else if (ps.ind_stmt)
 	target_ind += opt.continuation_indent;
     return target_ind;
+}
 int
 compute_label_indent(void)
+{
     if (ps.pcase)
 	return (int) (case_ind * opt.indent_size);
     if (s_lab[0] == '#')
         return 0;
     return opt.indent_size * (ps.ind_level - label_offset);
+}
 /*
  * Copyright (C) 1976 by the Board of Trustees of the University of Illinois
+ *
  * All rights reserved
+ *
  * FUNCTION: Reads one block of input into the input buffer
  */
 void
 fill_buffer(void)
 {				/* this routine reads stuff from the input */
     char *p;
     int i;
     FILE *f = input;
     if (bp_save != NULL) {	/* there is a partly filled input buffer left */
 	buf_ptr = bp_save;	/* do not read anything, just switch buffers */
 	buf_end = be_save;
 	bp_save = be_save = NULL;
 	if (buf_ptr < buf_end)
 	    return;		/* only return if there is really something in
 				 * this buffer */
+    }
     for (p = in_buffer;;) {
 	if (p >= in_buffer_limit) {
 	    int size = (in_buffer_limit - in_buffer) * 2 + 10;
 	    int offset = p - in_buffer;
 	    in_buffer = realloc(in_buffer, size);
 	    if (in_buffer == NULL)
 		errx(1, "input line too long");
 	    p = in_buffer + offset;
 	    in_buffer_limit = in_buffer + size - 2;
+	}
 	if ((i = getc(f)) == EOF) {
 	    *p++ = ' ';
 	    *p++ = '\n';
 	    had_eof = true;
 	    break;
+	}
 	if (i != '\0')
 	    *p++ = i;
 	if (i == '\n')
 	    break;
+    }
     buf_ptr = in_buffer;
     buf_end = p;
     if (p - in_buffer > 2 && p[-2] == '/' && p[-3] == '*') {
 	if (in_buffer[3] == 'I' && strncmp(in_buffer, "/**INDENT**", 11) == 0)
 	    fill_buffer();	/* flush indent error message */
 	else {
 	    int com = 0;
 	    p = in_buffer;
 	    while (*p == ' ' || *p == '\t')
 		p++;
 	    if (*p == '/' && p[1] == '*') {
 		p += 2;
 		while (*p == ' ' || *p == '\t')
 		    p++;
 		if (p[0] == 'I' && p[1] == 'N' && p[2] == 'D' && p[3] == 'E'
 			&& p[4] == 'N' && p[5] == 'T') {
 		    p += 6;
 		    while (*p == ' ' || *p == '\t')
 			p++;
 		    if (*p == '*')
 			com = 1;
 		    else if (*p == 'O') {
 			if (*++p == 'N')
 			    p++, com = 1;
 			else if (*p == 'F' && *++p == 'F')
 			    p++, com = 2;
+		    }
 		    while (*p == ' ' || *p == '\t')
 			p++;
 		    if (p[0] == '*' && p[1] == '/' && p[2] == '\n' && com) {
 			if (s_com != e_com || s_lab != e_lab || s_code != e_code)
 			    dump_line();
 			if (!(inhibit_formatting = com - 1)) {
 			    n_real_blanklines = 0;
 			    postfix_blankline_requested = 0;
 			    prefix_blankline_requested = 0;
 			    suppress_blanklines = 1;
+			}
+		    }
+		}
+	    }
+	}
+    }
     if (inhibit_formatting) {
 	p = in_buffer;
 	do {
 	    output_char(*p);
 	} while (*p++ != '\n');
+    }
+}
 int
 indentation_after_range(int ind, const char *start, const char *end)
+{
     for (const char *p = start; *p != '\0' && p != end; ++p) {
 	if (*p == '\n' || *p == '\f')
 	    ind = 0;
 	else if (*p == '\t')
 	    ind = opt.tabsize * (ind / opt.tabsize + 1);
 	else if (*p == '\b')
 	    --ind;
 	else
 	    ++ind;
+    }
     return ind;
+}
 int
 indentation_after(int ind, const char *s)
+{
     return indentation_after_range(ind, s, NULL);
+}
 void
 diag(int level, const char *msg, ...)
+{
     va_list ap;
     const char *s, *e;
     if (level)
 	found_err = 1;
     if (output == stdout) {
 	s = "/**INDENT** ";
 	e = " */";
     } else {
 	s = e = "";
+    }
     va_start(ap, msg);
     fprintf(stderr, "%s%s@%d: ", s, level == 0 ? "Warning" : "Error", line_no);
     vfprintf(stderr, msg, ap);
     fprintf(stderr, "%s\n", e);
     va_end(ap);
+}