Module Name: src
Committed By: rillig
Date: Thu Oct 28 20:31:17 UTC 2021
Modified Files:
src/tests/usr.bin/indent: opt_version.c
src/usr.bin/indent: args.c
Log Message:
indent: change product name, update version number
NetBSD's indent has deviated enough from FreeBSD's indent to warrant a
different product name. When indent was copied from FreeBSD in 2019,
that update introduced several new bugs, some of which have been fixed
in the NetBSD version.
NetBSD indent, unlike FreeBSD indent, supports C99 comments and C99
initializer designators.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/usr.bin/indent/opt_version.c
cvs rdiff -u -r1.60 -r1.61 src/usr.bin/indent/args.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/opt_version.c
diff -u src/tests/usr.bin/indent/opt_version.c:1.1 src/tests/usr.bin/indent/opt_version.c:1.2
--- src/tests/usr.bin/indent/opt_version.c:1.1 Sat Oct 23 20:23:27 2021
+++ src/tests/usr.bin/indent/opt_version.c Thu Oct 28 20:31:17 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: opt_version.c,v 1.1 2021/10/23 20:23:27 rillig Exp $ */
+/* $NetBSD: opt_version.c,v 1.2 2021/10/28 20:31:17 rillig Exp $ */
/* $FreeBSD$ */
/*
@@ -13,5 +13,5 @@ even might generate syntax errors when g
#indent end
#indent run --version
-FreeBSD indent 2.0
+NetBSD indent 2.1
#indent end
Index: src/usr.bin/indent/args.c
diff -u src/usr.bin/indent/args.c:1.60 src/usr.bin/indent/args.c:1.61
--- src/usr.bin/indent/args.c:1.60 Tue Oct 26 19:36:30 2021
+++ src/usr.bin/indent/args.c Thu Oct 28 20:31:17 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: args.c,v 1.60 2021/10/26 19:36:30 rillig Exp $ */
+/* $NetBSD: args.c,v 1.61 2021/10/28 20:31:17 rillig Exp $ */
/*-
* SPDX-License-Identifier: BSD-4-Clause
@@ -43,7 +43,7 @@ static char sccsid[] = "@(#)args.c 8.1 (
#include <sys/cdefs.h>
#if defined(__NetBSD__)
-__RCSID("$NetBSD: args.c,v 1.60 2021/10/26 19:36:30 rillig Exp $");
+__RCSID("$NetBSD: args.c,v 1.61 2021/10/28 20:31:17 rillig Exp $");
#elif defined(__FreeBSD__)
__FBSDID("$FreeBSD: head/usr.bin/indent/args.c 336318 2018-07-15 21:04:21Z pstef $");
#endif
@@ -60,8 +60,6 @@ __FBSDID("$FreeBSD: head/usr.bin/indent/
#include "indent.h"
-#define INDENT_VERSION "2.0"
-
#if __STDC_VERSION__ >= 201112L
#define assert_type(expr, type) _Generic((expr), type : (expr))
#else
@@ -229,7 +227,7 @@ set_special_option(const char *arg, cons
const char *arg_end;
if (strncmp(arg, "-version", 8) == 0) {
- printf("FreeBSD indent %s\n", INDENT_VERSION);
+ printf("NetBSD indent 2.1\n");
exit(0);
}
