CVS commit: src/usr.bin/indent
Module Name:src
Committed By: rillig
Date: Thu May 18 06:01:39 UTC 2023
Modified Files:
src/usr.bin/indent: args.c indent.c indent.h
Log Message:
indent: rename a few functions
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.79 -r1.80 src/usr.bin/indent/args.c
cvs rdiff -u -r1.293 -r1.294 src/usr.bin/indent/indent.c
cvs rdiff -u -r1.148 -r1.149 src/usr.bin/indent/indent.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/indent/args.c
diff -u src/usr.bin/indent/args.c:1.79 src/usr.bin/indent/args.c:1.80
--- src/usr.bin/indent/args.c:1.79 Thu May 18 05:33:27 2023
+++ src/usr.bin/indent/args.c Thu May 18 06:01:39 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: args.c,v 1.79 2023/05/18 05:33:27 rillig Exp $ */
+/* $NetBSD: args.c,v 1.80 2023/05/18 06:01:39 rillig Exp $ */
/*-
* SPDX-License-Identifier: BSD-4-Clause
@@ -38,7 +38,7 @@
*/
#include
-__RCSID("$NetBSD: args.c,v 1.79 2023/05/18 05:33:27 rillig Exp $");
+__RCSID("$NetBSD: args.c,v 1.80 2023/05/18 06:01:39 rillig Exp $");
/* Read options from profile files and from the command line. */
@@ -150,7 +150,7 @@ set_special_option(const char *arg, cons
}
if (arg[0] == 'P' || strcmp(arg, "npro") == 0)
- return true; /* see main_load_profiles */
+ return true; /* see load_profiles */
if (strncmp(arg, "cli", 3) == 0) {
arg_end = arg + 3;
@@ -299,15 +299,14 @@ load_profile(const char *fname, bool mus
}
void
-load_profiles(const char *profile_name)
+load_profile_files(const char *path)
{
- char fname[PATH_MAX];
-
- if (profile_name != NULL)
- load_profile(profile_name, true);
+ if (path != NULL)
+ load_profile(path, true);
else {
const char *home = getenv("HOME");
if (home != NULL) {
+ char fname[PATH_MAX];
snprintf(fname, sizeof(fname), "%s/.indent.pro", home);
load_profile(fname, false);
}
Index: src/usr.bin/indent/indent.c
diff -u src/usr.bin/indent/indent.c:1.293 src/usr.bin/indent/indent.c:1.294
--- src/usr.bin/indent/indent.c:1.293 Thu May 18 05:33:27 2023
+++ src/usr.bin/indent/indent.c Thu May 18 06:01:39 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: indent.c,v 1.293 2023/05/18 05:33:27 rillig Exp $ */
+/* $NetBSD: indent.c,v 1.294 2023/05/18 06:01:39 rillig Exp $ */
/*-
* SPDX-License-Identifier: BSD-4-Clause
@@ -38,7 +38,7 @@
*/
#include
-__RCSID("$NetBSD: indent.c,v 1.293 2023/05/18 05:33:27 rillig Exp $");
+__RCSID("$NetBSD: indent.c,v 1.294 2023/05/18 06:01:39 rillig Exp $");
#include
#include
@@ -99,6 +99,14 @@ static const char *backup_suffix = ".BAK
static char bakfile[MAXPATHLEN] = "";
+void *
+nonnull(void *p)
+{
+ if (p == NULL)
+ err(EXIT_FAILURE, NULL);
+ return p;
+}
+
static void
buf_expand(struct buffer *buf, size_t add_size)
{
@@ -169,7 +177,7 @@ ind_add(int ind, const char *s, size_t l
}
static void
-main_init_globals(void)
+init_globals(void)
{
ps.s_sym[0] = psym_stmt_list;
ps.prev_token = lsym_semicolon;
@@ -222,7 +230,7 @@ bakcopy(void)
}
static void
-main_load_profiles(int argc, char **argv)
+load_profiles(int argc, char **argv)
{
const char *profile_name = NULL;
@@ -234,11 +242,12 @@ main_load_profiles(int argc, char **argv
if (arg[0] == '-' && arg[1] == 'P' && arg[2] != '\0')
profile_name = arg + 2;
}
- load_profiles(profile_name);
+
+ load_profile_files(profile_name);
}
static void
-main_parse_command_line(int argc, char **argv)
+parse_command_line(int argc, char **argv)
{
for (int i = 1; i < argc; ++i) {
const char *arg = argv[i];
@@ -287,7 +296,7 @@ main_parse_command_line(int argc, char *
}
static void
-main_prepare_parsing(void)
+set_initial_indentation(void)
{
inp_read_line();
@@ -1008,7 +1017,7 @@ process_preprocessing(void)
}
static int
-main_loop(void)
+indent(void)
{
ps.di_stack[ps.decl_level = 0] = 0;
@@ -1166,17 +1175,9 @@ main_loop(void)
int
main(int argc, char **argv)
{
- main_init_globals();
- main_load_profiles(argc, argv);
- main_parse_command_line(argc, argv);
- main_prepare_parsing();
- return main_loop();
-}
-
-void *
-nonnull(void *p)
-{
- if (p == NULL)
- err(EXIT_FAILURE, NULL);
- return p;
+ init_globals();
+ load_profiles(argc, argv);
+ parse_command_line(argc, argv);
+ set_initial_indentation();
+ return indent();
}
Index: src/usr.bin/indent/indent.h
diff -u src/usr.bin/indent/indent.h:1.148 src/usr.bin/indent/indent.h:1.149
--- src/usr.bin/indent/indent.h:1.148 Thu May 18 04:23:03 2023
+++ src/usr.bin/indent/indent.h Thu May 18 06:01:39 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: indent.h,v 1.148 2023/05/18 04:23:03 rillig Exp $ */
+/* $NetBSD: indent.h,v 1.149 2023/05/18 06:01:39 rillig Exp $ */
/*-
* SPDX-License-Identifier: BSD-2-Clause-FreeBSD
@@ -435,7 +435,7 @@ void inp_read_line(void);
void parse(parser_symbol);
void process_comment(void);
void set_option(const char *, const char *);
-void load_profiles(const char *);
+void load_p
CVS commit: src/usr.bin/indent
Module Name:src Committed By: rillig Date: Thu May 18 06:01:39 UTC 2023 Modified Files: src/usr.bin/indent: args.c indent.c indent.h Log Message: indent: rename a few functions No functional change. To generate a diff of this commit: cvs rdiff -u -r1.79 -r1.80 src/usr.bin/indent/args.c cvs rdiff -u -r1.293 -r1.294 src/usr.bin/indent/indent.c cvs rdiff -u -r1.148 -r1.149 src/usr.bin/indent/indent.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src
Committed By: rillig
Date: Thu May 18 05:33:27 UTC 2023
Modified Files:
src/tests/usr.bin/indent: opt_ci.c
src/usr.bin/indent: args.c debug.c indent.c io.c lexi.c parse.c
pr_comment.c
Log Message:
indent: manually wrap overly long lines
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/tests/usr.bin/indent/opt_ci.c
cvs rdiff -u -r1.78 -r1.79 src/usr.bin/indent/args.c
cvs rdiff -u -r1.13 -r1.14 src/usr.bin/indent/debug.c
cvs rdiff -u -r1.292 -r1.293 src/usr.bin/indent/indent.c
cvs rdiff -u -r1.177 -r1.178 src/usr.bin/indent/io.c
cvs rdiff -u -r1.198 -r1.199 src/usr.bin/indent/lexi.c
cvs rdiff -u -r1.60 -r1.61 src/usr.bin/indent/parse.c
cvs rdiff -u -r1.145 -r1.146 src/usr.bin/indent/pr_comment.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_ci.c
diff -u src/tests/usr.bin/indent/opt_ci.c:1.8 src/tests/usr.bin/indent/opt_ci.c:1.9
--- src/tests/usr.bin/indent/opt_ci.c:1.8 Sun Apr 24 09:04:12 2022
+++ src/tests/usr.bin/indent/opt_ci.c Thu May 18 05:33:27 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: opt_ci.c,v 1.8 2022/04/24 09:04:12 rillig Exp $ */
+/* $NetBSD: opt_ci.c,v 1.9 2023/05/18 05:33:27 rillig Exp $ */
/*
* Tests for the option '-ci', which controls the indentation of continuation
@@ -234,3 +234,19 @@ function(void)
}
}
//indent end
+
+
+//indent input
+{
+ size_t last_word_len = com.len
+ - (size_t)(last_blank + 1);
+}
+//indent end
+
+//indent run -ldi0 -ci4
+{
+ size_t last_word_len = com.len
+/* $ FIXME: The '-' must be indented by 4 spaces. */
+ - (size_t)(last_blank + 1);
+}
+//indent end
Index: src/usr.bin/indent/args.c
diff -u src/usr.bin/indent/args.c:1.78 src/usr.bin/indent/args.c:1.79
--- src/usr.bin/indent/args.c:1.78 Thu May 18 04:23:03 2023
+++ src/usr.bin/indent/args.c Thu May 18 05:33:27 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: args.c,v 1.78 2023/05/18 04:23:03 rillig Exp $ */
+/* $NetBSD: args.c,v 1.79 2023/05/18 05:33:27 rillig Exp $ */
/*-
* SPDX-License-Identifier: BSD-4-Clause
@@ -38,7 +38,7 @@
*/
#include
-__RCSID("$NetBSD: args.c,v 1.78 2023/05/18 04:23:03 rillig Exp $");
+__RCSID("$NetBSD: args.c,v 1.79 2023/05/18 05:33:27 rillig Exp $");
/* Read options from profile files and from the command line. */
@@ -159,7 +159,8 @@ set_special_option(const char *arg, cons
char *end;
opt.case_indent = (float)strtod(arg_end, &end);
if (*end != '\0')
- errx(1, "%s: argument \"%s\" to option \"-%.*s\" must be numeric",
+ errx(1, "%s: argument \"%s\" to option \"-%.*s\" "
+ "must be numeric",
option_source, arg_end, (int)(arg_end - arg), arg);
return true;
}
@@ -218,29 +219,35 @@ set_option(const char *arg, const char *
if (set_special_option(arg, option_source))
return;
- for (p = pro + array_length(pro); p-- != pro;)
- if ((arg_arg = skip_over(arg, p->p_may_negate, p->p_name)) != NULL)
+ for (p = pro + array_length(pro); p-- != pro;) {
+ arg_arg = skip_over(arg, p->p_may_negate, p->p_name);
+ if (arg_arg != NULL)
goto found;
+ }
errx(1, "%s: unknown option \"-%s\"", option_source, arg);
found:
if (p->p_is_bool) {
if (arg_arg[0] != '\0')
- errx(1, "%s: unknown option \"-%s\"", option_source, arg);
+ errx(1, "%s: unknown option \"-%s\"",
+ option_source, arg);
- *(bool *)p->p_var = p->p_may_negate ? arg[0] != 'n' : p->p_bool_value;
+ *(bool *)p->p_var =
+ p->p_may_negate ? arg[0] != 'n' : p->p_bool_value;
return;
}
char *end;
long num = strtol(arg_arg, &end, 10);
if (*end != '\0')
- errx(1, "%s: argument \"%s\" to option \"-%s\" must be an integer",
+ errx(1, "%s: argument \"%s\" to option \"-%s\" "
+ "must be an integer",
option_source, arg_arg, p->p_name);
if (!(ch_isdigit(*arg_arg) && p->i_min <= num && num <= p->i_max))
errx(1,
- "%s: argument \"%s\" to option \"-%s\" must be between %d and %d",
+ "%s: argument \"%s\" to option \"-%s\" "
+ "must be between %d and %d",
option_source, arg_arg, p->p_name, p->i_min, p->i_max);
*(int *)p->p_var = (int)num;
@@ -263,15 +270,18 @@ load_profile(const char *fname, bool mus
int ch, comment_ch = -1;
while ((ch = getc(f)) != EOF) {
- if (ch == '*' && comment_ch == -1 && n > 0 && buf[n - 1] == '/') {
+ if (ch == '*' && comment_ch == -1
+ && n > 0 && buf[n - 1] == '/') {
n--;
comment_ch = '*';
} else if (comment_ch != -1) {
-comment_ch = ch == '/' && comment_ch == '*' ? -1 : ch;
+comment_ch = ch == '/' && comment_ch == '*'
+? -1 : ch;
} else if (ch_isspace((char)ch)) {
break;
} else if (n >= array_length(buf) - 2) {
-errx(1, "buffer overflow in %s, starting with '%.10s'",
+errx(1, "buffer overflow in %s, "
+"starting with '%.10s'",
fname, buf);
} else
buf[n++] = (char)ch;
Index: src/usr.bin/indent/d
CVS commit: src
Module Name:src Committed By: rillig Date: Thu May 18 05:33:27 UTC 2023 Modified Files: src/tests/usr.bin/indent: opt_ci.c src/usr.bin/indent: args.c debug.c indent.c io.c lexi.c parse.c pr_comment.c Log Message: indent: manually wrap overly long lines No functional change. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/tests/usr.bin/indent/opt_ci.c cvs rdiff -u -r1.78 -r1.79 src/usr.bin/indent/args.c cvs rdiff -u -r1.13 -r1.14 src/usr.bin/indent/debug.c cvs rdiff -u -r1.292 -r1.293 src/usr.bin/indent/indent.c cvs rdiff -u -r1.177 -r1.178 src/usr.bin/indent/io.c cvs rdiff -u -r1.198 -r1.199 src/usr.bin/indent/lexi.c cvs rdiff -u -r1.60 -r1.61 src/usr.bin/indent/parse.c cvs rdiff -u -r1.145 -r1.146 src/usr.bin/indent/pr_comment.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/indent
Module Name:src Committed By: rillig Date: Thu May 18 04:23:03 UTC 2023 Modified Files: src/usr.bin/indent: .indent.pro args.c debug.c indent.c indent.h io.c lexi.c parse.c pr_comment.c Log Message: indent: switch to standard code style Taken from share/misc/indent.pro. Indent does not wrap code to fit into the line width, it only does so for comments. The 'INDENT OFF' sections and too long lines will be addressed in a follow-up commit. No functional change. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/usr.bin/indent/.indent.pro cvs rdiff -u -r1.77 -r1.78 src/usr.bin/indent/args.c cvs rdiff -u -r1.12 -r1.13 src/usr.bin/indent/debug.c cvs rdiff -u -r1.291 -r1.292 src/usr.bin/indent/indent.c cvs rdiff -u -r1.147 -r1.148 src/usr.bin/indent/indent.h cvs rdiff -u -r1.176 -r1.177 src/usr.bin/indent/io.c cvs rdiff -u -r1.197 -r1.198 src/usr.bin/indent/lexi.c cvs rdiff -u -r1.59 -r1.60 src/usr.bin/indent/parse.c cvs rdiff -u -r1.144 -r1.145 src/usr.bin/indent/pr_comment.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/indent
Module Name:src
Committed By: rillig
Date: Thu May 18 03:38:34 UTC 2023
Modified Files:
src/usr.bin/indent: indent.c indent.h io.c
Log Message:
indent: remove unnecessary variable size optimization
Due to the enum that follows in the struct, the short variable was
padded to 4 bytes anyway.
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.290 -r1.291 src/usr.bin/indent/indent.c
cvs rdiff -u -r1.146 -r1.147 src/usr.bin/indent/indent.h
cvs rdiff -u -r1.175 -r1.176 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/usr.bin/indent/indent.c
diff -u src/usr.bin/indent/indent.c:1.290 src/usr.bin/indent/indent.c:1.291
--- src/usr.bin/indent/indent.c:1.290 Tue May 16 13:26:26 2023
+++ src/usr.bin/indent/indent.c Thu May 18 03:38:34 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: indent.c,v 1.290 2023/05/16 13:26:26 rillig Exp $ */
+/* $NetBSD: indent.c,v 1.291 2023/05/18 03:38:34 rillig Exp $ */
/*-
* SPDX-License-Identifier: BSD-4-Clause
@@ -38,7 +38,7 @@
*/
#include
-__RCSID("$NetBSD: indent.c,v 1.290 2023/05/16 13:26:26 rillig Exp $");
+__RCSID("$NetBSD: indent.c,v 1.291 2023/05/18 03:38:34 rillig Exp $");
#include
#include
@@ -477,7 +477,7 @@ process_lparen_or_lbracket(void)
|| ps.is_function_definition)
cast = cast_no;
-ps.paren[ps.nparen - 1].indent = (short)indent;
+ps.paren[ps.nparen - 1].indent = indent;
ps.paren[ps.nparen - 1].cast = cast;
debug_println("paren_indents[%d] is now %s%d",
ps.nparen - 1, paren_level_cast_name[cast], indent);
Index: src/usr.bin/indent/indent.h
diff -u src/usr.bin/indent/indent.h:1.146 src/usr.bin/indent/indent.h:1.147
--- src/usr.bin/indent/indent.h:1.146 Tue May 16 13:26:26 2023
+++ src/usr.bin/indent/indent.h Thu May 18 03:38:34 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: indent.h,v 1.146 2023/05/16 13:26:26 rillig Exp $ */
+/* $NetBSD: indent.h,v 1.147 2023/05/18 03:38:34 rillig Exp $ */
/*-
* SPDX-License-Identifier: BSD-2-Clause-FreeBSD
@@ -247,7 +247,7 @@ extern enum indent_enabled {
/* Properties of each level of parentheses or brackets. */
typedef struct paren_level_props {
-short indent; /* indentation of the operand/argument,
+int indent; /* indentation of the operand/argument,
* relative to the enclosing statement; if
* negative, reflected at -1 */
enum paren_level_cast {
Index: src/usr.bin/indent/io.c
diff -u src/usr.bin/indent/io.c:1.175 src/usr.bin/indent/io.c:1.176
--- src/usr.bin/indent/io.c:1.175 Tue May 16 13:26:26 2023
+++ src/usr.bin/indent/io.c Thu May 18 03:38:34 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: io.c,v 1.175 2023/05/16 13:26:26 rillig Exp $ */
+/* $NetBSD: io.c,v 1.176 2023/05/18 03:38:34 rillig Exp $ */
/*-
* SPDX-License-Identifier: BSD-4-Clause
@@ -38,7 +38,7 @@
*/
#include
-__RCSID("$NetBSD: io.c,v 1.175 2023/05/16 13:26:26 rillig Exp $");
+__RCSID("$NetBSD: io.c,v 1.176 2023/05/18 03:38:34 rillig Exp $");
#include
#include
@@ -152,7 +152,7 @@ output_line_code(int ind)
for (int i = 0; i < ps.nparen; i++) {
int paren_ind = ps.paren[i].indent;
if (paren_ind >= 0) {
- ps.paren[i].indent = (short)(-1 - (paren_ind + target_ind));
+ ps.paren[i].indent = -1 - (paren_ind + target_ind);
debug_println(
"setting paren_indents[%d] from %d to %d for column %d",
i, paren_ind, ps.paren[i].indent, target_ind + 1);
CVS commit: src/usr.bin/indent
Module Name:src Committed By: rillig Date: Thu May 18 03:38:34 UTC 2023 Modified Files: src/usr.bin/indent: indent.c indent.h io.c Log Message: indent: remove unnecessary variable size optimization Due to the enum that follows in the struct, the short variable was padded to 4 bytes anyway. No functional change. To generate a diff of this commit: cvs rdiff -u -r1.290 -r1.291 src/usr.bin/indent/indent.c cvs rdiff -u -r1.146 -r1.147 src/usr.bin/indent/indent.h cvs rdiff -u -r1.175 -r1.176 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.
CVS commit: src/distrib/sets/lists/base
Module Name:src Committed By: christos Date: Thu May 18 00:28:37 UTC 2023 Modified Files: src/distrib/sets/lists/base: ad.riscv Log Message: add compat OpenSSL To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/distrib/sets/lists/base/ad.riscv Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/ad.riscv diff -u src/distrib/sets/lists/base/ad.riscv:1.23 src/distrib/sets/lists/base/ad.riscv:1.24 --- src/distrib/sets/lists/base/ad.riscv:1.23 Tue Jan 11 14:27:13 2022 +++ src/distrib/sets/lists/base/ad.riscv Wed May 17 20:28:37 2023 @@ -1,6 +1,10 @@ -# $NetBSD: ad.riscv,v 1.23 2022/01/11 19:27:13 martin Exp $ +# $NetBSD: ad.riscv,v 1.24 2023/05/18 00:28:37 christos Exp $ ./libexec/ld.elf_so-rv32 base-compat-shlib compat,pic,arch64 ./usr/libexec/ld.elf_so-rv32 base-compat-shlib compat,pic,arch64 +./usr/lib/r32/opensslbase-crypto-usr compat +./usr/lib/r32/openssl/engines base-crypto-usr compat +./usr/lib/r32/openssl/modules base-crypto-usr compat +./usr/lib/r32/openssl/modules/legacy.so base-crypto-usr compat,pic,openssl=30 ./usr/mdec/bootriscv64.efi base-sysutil-bin uefi,arch64 ./usr/share/sysinst/catalog/sysinstmsgs.de base-util-share ./usr/share/sysinst/catalog/sysinstmsgs.es base-util-share
CVS commit: src/distrib/sets/lists/base
Module Name:src Committed By: christos Date: Thu May 18 00:28:37 UTC 2023 Modified Files: src/distrib/sets/lists/base: ad.riscv Log Message: add compat OpenSSL To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/distrib/sets/lists/base/ad.riscv Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/crypto/external/bsd/openssl/lib/libcrypto/arch/riscv32
Module Name:src Committed By: christos Date: Thu May 18 00:27:08 UTC 2023 Added Files: src/crypto/external/bsd/openssl/lib/libcrypto/arch/riscv32: crypto.inc ec.inc Log Message: fix riscv32 To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 \ src/crypto/external/bsd/openssl/lib/libcrypto/arch/riscv32/crypto.inc \ src/crypto/external/bsd/openssl/lib/libcrypto/arch/riscv32/ec.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/crypto/external/bsd/openssl/lib/libcrypto/arch/riscv32
Module Name:src Committed By: christos Date: Thu May 18 00:27:08 UTC 2023 Added Files: src/crypto/external/bsd/openssl/lib/libcrypto/arch/riscv32: crypto.inc ec.inc Log Message: fix riscv32 To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 \ src/crypto/external/bsd/openssl/lib/libcrypto/arch/riscv32/crypto.inc \ src/crypto/external/bsd/openssl/lib/libcrypto/arch/riscv32/ec.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/riscv32/crypto.inc diff -u /dev/null src/crypto/external/bsd/openssl/lib/libcrypto/arch/riscv32/crypto.inc:1.1 --- /dev/null Wed May 17 20:27:08 2023 +++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/riscv32/crypto.inc Wed May 17 20:27:08 2023 @@ -0,0 +1,4 @@ + +COPTS.threads_pthread.c += -DBROKEN_CLANG_ATOMICS # no atomic 64 bit ops + +.include "../../crypto.inc" Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/riscv32/ec.inc diff -u /dev/null src/crypto/external/bsd/openssl/lib/libcrypto/arch/riscv32/ec.inc:1.1 --- /dev/null Wed May 17 20:27:08 2023 +++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/riscv32/ec.inc Wed May 17 20:27:08 2023 @@ -0,0 +1,3 @@ +ECCPPFLAGS+= -DOPENSSL_NO_EC_NISTP_64_GCC_128 + +.include "../../ec.inc"
CVS commit: src/distrib/sets/lists/base
Module Name:src Committed By: christos Date: Thu May 18 00:24:22 UTC 2023 Modified Files: src/distrib/sets/lists/base: ad.powerpc Log Message: mark things compat To generate a diff of this commit: cvs rdiff -u -r1.41 -r1.42 src/distrib/sets/lists/base/ad.powerpc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/ad.powerpc diff -u src/distrib/sets/lists/base/ad.powerpc:1.41 src/distrib/sets/lists/base/ad.powerpc:1.42 --- src/distrib/sets/lists/base/ad.powerpc:1.41 Tue May 16 15:25:06 2023 +++ src/distrib/sets/lists/base/ad.powerpc Wed May 17 20:24:22 2023 @@ -1,8 +1,8 @@ -# $NetBSD: ad.powerpc,v 1.41 2023/05/16 19:25:06 christos Exp $ +# $NetBSD: ad.powerpc,v 1.42 2023/05/18 00:24:22 christos Exp $ ./libexec/ld.elf_so-powerpc base-sysutil-bin compat,pic ./usr/bin/fdformatbase-util-bin ./usr/libexec/ld.elf_so-powerpc base-sysutil-bin compat,pic -./usr/lib/powerpc/openssl base-crypto-usr -./usr/lib/powerpc/openssl/engines base-crypto-usr -./usr/lib/powerpc/openssl/modules base-crypto-usr +./usr/lib/powerpc/openssl base-crypto-usr compat +./usr/lib/powerpc/openssl/engines base-crypto-usr compat +./usr/lib/powerpc/openssl/modules base-crypto-usr compat ./usr/lib/powerpc/openssl/modules/legacy.so base-crypto-usr compat,pic,openssl=30
CVS commit: src/distrib/sets/lists/base
Module Name:src Committed By: christos Date: Thu May 18 00:24:22 UTC 2023 Modified Files: src/distrib/sets/lists/base: ad.powerpc Log Message: mark things compat To generate a diff of this commit: cvs rdiff -u -r1.41 -r1.42 src/distrib/sets/lists/base/ad.powerpc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/crypto
Module Name:src Committed By: christos Date: Wed May 17 19:10:04 UTC 2023 Modified Files: src/crypto: Makefile.openssl Log Message: enable (and disable) warnings centrally To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/crypto/Makefile.openssl Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/crypto
Module Name:src
Committed By: christos
Date: Wed May 17 19:10:04 UTC 2023
Modified Files:
src/crypto: Makefile.openssl
Log Message:
enable (and disable) warnings centrally
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/crypto/Makefile.openssl
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/Makefile.openssl
diff -u src/crypto/Makefile.openssl:1.13 src/crypto/Makefile.openssl:1.14
--- src/crypto/Makefile.openssl:1.13 Sun May 7 12:24:28 2023
+++ src/crypto/Makefile.openssl Wed May 17 15:10:04 2023
@@ -1,9 +1,14 @@
-# $NetBSD: Makefile.openssl,v 1.13 2023/05/07 16:24:28 christos Exp $
+# $NetBSD: Makefile.openssl,v 1.14 2023/05/17 19:10:04 christos Exp $
.ifndef _MAKEFILE_OPENSSL_INCLUDED
_MAKEFILE_OPENSSL_INCLUDED=1
.include
+WARNS=3
+# would require changing a lot of code
+COPTS+= -Wno-error=cast-qual -Wno-error=discarded-qualifiers
+COPTS+= -Wno-error=missing-field-initializers -Wno-error=char-subscripts
+
.if ${HAVE_OPENSSL} <= 11
OSSL_ENGINESDIR=/usr/lib/openssl
CVS commit: src/crypto/external/bsd/openssl/lib
Module Name:src Committed By: christos Date: Wed May 17 19:09:42 UTC 2023 Modified Files: src/crypto/external/bsd/openssl/lib/libapps: Makefile src/crypto/external/bsd/openssl/lib/libcommon: Makefile src/crypto/external/bsd/openssl/lib/libcrypto: Makefile src/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64: ec.inc src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm: ec.inc src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386: ec.inc src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc: ec.inc src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc64: ec.inc src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc: ec.inc src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64: ec.inc src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64: ec.inc src/crypto/external/bsd/openssl/lib/libdefault: Makefile src/crypto/external/bsd/openssl/lib/liblegacy: Makefile src/crypto/external/bsd/openssl/lib/libssl: Makefile Log Message: add missing assembly stub macro, remove WARNS=0 To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/crypto/external/bsd/openssl/lib/libapps/Makefile cvs rdiff -u -r1.2 -r1.3 \ src/crypto/external/bsd/openssl/lib/libcommon/Makefile cvs rdiff -u -r1.27 -r1.28 \ src/crypto/external/bsd/openssl/lib/libcrypto/Makefile cvs rdiff -u -r1.2 -r1.3 \ src/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/ec.inc cvs rdiff -u -r1.2 -r1.3 \ src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ec.inc cvs rdiff -u -r1.3 -r1.4 \ src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/ec.inc cvs rdiff -u -r1.1 -r1.2 \ src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/ec.inc cvs rdiff -u -r1.3 -r1.4 \ src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc64/ec.inc cvs rdiff -u -r1.7 -r1.8 \ src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/ec.inc cvs rdiff -u -r1.1 -r1.2 \ src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/ec.inc cvs rdiff -u -r1.3 -r1.4 \ src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/ec.inc cvs rdiff -u -r1.3 -r1.4 \ src/crypto/external/bsd/openssl/lib/libdefault/Makefile cvs rdiff -u -r1.3 -r1.4 \ src/crypto/external/bsd/openssl/lib/liblegacy/Makefile cvs rdiff -u -r1.13 -r1.14 \ src/crypto/external/bsd/openssl/lib/libssl/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/openssl/lib/libapps/Makefile diff -u src/crypto/external/bsd/openssl/lib/libapps/Makefile:1.1 src/crypto/external/bsd/openssl/lib/libapps/Makefile:1.2 --- src/crypto/external/bsd/openssl/lib/libapps/Makefile:1.1 Sun May 7 12:22:10 2023 +++ src/crypto/external/bsd/openssl/lib/libapps/Makefile Wed May 17 15:09:41 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2023/05/07 16:22:10 christos Exp $ +# $NetBSD: Makefile,v 1.2 2023/05/17 19:09:41 christos Exp $ # RCSid: # Id: Makefile,v 1.33 1998/11/11 11:53:53 sjg Exp @@ -25,8 +25,6 @@ USE_FIPS= no .include .include -# XXX: There's a bit of work to do before we can enable warnings. -WARNS=0 CWARNFLAGS.clang+= -Wno-empty-body -Wno-unused-value -Wno-parentheses -Wno-implicit-int-float-conversion # XXX: This warning seems to trigger incorrectly CWARNFLAGS.clang+= -Wno-atomic-alignment Index: src/crypto/external/bsd/openssl/lib/libcommon/Makefile diff -u src/crypto/external/bsd/openssl/lib/libcommon/Makefile:1.2 src/crypto/external/bsd/openssl/lib/libcommon/Makefile:1.3 --- src/crypto/external/bsd/openssl/lib/libcommon/Makefile:1.2 Tue May 16 15:06:09 2023 +++ src/crypto/external/bsd/openssl/lib/libcommon/Makefile Wed May 17 15:09:41 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2023/05/16 19:06:09 christos Exp $ +# $NetBSD: Makefile,v 1.3 2023/05/17 19:09:41 christos Exp $ # RCSid: # Id: Makefile,v 1.33 1998/11/11 11:53:53 sjg Exp @@ -25,8 +25,6 @@ USE_FIPS= no .include .include -# XXX: There's a bit of work to do before we can enable warnings. -WARNS=0 CWARNFLAGS.clang+= -Wno-empty-body -Wno-unused-value -Wno-parentheses -Wno-implicit-int-float-conversion # XXX: This warning seems to trigger incorrectly CWARNFLAGS.clang+= -Wno-atomic-alignment Index: src/crypto/external/bsd/openssl/lib/libcrypto/Makefile diff -u src/crypto/external/bsd/openssl/lib/libcrypto/Makefile:1.27 src/crypto/external/bsd/openssl/lib/libcrypto/Makefile:1.28 --- src/crypto/external/bsd/openssl/lib/libcrypto/Makefile:1.27 Tue May 9 15:22:07 2023 +++ src/crypto/external/bsd/openssl/lib/libcrypto/Makefile Wed May 17 15:09:41 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2023/05/09 19:22:07 christos Exp $ +# $NetBSD: Makefile,v 1.28 2023/05/17 19:09:41 christos Exp $ # RCSid: # Id: Makefile,v 1.33 1998/11/11 11:53:53 sjg Exp @@ -25,8 +25,8 @@ USE_FIPS= no .include .include -# XXX: There'
CVS commit: src/crypto/external/bsd/openssl/lib
Module Name:src Committed By: christos Date: Wed May 17 19:09:42 UTC 2023 Modified Files: src/crypto/external/bsd/openssl/lib/libapps: Makefile src/crypto/external/bsd/openssl/lib/libcommon: Makefile src/crypto/external/bsd/openssl/lib/libcrypto: Makefile src/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64: ec.inc src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm: ec.inc src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386: ec.inc src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc: ec.inc src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc64: ec.inc src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc: ec.inc src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64: ec.inc src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64: ec.inc src/crypto/external/bsd/openssl/lib/libdefault: Makefile src/crypto/external/bsd/openssl/lib/liblegacy: Makefile src/crypto/external/bsd/openssl/lib/libssl: Makefile Log Message: add missing assembly stub macro, remove WARNS=0 To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/crypto/external/bsd/openssl/lib/libapps/Makefile cvs rdiff -u -r1.2 -r1.3 \ src/crypto/external/bsd/openssl/lib/libcommon/Makefile cvs rdiff -u -r1.27 -r1.28 \ src/crypto/external/bsd/openssl/lib/libcrypto/Makefile cvs rdiff -u -r1.2 -r1.3 \ src/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/ec.inc cvs rdiff -u -r1.2 -r1.3 \ src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ec.inc cvs rdiff -u -r1.3 -r1.4 \ src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/ec.inc cvs rdiff -u -r1.1 -r1.2 \ src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/ec.inc cvs rdiff -u -r1.3 -r1.4 \ src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc64/ec.inc cvs rdiff -u -r1.7 -r1.8 \ src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/ec.inc cvs rdiff -u -r1.1 -r1.2 \ src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/ec.inc cvs rdiff -u -r1.3 -r1.4 \ src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/ec.inc cvs rdiff -u -r1.3 -r1.4 \ src/crypto/external/bsd/openssl/lib/libdefault/Makefile cvs rdiff -u -r1.3 -r1.4 \ src/crypto/external/bsd/openssl/lib/liblegacy/Makefile cvs rdiff -u -r1.13 -r1.14 \ src/crypto/external/bsd/openssl/lib/libssl/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci
Module Name:src Committed By: tsutsui Date: Wed May 17 18:20:30 UTC 2023 Modified Files: src/sys/dev/pci: pcscp.c Log Message: Update URL of the technical manual. To generate a diff of this commit: cvs rdiff -u -r1.49 -r1.50 src/sys/dev/pci/pcscp.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/pcscp.c diff -u src/sys/dev/pci/pcscp.c:1.49 src/sys/dev/pci/pcscp.c:1.50 --- src/sys/dev/pci/pcscp.c:1.49 Sun Dec 9 11:14:02 2018 +++ src/sys/dev/pci/pcscp.c Wed May 17 18:20:30 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: pcscp.c,v 1.49 2018/12/09 11:14:02 jdolecek Exp $ */ +/* $NetBSD: pcscp.c,v 1.50 2023/05/17 18:20:30 tsutsui Exp $ */ /*- * Copyright (c) 1997, 1998, 1999 The NetBSD Foundation, Inc. @@ -35,11 +35,11 @@ * written by Izumi Tsutsui * * Technical manual available at - * http://support.amd.com/TechDocs/19113.pdf + * https://www.amd.com/system/files/TechDocs/19113.pdf */ #include -__KERNEL_RCSID(0, "$NetBSD: pcscp.c,v 1.49 2018/12/09 11:14:02 jdolecek Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pcscp.c,v 1.50 2023/05/17 18:20:30 tsutsui Exp $"); #include #include
CVS commit: src/sys/dev/pci
Module Name:src Committed By: tsutsui Date: Wed May 17 18:20:30 UTC 2023 Modified Files: src/sys/dev/pci: pcscp.c Log Message: Update URL of the technical manual. To generate a diff of this commit: cvs rdiff -u -r1.49 -r1.50 src/sys/dev/pci/pcscp.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/indent
Module Name:src
Committed By: rillig
Date: Wed May 17 18:03:25 UTC 2023
Modified Files:
src/usr.bin/indent: debug.c
Log Message:
indent: fix indentation in preprocessor line
No binary change.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/usr.bin/indent/debug.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/indent/debug.c
diff -u src/usr.bin/indent/debug.c:1.11 src/usr.bin/indent/debug.c:1.12
--- src/usr.bin/indent/debug.c:1.11 Tue May 16 12:46:43 2023
+++ src/usr.bin/indent/debug.c Wed May 17 18:03:25 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: debug.c,v 1.11 2023/05/16 12:46:43 rillig Exp $ */
+/* $NetBSD: debug.c,v 1.12 2023/05/17 18:03:25 rillig Exp $ */
/*-
* Copyright (c) 2023 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__RCSID("$NetBSD: debug.c,v 1.11 2023/05/16 12:46:43 rillig Exp $");
+__RCSID("$NetBSD: debug.c,v 1.12 2023/05/17 18:03:25 rillig Exp $");
#include
@@ -188,7 +188,7 @@ debug_buffers(void)
}
#define debug_ps_bool(name) \
-if (ps.name != prev_ps.name) \
+ if (ps.name != prev_ps.name) \
debug_println("[%c] -> [%c] ps." #name, \
prev_ps.name ? 'x' : ' ', ps.name ? 'x' : ' '); \
else if (debug_full_parser_state) \
CVS commit: src/usr.bin/indent
Module Name:src Committed By: rillig Date: Wed May 17 18:03:25 UTC 2023 Modified Files: src/usr.bin/indent: debug.c Log Message: indent: fix indentation in preprocessor line No binary change. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/usr.bin/indent/debug.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/sets/lists/base
Module Name:src Committed By: christos Date: Wed May 17 15:01:17 UTC 2023 Modified Files: src/distrib/sets/lists/base: ad.mips Log Message: fix mips OpenSSL-3.x compat To generate a diff of this commit: cvs rdiff -u -r1.83 -r1.84 src/distrib/sets/lists/base/ad.mips Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/sets/lists/base
Module Name:src Committed By: christos Date: Wed May 17 15:01:17 UTC 2023 Modified Files: src/distrib/sets/lists/base: ad.mips Log Message: fix mips OpenSSL-3.x compat To generate a diff of this commit: cvs rdiff -u -r1.83 -r1.84 src/distrib/sets/lists/base/ad.mips Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/ad.mips diff -u src/distrib/sets/lists/base/ad.mips:1.83 src/distrib/sets/lists/base/ad.mips:1.84 --- src/distrib/sets/lists/base/ad.mips:1.83 Sun Apr 25 18:30:29 2021 +++ src/distrib/sets/lists/base/ad.mips Wed May 17 11:01:17 2023 @@ -1,4 +1,4 @@ -# $NetBSD: ad.mips,v 1.83 2021/04/25 22:30:29 christos Exp $ +# $NetBSD: ad.mips,v 1.84 2023/05/17 15:01:17 christos Exp $ ./lib/libc_fp.sobase-sys-shlib dynamicroot,softfloat,arch64 ./lib/libc_fp.so.0base-sys-shlib dynamicroot,softfloat,arch64 ./lib/libc_fp.so.0.0base-sys-shlib dynamicroot,softfloat,arch64 @@ -8,6 +8,10 @@ ./usr/lib/64/libc_fp.sobase-compat-shlib compat,pic,arch64,!machine_arch=mipsn64el,!machine_arch=mipsn64eb ./usr/lib/64/libc_fp.so.0 base-compat-shlib compat,pic,arch64,!machine_arch=mipsn64el,!machine_arch=mipsn64eb ./usr/lib/64/libc_fp.so.0.0 base-compat-shlib compat,pic,arch64,!machine_arch=mipsn64el,!machine_arch=mipsn64eb +./usr/lib/64/openssl base-compat-shlib compat,pic,arch64,!machine_arch=mipsn64el,!machine_arch=mipsn64eb +./usr/lib/64/openssl/engines base-compat-shlib compat,pic,arch64,!machine_arch=mipsn64el,!machine_arch=mipsn64eb +./usr/lib/64/openssl/modules base-compat-shlib compat,pic,arch64,!machine_arch=mipsn64el,!machine_arch=mipsn64eb +./usr/lib/64/openssl/modules/legacy.so base-compat-shlib compat,pic,arch64,!machine_arch=mipsn64el,!machine_arch=mipsn64eb ./usr/lib/libc_fp.sobase-sys-shlib softfloat,arch64 ./usr/lib/libc_fp.so.0base-sys-shlib softfloat,arch64 ./usr/lib/libc_fp.so.0.0 base-sys-shlib softfloat,arch64 @@ -18,9 +22,17 @@ ./usr/lib/o32/libgomp.so.2.0 base-compat-shlib compat,pic,arch64,gcc=9 ./usr/lib/o32/libgomp.so.2.0 base-compat-shlib compat,pic,arch64,gcc=10,obsolete ./usr/lib/o32/libgomp.so.2.1 base-compat-shlib compat,pic,arch64,gcc=10 +./usr/lib/o32/opensslbase-crypto-usr compat,pic,arch64 +./usr/lib/o32/openssl/engines base-crypto-usr compat,pic,arch64 +./usr/lib/o32/openssl/modules base-crypto-usr compat,pic,arch64 +./usr/lib/o32/openssl/modules/legacy.so base-crypto-usr compat,pic,arch64 ./usr/lib/n32/libc_fp.so base-compat-shlib compat,pic,arch64,!machine_arch=mips64el,!machine_arch=mips64eb ./usr/lib/n32/libc_fp.so.0 base-compat-shlib compat,pic,arch64,!machine_arch=mips64el,!machine_arch=mips64eb ./usr/lib/n32/libc_fp.so.0.0 base-compat-shlib compat,pic,arch64,!machine_arch=mips64el,!machine_arch=mips64eb +./usr/lib/n32/opensslbase-crypto-usr compat,pic,arch64,!machine_arch=mips64el,!machine_arch=mips64eb +./usr/lib/n32/openssl/engines base-crypto-usr compat,pic,arch64,!machine_arch=mips64el,!machine_arch=mips64eb +./usr/lib/n32/openssl/modules base-crypto-usr compat,pic,arch64,!machine_arch=mips64el,!machine_arch=mips64eb +./usr/lib/n32/openssl/modules/legacy.so base-crypto-usr compat,pic,arch64,!machine_arch=mips64el,!machine_arch=mips64eb ./usr/libexec/ld.elf_so-64 base-compat-shlib compat,pic,arch64,!machine_arch=mipsn64el,!machine_arch=mipsn64eb ./usr/libexec/ld.elf_so-n32 base-compat-shlib compat,pic,arch64,!machine_arch=mips64el,!machine_arch=mips64eb ./usr/libexec/ld.elf_so-o32 base-sysutil-bin compat,pic,arch64
CVS commit: src/sbin/newfs_ext2fs
Module Name:src
Committed By: tsutsui
Date: Wed May 17 09:54:59 UTC 2023
Modified Files:
src/sbin/newfs_ext2fs: mke2fs.c newfs_ext2fs.8
Log Message:
Use https for Ext2 documentation URLs.
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sbin/newfs_ext2fs/mke2fs.c
cvs rdiff -u -r1.14 -r1.15 src/sbin/newfs_ext2fs/newfs_ext2fs.8
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/newfs_ext2fs/mke2fs.c
diff -u src/sbin/newfs_ext2fs/mke2fs.c:1.25 src/sbin/newfs_ext2fs/mke2fs.c:1.26
--- src/sbin/newfs_ext2fs/mke2fs.c:1.25 Mon Sep 5 10:44:36 2016
+++ src/sbin/newfs_ext2fs/mke2fs.c Wed May 17 09:54:59 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: mke2fs.c,v 1.25 2016/09/05 10:44:36 martin Exp $ */
+/* $NetBSD: mke2fs.c,v 1.26 2023/05/17 09:54:59 tsutsui Exp $ */
/*-
* Copyright (c) 2007 Izumi Tsutsui. All rights reserved.
@@ -88,11 +88,11 @@
* Reference:
* - All NetBSD sources under src/sys/ufs/ext2fs and src/sbin/fsck_ext2fs
* - Ext2fs Home Page
- * http://e2fsprogs.sourceforge.net/ext2.html
+ * https://e2fsprogs.sourceforge.net/ext2.html
* - Design and Implementation of the Second Extended Filesystem
- * http://e2fsprogs.sourceforge.net/ext2intro.html
+ * https://e2fsprogs.sourceforge.net/ext2intro.html
* - Linux Documentation "The Second Extended Filesystem"
- * http://www.kernel.org/doc/Documentation/filesystems/ext2.txt
+ * https://www.kernel.org/doc/Documentation/filesystems/ext2.txt
*/
#include
@@ -100,7 +100,7 @@
#if 0
static char sccsid[] = "@(#)mkfs.c 8.11 (Berkeley) 5/3/95";
#else
-__RCSID("$NetBSD: mke2fs.c,v 1.25 2016/09/05 10:44:36 martin Exp $");
+__RCSID("$NetBSD: mke2fs.c,v 1.26 2023/05/17 09:54:59 tsutsui Exp $");
#endif
#endif /* not lint */
Index: src/sbin/newfs_ext2fs/newfs_ext2fs.8
diff -u src/sbin/newfs_ext2fs/newfs_ext2fs.8:1.14 src/sbin/newfs_ext2fs/newfs_ext2fs.8:1.15
--- src/sbin/newfs_ext2fs/newfs_ext2fs.8:1.14 Sat Apr 13 19:29:27 2019
+++ src/sbin/newfs_ext2fs/newfs_ext2fs.8 Wed May 17 09:54:59 2023
@@ -1,4 +1,4 @@
-.\" $NetBSD: newfs_ext2fs.8,v 1.14 2019/04/13 19:29:27 maya Exp $
+.\" $NetBSD: newfs_ext2fs.8,v 1.15 2023/05/17 09:54:59 tsutsui Exp $
.\"
.\" Copyright (c) 1983, 1987, 1991, 1993, 1994
.\" The Regents of the University of California. All rights reserved.
@@ -281,7 +281,7 @@ references the same partition as the min
.%A Stephen Tweedie
.%T "Design and Implementation of the Second Extended Filesystem"
.%J "The Proceedings of the First Dutch International Symposium on Linux"
-.%U http://e2fsprogs.sourceforge.net/ext2intro.html
+.%U https://e2fsprogs.sourceforge.net/ext2intro.html
.Re
.Sh HISTORY
The
CVS commit: src/sbin/newfs_ext2fs
Module Name:src Committed By: tsutsui Date: Wed May 17 09:54:59 UTC 2023 Modified Files: src/sbin/newfs_ext2fs: mke2fs.c newfs_ext2fs.8 Log Message: Use https for Ext2 documentation URLs. To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 src/sbin/newfs_ext2fs/mke2fs.c cvs rdiff -u -r1.14 -r1.15 src/sbin/newfs_ext2fs/newfs_ext2fs.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
