Module Name: src
Committed By: rillig
Date: Tue Oct 19 18:29:59 UTC 2021
Modified Files:
src/tests/usr.bin/indent: token_comment.c
src/usr.bin/indent: indent.c io.c
Log Message:
indent: if a file ends with indent off, don't add space-newline
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/tests/usr.bin/indent/token_comment.c
cvs rdiff -u -r1.138 -r1.139 src/usr.bin/indent/indent.c
cvs rdiff -u -r1.94 -r1.95 src/usr.bin/indent/io.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/usr.bin/indent/token_comment.c
diff -u src/tests/usr.bin/indent/token_comment.c:1.3 src/tests/usr.bin/indent/token_comment.c:1.4
--- src/tests/usr.bin/indent/token_comment.c:1.3 Tue Oct 19 18:18:23 2021
+++ src/tests/usr.bin/indent/token_comment.c Tue Oct 19 18:29:59 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: token_comment.c,v 1.3 2021/10/19 18:18:23 rillig Exp $ */
+/* $NetBSD: token_comment.c,v 1.4 2021/10/19 18:29:59 rillig Exp $ */
/* $FreeBSD$ */
/*
@@ -526,8 +526,6 @@ function(void)
}
/* $ FIXME: Missing empty line. */
/*INDENT OFF*/
-
-/* $ FIXME: The line above has a trailing space. */
#indent end
/*
Index: src/usr.bin/indent/indent.c
diff -u src/usr.bin/indent/indent.c:1.138 src/usr.bin/indent/indent.c:1.139
--- src/usr.bin/indent/indent.c:1.138 Sun Oct 17 18:13:00 2021
+++ src/usr.bin/indent/indent.c Tue Oct 19 18:29:59 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: indent.c,v 1.138 2021/10/17 18:13:00 rillig Exp $ */
+/* $NetBSD: indent.c,v 1.139 2021/10/19 18:29:59 rillig Exp $ */
/*-
* SPDX-License-Identifier: BSD-4-Clause
@@ -43,7 +43,7 @@ static char sccsid[] = "@(#)indent.c 5.1
#include <sys/cdefs.h>
#if defined(__NetBSD__)
-__RCSID("$NetBSD: indent.c,v 1.138 2021/10/17 18:13:00 rillig Exp $");
+__RCSID("$NetBSD: indent.c,v 1.139 2021/10/19 18:29:59 rillig Exp $");
#elif defined(__FreeBSD__)
__FBSDID("$FreeBSD: head/usr.bin/indent/indent.c 340138 2018-11-04 19:24:49Z oshogbo $");
#endif
@@ -274,7 +274,7 @@ static void
switch_buffer(void)
{
ps.search_brace = false; /* stop looking for start of stmt */
- saved_inp_s = inp.s; /* save current input buffer */
+ saved_inp_s = inp.s; /* save current input buffer */
saved_inp_e = inp.e;
inp.s = save_com; /* fix so that subsequent calls to lexi will
* take tokens out of save_com */
Index: src/usr.bin/indent/io.c
diff -u src/usr.bin/indent/io.c:1.94 src/usr.bin/indent/io.c:1.95
--- src/usr.bin/indent/io.c:1.94 Mon Oct 11 19:04:47 2021
+++ src/usr.bin/indent/io.c Tue Oct 19 18:29:59 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: io.c,v 1.94 2021/10/11 19:04:47 rillig Exp $ */
+/* $NetBSD: io.c,v 1.95 2021/10/19 18:29:59 rillig Exp $ */
/*-
* SPDX-License-Identifier: BSD-4-Clause
@@ -43,7 +43,7 @@ static char sccsid[] = "@(#)io.c 8.1 (Be
#include <sys/cdefs.h>
#if defined(__NetBSD__)
-__RCSID("$NetBSD: io.c,v 1.94 2021/10/11 19:04:47 rillig Exp $");
+__RCSID("$NetBSD: io.c,v 1.95 2021/10/19 18:29:59 rillig Exp $");
#elif defined(__FreeBSD__)
__FBSDID("$FreeBSD: head/usr.bin/indent/io.c 334927 2018-06-10 16:44:18Z pstef $");
#endif
@@ -427,8 +427,10 @@ inbuf_read_line(void)
}
if ((ch = getc(f)) == EOF) {
- *p++ = ' ';
- *p++ = '\n';
+ if (!inhibit_formatting) {
+ *p++ = ' ';
+ *p++ = '\n';
+ }
had_eof = true;
break;
}
@@ -450,10 +452,8 @@ inbuf_read_line(void)
}
if (inhibit_formatting) {
- p = inp.buf;
- do {
+ for (p = inp.s; p < inp.e; p++)
output_char(*p);
- } while (*p++ != '\n');
}
}
