CVS commit: src/usr.bin/man
Module Name:src Committed By: gutteridge Date: Sat Jun 18 02:19:07 UTC 2022 Modified Files: src/usr.bin/man: man.conf.5 Log Message: man.conf.5: add details about the machine line and search order Also, tweak some grammar, style, and markup while here. To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/usr.bin/man/man.conf.5 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/man/man.conf.5 diff -u src/usr.bin/man/man.conf.5:1.27 src/usr.bin/man/man.conf.5:1.28 --- src/usr.bin/man/man.conf.5:1.27 Thu Jun 16 15:11:43 2016 +++ src/usr.bin/man/man.conf.5 Sat Jun 18 02:19:07 2022 @@ -1,4 +1,4 @@ -.\" $NetBSD: man.conf.5,v 1.27 2016/06/16 15:11:43 abhinav Exp $ +.\" $NetBSD: man.conf.5,v 1.28 2022/06/18 02:19:07 gutteridge Exp $ .\" .\" Copyright (c) 1989, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\" .\" @(#)man.conf.5 8.5 (Berkeley) 1/2/94 .\" -.Dd June 16, 2016 +.Dd June 18, 2022 .Dt MAN.CONF 5 .Os .Sh NAME @@ -45,8 +45,9 @@ file contains the default configuration .Xr catman 8 , and .Xr makemandb 8 -to find manual pages and information about manual pages (e.g. the -whatis database). +to find manual pages and information about manual pages (e.g., the +.Xr whatis 1 +database). .Pp Manual pages are located by searching an ordered set of directories called the @@ -106,8 +107,9 @@ be replaced by the name of the file whic Used by .Xr catman 8 to determine how to crunch formatted pages -which originally were compressed man pages: The first field lists a suffix -which indicates what kind of compression were used to compress the man page. +which originally were compressed man pages. +The first field lists a suffix which indicates what kind of compression was +used to compress the man page. The rest of the line must be a shell command line, used to compress the formatted pages. There should be exactly one occurrence of the string @@ -159,13 +161,15 @@ Contains the version of the configuratio .It _ Ns Aq machine Defines additional paths to be searched for the particular .Dv machine -whose literal value is taken from +hardware name whose literal value is taken from .Xr uname 1 .Fl m . For example on an .Dv amd64 , .Dv _amd64 -is used. +is used, where +.Dq x86 +is commonly supplied as an alternate machine path to also search. .El .Pp Section configuration lines in @@ -184,7 +188,7 @@ Section keywords must not start with the character. .Pp A section path may contain either a list of absolute directories or -a list of or relative directories (but not both). +a list of relative directories (but not both). Relative directory paths are treated as a list of subdirectories that are appended to the current man path directory being searched. Section configuration lines with absolute directory paths (starting with @@ -206,7 +210,8 @@ In addition to the above rules, the .Xr man 1 command also always checks in each directory that it searches for a subdirectory with the same name as the current machine type. -If the machine-specific directory is found, it is also searched. +If a machine-specific subdirectory is found, it is also searched +before the parent directory is. This allows the manual to contain machine-specific man pages. Note that the machine subdirectory does not need to be specified in the
CVS commit: src/usr.bin/man
Module Name:src Committed By: gutteridge Date: Sat Jun 18 02:19:07 UTC 2022 Modified Files: src/usr.bin/man: man.conf.5 Log Message: man.conf.5: add details about the machine line and search order Also, tweak some grammar, style, and markup while here. To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/usr.bin/man/man.conf.5 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/man
Module Name:src Committed By: gutteridge Date: Sat Jun 18 02:14:39 UTC 2022 Modified Files: src/usr.bin/man: man.1 Log Message: man.1: add a small note about alternate machine name searches To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.30 src/usr.bin/man/man.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/man
Module Name:src Committed By: gutteridge Date: Sat Jun 18 02:14:39 UTC 2022 Modified Files: src/usr.bin/man: man.1 Log Message: man.1: add a small note about alternate machine name searches To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.30 src/usr.bin/man/man.1 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/man/man.1 diff -u src/usr.bin/man/man.1:1.29 src/usr.bin/man/man.1:1.30 --- src/usr.bin/man/man.1:1.29 Thu Jun 16 15:10:58 2016 +++ src/usr.bin/man/man.1 Sat Jun 18 02:14:39 2022 @@ -1,4 +1,4 @@ -.\" $NetBSD: man.1,v 1.29 2016/06/16 15:10:58 abhinav Exp $ +.\" $NetBSD: man.1,v 1.30 2022/06/18 02:14:39 gutteridge Exp $ .\" .\" Copyright (c) 1989, 1990, 1993 .\" The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\" .\" @(#)man.1 8.2 (Berkeley) 1/2/94 .\" -.Dd June 16, 2016 +.Dd June 18, 2022 .Dt MAN 1 .Os .Sh NAME @@ -213,7 +213,7 @@ As some man pages are intended only for searches any subdirectories, with the same name as the current architecture, in every directory which it searches. -Machine specific areas are checked before general areas. +Machine-specific areas are checked before general areas. The current machine type may be overridden by setting the environment variable .Ev MACHINE @@ -222,6 +222,12 @@ Machine-specific man pages may also be r prepending the relevant subdirectory name to the page name, separated by .Ql Pa \&/ . +(See also the +.Dq _ Ns Aq machine +line in the +.Xr man.conf 5 +configuration file, which defines additional supplemental paths related to a +specific machine type.) .It Ev MANPATH The standard search path used by .Nm @@ -235,7 +241,7 @@ The subdirectories to be searched as wel is specified by the .Dq _subdir line in the -.Nm +.Xr man.conf 5 configuration file. .It Ev PAGER The pagination command used for writing the output.
Re: CVS commit: src/usr.sbin/sysinst/arch
Am Fri, Jun 17, 2022 at 11:31:29PM +0900 schrieb Izumi Tsutsui: > > > Modified Files: > > > src/usr.sbin/sysinst/arch/atari: Makefile > > > src/usr.sbin/sysinst/arch/hp300: Makefile > > > src/usr.sbin/sysinst/arch/luna68k: Makefile > > > src/usr.sbin/sysinst/arch/news68k: Makefile > > > src/usr.sbin/sysinst/arch/newsmips: Makefile > > > src/usr.sbin/sysinst/arch/x68k: Makefile > > > > > > Log Message: > > > Pull SMALLPROG stuff to disable unnecessary partitioning methods etc. > > > > I'm a bit concerned about the CHECK_ENTROPY part. This has a good chance > > of resulting in a inferior user experience, so is that really worth > > saving a few bytes? > > - ramdiskbin with CHECK_ENTROPY requires extra 7000 bytes, at least on > m68k, so poor tier-II ports that have size restrictions on install media > or use slow floppies rather prefer smaller binaries Hm. It shouldn't be anywhere as heavy. Can you check where that size comes from? 1KB I can understand, but 7KB feels too large and something is going wrong. E.g. it could be pulling in more SHA2 code that hasn't been used before and there might be cheaper options in terms of code size. > - CHECK_ENTROPY has been added after netbsd-9 was branched so I guess > ordinary release users won't notice differences We have known issues with the entropy handling on netbsd-9 and this option is supposed to fix many of those. > - if you would like to discuss about pros and cons without numbers, > maybe it would be worth to try installation on various emulators > and describe actual experiences The problem is that incorrectly initialised RNG can result in hard to debug hangs or an insecure operating state. Both are are bad and not just cosmetical issues. Given that none of the ancient ports are ever likely to see a hardware RNG, they are directly affected. Joerg
CVS commit: src/tests/usr.bin/xlint
Module Name:src
Committed By: rillig
Date: Fri Jun 17 20:31:56 UTC 2022
Modified Files:
src/tests/usr.bin/xlint/lint1: Makefile
Added Files:
src/tests/usr.bin/xlint/lint1: check-expect.lua
Removed Files:
src/tests/usr.bin/xlint: check-expect.lua
Log Message:
tests/lint: move check-expect.lua to tests/lint1
It is only used for testing lint1, not for lint2 or xlint.
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r0 src/tests/usr.bin/xlint/check-expect.lua
cvs rdiff -u -r1.127 -r1.128 src/tests/usr.bin/xlint/lint1/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/usr.bin/xlint/lint1/check-expect.lua
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/xlint/lint1/Makefile
diff -u src/tests/usr.bin/xlint/lint1/Makefile:1.127 src/tests/usr.bin/xlint/lint1/Makefile:1.128
--- src/tests/usr.bin/xlint/lint1/Makefile:1.127 Fri Jun 17 20:23:58 2022
+++ src/tests/usr.bin/xlint/lint1/Makefile Fri Jun 17 20:31:56 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.127 2022/06/17 20:23:58 rillig Exp $
+# $NetBSD: Makefile,v 1.128 2022/06/17 20:31:56 rillig Exp $
NOMAN= # defined
MAX_MESSAGE= 349 # see lint1/err.c
@@ -171,7 +171,7 @@ FILES+= stmt_for.c
FILES+= stmt_goto.c
FILES+= stmt_if.c
-FILES+= ../check-expect.lua
+FILES+= check-expect.lua
MSG_IDS= ${:U0 ${:U:${:Urange=${MAX_MESSAGE}}}:C,^.$,0&,:C,^..$,0&,}
MSG_FILES= ${MSG_IDS:%=msg_%.c}
@@ -185,7 +185,7 @@ sync-mi: .PHONY
cvs update "$$mi"; \
fmt="./usr/tests/usr.bin/xlint/lint1/%s\ttests-usr.bin-tests\tcompattestfile,atf\n"; \
cat "$$mi" > "$$mi.tmp"; \
- printf "$$fmt" ${FILES:T} >> "$$mi.tmp"; \
+ printf "$$fmt" ${FILES} >> "$$mi.tmp";\
distrib/sets/fmt-list "$$mi.tmp";\
mv "$$mi.tmp" "$$mi"; \
cvs diff "$$mi" || true
Added files:
Index: src/tests/usr.bin/xlint/lint1/check-expect.lua
diff -u /dev/null src/tests/usr.bin/xlint/lint1/check-expect.lua:1.1
--- /dev/null Fri Jun 17 20:31:56 2022
+++ src/tests/usr.bin/xlint/lint1/check-expect.lua Fri Jun 17 20:31:56 2022
@@ -0,0 +1,226 @@
+#! /usr/bin/lua
+-- $NetBSD: check-expect.lua,v 1.1 2022/06/17 20:31:56 rillig Exp $
+
+--[[
+
+usage: lua ./check-expect.lua *.c
+
+Check that the /* expect+-n: ... */ comments in the .c source files match the
+actual messages found in the corresponding .exp files. The .exp files are
+expected in the current working directory.
+
+The .exp files are generated on the fly during the ATF tests, see
+t_integration.sh. During development, they can be generated using
+lint1/accept.sh.
+]]
+
+
+local function test(func)
+ func()
+end
+
+local function assert_equals(got, expected)
+ if got ~= expected then
+assert(false, string.format("got %q, expected %q", got, expected))
+ end
+end
+
+
+local had_errors = false
+---@param fmt string
+function print_error(fmt, ...)
+ print(fmt:format(...))
+ had_errors = true
+end
+
+
+local function load_lines(fname)
+ local lines = {}
+
+ local f = io.open(fname, "r")
+ if f == nil then return nil end
+
+ for line in f:lines() do
+table.insert(lines, line)
+ end
+ f:close()
+
+ return lines
+end
+
+
+-- Load the 'expect:' comments from a C source file.
+--
+-- example return values:
+-- {
+-- ["file.c(18)"] = {"invalid argument 'a'", "invalid argument 'b'"},
+-- ["file.c(23)"] = {"not a constant expression [123]"},
+-- },
+-- { "file.c(18)", "file.c(23)" }
+local function load_c(fname)
+
+ local lines = load_lines(fname)
+ if lines == nil then return nil, nil end
+
+ local pp_fname = fname
+ local pp_lineno = 0
+ local comment_locations = {}
+ local comments_by_location = {}
+
+ local function add_expectation(offset, message)
+local location = ("%s(%d)"):format(pp_fname, pp_lineno + offset)
+if comments_by_location[location] == nil then
+ table.insert(comment_locations, location)
+ comments_by_location[location] = {}
+end
+local trimmed_msg = message:match("^%s*(.-)%s*$")
+table.insert(comments_by_location[location], trimmed_msg)
+ end
+
+ for phys_lineno, line in ipairs(lines) do
+
+for offset, comment in line:gmatch("/%* expect([+%-]%d+): (.-) %*/") do
+ add_expectation(tonumber(offset), comment)
+end
+
+pp_lineno = pp_lineno + 1
+
+local ppl_lineno, ppl_fname = line:match("^#%s*(%d+)%s+\"([^\"]+)\"")
+if ppl_lineno ~= nil then
+ if ppl_fname == fname and tonumber(ppl_lineno) ~= phys_lineno + 1 then
+print_error("error: %s:%d: preprocessor line number must be %d",
+ fname, phys_lineno, phys_lineno + 1)
+ end
+ pp_fname = ppl_fname
+ pp_lineno = ppl_lineno
+end
+ end
+
+ return comment_locations, comments_by_location
+end
+
+
+-- Load the expected raw lint output from a .exp file.
+--
+-- example return value: {
+-- {
+-- exp_lineno = "18",
+-- location = "file.c(18)",
+-- message = "not a constant expre
CVS commit: src/tests/usr.bin/xlint
Module Name:src Committed By: rillig Date: Fri Jun 17 20:31:56 UTC 2022 Modified Files: src/tests/usr.bin/xlint/lint1: Makefile Added Files: src/tests/usr.bin/xlint/lint1: check-expect.lua Removed Files: src/tests/usr.bin/xlint: check-expect.lua Log Message: tests/lint: move check-expect.lua to tests/lint1 It is only used for testing lint1, not for lint2 or xlint. To generate a diff of this commit: cvs rdiff -u -r1.23 -r0 src/tests/usr.bin/xlint/check-expect.lua cvs rdiff -u -r1.127 -r1.128 src/tests/usr.bin/xlint/lint1/Makefile cvs rdiff -u -r0 -r1.1 src/tests/usr.bin/xlint/lint1/check-expect.lua 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: Fri Jun 17 20:24:00 UTC 2022 Modified Files: src/distrib/sets/lists/tests: mi src/tests/usr.bin/xlint: check-expect.lua src/tests/usr.bin/xlint/lint1: Makefile accept.sh t_integration.sh src/usr.bin/xlint/lint1: Makefile Removed Files: src/tests/usr.bin/xlint/lint1: c11_generic_expression.exp c90.exp c99_init_array.exp c99_init_designator.exp d_alignof.exp d_c99_bool.exp d_c99_bool_strict.exp d_c99_bool_strict_syshdr.exp d_c99_complex_split.exp d_c99_init.exp d_c99_union_cast.exp d_cast_lhs.exp d_constant_conv1.exp d_constant_conv2.exp d_cvt_constant.exp d_decl_old_style_arguments.exp d_fold_test.exp d_gcc_compound_statements1.exp d_incorrect_array_size.exp d_init_array_using_string.exp d_init_pop_member.exp d_lint_assert.exp d_long_double_int.exp d_pr_22119.exp d_return_type.exp d_struct_init_nested.exp d_type_conv1.exp d_type_conv2.exp d_type_conv3.exp decl.exp decl_arg.exp decl_direct_abstract.exp decl_enum.exp decl_enum_c90.exp decl_struct_c90.exp decl_struct_member.exp emit.exp expr_binary.exp expr_binary_trad.exp expr_cast.exp expr_fold.exp expr_fold_strict_bool.exp expr_precedence.exp expr_range.exp feat_stacktrace.exp gcc_attribute.exp gcc_attribute_aligned.exp gcc_attribute_enum.exp gcc_attribute_func.exp gcc_attribute_label.exp gcc_attribute_stmt.exp gcc_attribute_type.exp gcc_attribute_var.exp gcc_bit_field_types.exp gcc_builtin_alloca.exp gcc_builtin_overflow.exp gcc_cast_union.exp gcc_init_compound_literal.exp gcc_stmt_asm.exp gcc_typeof.exp gcc_typeof_after_statement.exp init.exp init_braces.exp init_c90.exp lex_char.exp lex_comment.exp lex_floating.exp lex_integer.exp lex_integer_binary.exp lex_integer_ilp32.exp lex_string.exp lex_whitespace.exp lex_wide_char.exp lex_wide_string.exp msg_000.exp msg_000_c90.exp msg_001.exp msg_001_c90.exp msg_002.exp msg_003.exp msg_004.exp msg_005.exp msg_006.exp msg_007.exp msg_008.exp msg_009.exp msg_010.exp msg_011.exp msg_012.exp msg_013.exp msg_014.exp msg_015.exp msg_016.exp msg_017.exp msg_018.exp msg_019.exp msg_020.exp msg_021.exp msg_022.exp msg_023.exp msg_024.exp msg_025.exp msg_026.exp msg_027.exp msg_028.exp msg_029.exp msg_030.exp msg_031.exp msg_032.exp msg_033.exp msg_034.exp msg_035.exp msg_036.exp msg_037.exp msg_038.exp msg_039.exp msg_041.exp msg_042.exp msg_043.exp msg_044.exp msg_045.exp msg_046.exp msg_047.exp msg_048.exp msg_049.exp msg_050.exp msg_051.exp msg_052.exp msg_053.exp msg_054.exp msg_055.exp msg_056.exp msg_057.exp msg_058.exp msg_059.exp msg_060.exp msg_061.exp msg_062.exp msg_063.exp msg_064.exp msg_065.exp msg_066.exp msg_067.exp msg_068.exp msg_069.exp msg_071.exp msg_072.exp msg_073.exp msg_074.exp msg_075.exp msg_076.exp msg_077.exp msg_078.exp msg_079.exp msg_080.exp msg_081.exp msg_082.exp msg_083.exp msg_084.exp msg_085.exp msg_086.exp msg_087.exp msg_088.exp msg_089.exp msg_090.exp msg_091.exp msg_092.exp msg_093.exp msg_094.exp msg_095.exp msg_096.exp msg_097.exp msg_098.exp msg_099.exp msg_100.exp msg_101.exp msg_102.exp msg_103.exp msg_104.exp msg_105.exp msg_106.exp msg_107.exp msg_108.exp msg_109.exp msg_110.exp msg_111.exp msg_112.exp msg_113.exp msg_114.exp msg_115.exp msg_116.exp msg_117.exp msg_118.exp msg_119.exp msg_120.exp msg_121.exp msg_122.exp msg_123.exp msg_124.exp msg_125.exp msg_126.exp msg_127.exp msg_128.exp msg_129.exp msg_130.exp msg_132.exp msg_132_ilp32.exp msg_132_lp64.exp msg_133.exp msg_134.exp msg_135.exp msg_136.exp msg_137.exp msg_138.exp msg_139.exp msg_140.exp msg_141.exp msg_142.exp msg_143.exp msg_144.exp msg_145.exp msg_146.exp msg_147.exp msg_148.exp msg_149.exp msg_150.exp msg_151.exp msg_152.exp msg_153.exp msg_154.exp msg_155.exp msg_156.exp msg_157.exp msg_158.exp msg_159.exp msg_160.exp msg_161.exp msg_162.exp msg_163.exp msg_164.exp msg_165.exp msg_166.exp msg_167.exp msg_168.exp msg_169.exp msg_170.exp msg_171.exp msg_172.exp msg_173.exp msg_174.exp msg_175.exp msg_177.exp msg_178.exp msg_179.exp msg_180.exp msg_181.exp msg_182.exp msg_183.exp msg_184.exp msg_185.exp msg_186.exp msg_187.exp msg_188.exp msg_189.exp msg_190.exp msg_191.exp msg_192.exp msg_193.exp msg_194.exp msg_195.exp msg_196.exp msg_197.e
CVS commit: src/tests/usr.bin/xlint
Module Name:src
Committed By: rillig
Date: Fri Jun 17 19:01:01 UTC 2022
Modified Files:
src/tests/usr.bin/xlint: check-expect.lua
Log Message:
tests/lint: treat a missing .exp file like an empty one
Previously, a missing .exp file skipped all the checks, that is, the
tests wouldn't fail if there were some unexpected new message.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/tests/usr.bin/xlint/check-expect.lua
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/xlint/check-expect.lua
diff -u src/tests/usr.bin/xlint/check-expect.lua:1.21 src/tests/usr.bin/xlint/check-expect.lua:1.22
--- src/tests/usr.bin/xlint/check-expect.lua:1.21 Fri Jun 17 18:54:53 2022
+++ src/tests/usr.bin/xlint/check-expect.lua Fri Jun 17 19:01:01 2022
@@ -1,5 +1,5 @@
#! /usr/bin/lua
--- $NetBSD: check-expect.lua,v 1.21 2022/06/17 18:54:53 rillig Exp $
+-- $NetBSD: check-expect.lua,v 1.22 2022/06/17 19:01:01 rillig Exp $
--[[
@@ -178,8 +178,7 @@ local function check_test(c_fname)
local c_comment_locations, c_comments_by_location = load_c(c_fname)
if c_comment_locations == nil then return end
- local exp_messages = load_exp(exp_fname)
- if exp_messages == nil then return end
+ local exp_messages = load_exp(exp_fname) or {}
for _, exp_message in ipairs(exp_messages) do
local c_comments = c_comments_by_location[exp_message.location] or {}
CVS commit: src/tests/usr.bin/xlint
Module Name:src Committed By: rillig Date: Fri Jun 17 19:01:01 UTC 2022 Modified Files: src/tests/usr.bin/xlint: check-expect.lua Log Message: tests/lint: treat a missing .exp file like an empty one Previously, a missing .exp file skipped all the checks, that is, the tests wouldn't fail if there were some unexpected new message. To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/tests/usr.bin/xlint/check-expect.lua 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: Fri Jun 17 18:54:53 UTC 2022 Modified Files: src/tests/usr.bin/xlint: check-expect.lua src/tests/usr.bin/xlint/lint1: c11_generic_expression.c d_c99_init.c d_init_array_using_string.c decl.c decl_direct_abstract.c decl_enum_c90.c decl_struct_member.c expr_binary.c expr_binary_trad.c expr_precedence.c feat_stacktrace.c gcc_attribute.c gcc_attribute_aligned.c gcc_attribute_enum.c gcc_init_compound_literal.c gcc_stmt_asm.c gcc_typeof_after_statement.c init_c90.c lex_char.c lex_integer.c lex_integer_binary.c lex_integer_ilp32.c lex_string.c lex_wide_char.c lex_wide_string.c msg_005.c msg_031.c msg_034.c msg_041.c msg_048.c msg_066.c msg_069.c msg_077.c msg_080.c msg_103.c msg_104.c msg_118.c msg_155.c msg_184.c msg_189.c msg_193.c msg_211.c msg_232.c msg_249.c msg_250.c msg_251.c msg_253.c msg_254.c msg_257.c msg_259.c msg_259_c90.c msg_259_ilp32.c msg_265.c msg_283.c msg_289.c msg_312.c msg_333.c msg_341.c msg_342.c msg_342.exp msg_343.c msg_344.c msg_345.c op_colon.c parse_stmt_error.c parse_stmt_iter_error.c parse_type_name.c stmt_for.c stmt_goto.c stmt_if.c src/usr.bin/xlint/lint1: README.md Log Message: tests/lint: make 'expect+-' comments stricter Previously, the expectations from these comments were already satisfied if the expectation occurred somewhere in the actual message from lint. This meant that the prefix 'error:' or 'warning:' could be omitted from the 'expect' comment. These omissions were hard to see in a manual review. Now any omissions must be visually marked with '...'. The test msg_342 now reports its messages properly as being in the file msg_342.c, rather than msg_341.c. This had been a copy-and-paste mistake. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/tests/usr.bin/xlint/check-expect.lua cvs rdiff -u -r1.11 -r1.12 \ src/tests/usr.bin/xlint/lint1/c11_generic_expression.c \ src/tests/usr.bin/xlint/lint1/msg_249.c cvs rdiff -u -r1.40 -r1.41 src/tests/usr.bin/xlint/lint1/d_c99_init.c cvs rdiff -u -r1.10 -r1.11 \ src/tests/usr.bin/xlint/lint1/d_init_array_using_string.c \ src/tests/usr.bin/xlint/lint1/gcc_attribute.c \ src/tests/usr.bin/xlint/lint1/msg_155.c cvs rdiff -u -r1.16 -r1.17 src/tests/usr.bin/xlint/lint1/decl.c cvs rdiff -u -r1.6 -r1.7 src/tests/usr.bin/xlint/lint1/decl_direct_abstract.c \ src/tests/usr.bin/xlint/lint1/msg_343.c cvs rdiff -u -r1.1 -r1.2 src/tests/usr.bin/xlint/lint1/decl_enum_c90.c \ src/tests/usr.bin/xlint/lint1/expr_binary_trad.c \ src/tests/usr.bin/xlint/lint1/lex_integer_binary.c \ src/tests/usr.bin/xlint/lint1/msg_341.c \ src/tests/usr.bin/xlint/lint1/msg_344.c \ src/tests/usr.bin/xlint/lint1/parse_stmt_error.c \ src/tests/usr.bin/xlint/lint1/parse_stmt_iter_error.c \ src/tests/usr.bin/xlint/lint1/stmt_goto.c \ src/tests/usr.bin/xlint/lint1/stmt_if.c cvs rdiff -u -r1.14 -r1.15 src/tests/usr.bin/xlint/lint1/decl_struct_member.c cvs rdiff -u -r1.5 -r1.6 src/tests/usr.bin/xlint/lint1/expr_binary.c \ src/tests/usr.bin/xlint/lint1/gcc_init_compound_literal.c \ src/tests/usr.bin/xlint/lint1/lex_char.c \ src/tests/usr.bin/xlint/lint1/msg_034.c \ src/tests/usr.bin/xlint/lint1/msg_066.c \ src/tests/usr.bin/xlint/lint1/msg_077.c \ src/tests/usr.bin/xlint/lint1/msg_118.c \ src/tests/usr.bin/xlint/lint1/msg_189.c \ src/tests/usr.bin/xlint/lint1/msg_232.c cvs rdiff -u -r1.8 -r1.9 src/tests/usr.bin/xlint/lint1/expr_precedence.c \ src/tests/usr.bin/xlint/lint1/parse_type_name.c cvs rdiff -u -r1.2 -r1.3 src/tests/usr.bin/xlint/lint1/feat_stacktrace.c \ src/tests/usr.bin/xlint/lint1/gcc_attribute_aligned.c \ src/tests/usr.bin/xlint/lint1/gcc_typeof_after_statement.c \ src/tests/usr.bin/xlint/lint1/lex_wide_char.c \ src/tests/usr.bin/xlint/lint1/lex_wide_string.c \ src/tests/usr.bin/xlint/lint1/msg_345.c \ src/tests/usr.bin/xlint/lint1/op_colon.c \ src/tests/usr.bin/xlint/lint1/stmt_for.c cvs rdiff -u -r1.4 -r1.5 src/tests/usr.bin/xlint/lint1/gcc_attribute_enum.c \ src/tests/usr.bin/xlint/lint1/lex_string.c \ src/tests/usr.bin/xlint/lint1/msg_005.c \ src/tests/usr.bin/xlint/lint1/msg_041.c \ src/tests/usr.bin/xlint/lint1/msg_048.c \ src/tests/usr.bin/xlint/lint1/msg_080.c \ src/tests/usr.bin/xlint/lint1/msg_184.c \ src/tests/usr.bin/xlint/lint1/msg_250.c \ src/tests/usr.bin/xlint/lint1/msg_265.c \ src/tests/usr.bin/xlint/lint1/msg_333.c cvs rdiff -u -r1.3 -r1.4 src/tests/usr.bin/xlint/lint1/gcc_stmt_asm.c \ src/tests/usr.bin/xlint/lint1/init_c90.c \ src/tests/usr.bin/xlint/lint1/lex_integer_ilp32.c \ src/tests/usr.bin/xlint/lint1/msg_069.c \ src/tests/usr.bin/xlint/lint1/msg_103.c \ src/tests/usr.bin/xl
CVS commit: src
Module Name:src Committed By: rillig Date: Fri Jun 17 18:54:53 UTC 2022 Modified Files: src/tests/usr.bin/xlint: check-expect.lua src/tests/usr.bin/xlint/lint1: c11_generic_expression.c d_c99_init.c d_init_array_using_string.c decl.c decl_direct_abstract.c decl_enum_c90.c decl_struct_member.c expr_binary.c expr_binary_trad.c expr_precedence.c feat_stacktrace.c gcc_attribute.c gcc_attribute_aligned.c gcc_attribute_enum.c gcc_init_compound_literal.c gcc_stmt_asm.c gcc_typeof_after_statement.c init_c90.c lex_char.c lex_integer.c lex_integer_binary.c lex_integer_ilp32.c lex_string.c lex_wide_char.c lex_wide_string.c msg_005.c msg_031.c msg_034.c msg_041.c msg_048.c msg_066.c msg_069.c msg_077.c msg_080.c msg_103.c msg_104.c msg_118.c msg_155.c msg_184.c msg_189.c msg_193.c msg_211.c msg_232.c msg_249.c msg_250.c msg_251.c msg_253.c msg_254.c msg_257.c msg_259.c msg_259_c90.c msg_259_ilp32.c msg_265.c msg_283.c msg_289.c msg_312.c msg_333.c msg_341.c msg_342.c msg_342.exp msg_343.c msg_344.c msg_345.c op_colon.c parse_stmt_error.c parse_stmt_iter_error.c parse_type_name.c stmt_for.c stmt_goto.c stmt_if.c src/usr.bin/xlint/lint1: README.md Log Message: tests/lint: make 'expect+-' comments stricter Previously, the expectations from these comments were already satisfied if the expectation occurred somewhere in the actual message from lint. This meant that the prefix 'error:' or 'warning:' could be omitted from the 'expect' comment. These omissions were hard to see in a manual review. Now any omissions must be visually marked with '...'. The test msg_342 now reports its messages properly as being in the file msg_342.c, rather than msg_341.c. This had been a copy-and-paste mistake. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/tests/usr.bin/xlint/check-expect.lua cvs rdiff -u -r1.11 -r1.12 \ src/tests/usr.bin/xlint/lint1/c11_generic_expression.c \ src/tests/usr.bin/xlint/lint1/msg_249.c cvs rdiff -u -r1.40 -r1.41 src/tests/usr.bin/xlint/lint1/d_c99_init.c cvs rdiff -u -r1.10 -r1.11 \ src/tests/usr.bin/xlint/lint1/d_init_array_using_string.c \ src/tests/usr.bin/xlint/lint1/gcc_attribute.c \ src/tests/usr.bin/xlint/lint1/msg_155.c cvs rdiff -u -r1.16 -r1.17 src/tests/usr.bin/xlint/lint1/decl.c cvs rdiff -u -r1.6 -r1.7 src/tests/usr.bin/xlint/lint1/decl_direct_abstract.c \ src/tests/usr.bin/xlint/lint1/msg_343.c cvs rdiff -u -r1.1 -r1.2 src/tests/usr.bin/xlint/lint1/decl_enum_c90.c \ src/tests/usr.bin/xlint/lint1/expr_binary_trad.c \ src/tests/usr.bin/xlint/lint1/lex_integer_binary.c \ src/tests/usr.bin/xlint/lint1/msg_341.c \ src/tests/usr.bin/xlint/lint1/msg_344.c \ src/tests/usr.bin/xlint/lint1/parse_stmt_error.c \ src/tests/usr.bin/xlint/lint1/parse_stmt_iter_error.c \ src/tests/usr.bin/xlint/lint1/stmt_goto.c \ src/tests/usr.bin/xlint/lint1/stmt_if.c cvs rdiff -u -r1.14 -r1.15 src/tests/usr.bin/xlint/lint1/decl_struct_member.c cvs rdiff -u -r1.5 -r1.6 src/tests/usr.bin/xlint/lint1/expr_binary.c \ src/tests/usr.bin/xlint/lint1/gcc_init_compound_literal.c \ src/tests/usr.bin/xlint/lint1/lex_char.c \ src/tests/usr.bin/xlint/lint1/msg_034.c \ src/tests/usr.bin/xlint/lint1/msg_066.c \ src/tests/usr.bin/xlint/lint1/msg_077.c \ src/tests/usr.bin/xlint/lint1/msg_118.c \ src/tests/usr.bin/xlint/lint1/msg_189.c \ src/tests/usr.bin/xlint/lint1/msg_232.c cvs rdiff -u -r1.8 -r1.9 src/tests/usr.bin/xlint/lint1/expr_precedence.c \ src/tests/usr.bin/xlint/lint1/parse_type_name.c cvs rdiff -u -r1.2 -r1.3 src/tests/usr.bin/xlint/lint1/feat_stacktrace.c \ src/tests/usr.bin/xlint/lint1/gcc_attribute_aligned.c \ src/tests/usr.bin/xlint/lint1/gcc_typeof_after_statement.c \ src/tests/usr.bin/xlint/lint1/lex_wide_char.c \ src/tests/usr.bin/xlint/lint1/lex_wide_string.c \ src/tests/usr.bin/xlint/lint1/msg_345.c \ src/tests/usr.bin/xlint/lint1/op_colon.c \ src/tests/usr.bin/xlint/lint1/stmt_for.c cvs rdiff -u -r1.4 -r1.5 src/tests/usr.bin/xlint/lint1/gcc_attribute_enum.c \ src/tests/usr.bin/xlint/lint1/lex_string.c \ src/tests/usr.bin/xlint/lint1/msg_005.c \ src/tests/usr.bin/xlint/lint1/msg_041.c \ src/tests/usr.bin/xlint/lint1/msg_048.c \ src/tests/usr.bin/xlint/lint1/msg_080.c \ src/tests/usr.bin/xlint/lint1/msg_184.c \ src/tests/usr.bin/xlint/lint1/msg_250.c \ src/tests/usr.bin/xlint/lint1/msg_265.c \ src/tests/usr.bin/xlint/lint1/msg_333.c cvs rdiff -u -r1.3 -r1.4 src/tests/usr.bin/xlint/lint1/gcc_stmt_asm.c \ src/tests/usr.bin/xlint/lint1/init_c90.c \ src/tests/usr.bin/xlint/lint1/lex_integer_ilp32.c \ src/tests/usr.bin/xlint/lint1/msg_069.c \ src/tests/usr.bin/xlint/lint1/msg_103.c \ src/tests/usr.bin/xl
CVS commit: src/external/gpl3/binutils/dist/binutils
Module Name:src
Committed By: christos
Date: Fri Jun 17 16:45:22 UTC 2022
Modified Files:
src/external/gpl3/binutils/dist/binutils: dwarf.c
Log Message:
Fix readelf: Error: LEB value too large when running:
readelf --debug-dump /usr/libdata/lib/libc.so.X.Y.debug
Apply patch from:
https://www.mail-archive.com/bug-binutils@gnu.org/msg35315.html
affects objdump, readelf.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.8 -r1.2 src/external/gpl3/binutils/dist/binutils/dwarf.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/binutils/dist/binutils/dwarf.c
diff -u src/external/gpl3/binutils/dist/binutils/dwarf.c:1.1.1.8 src/external/gpl3/binutils/dist/binutils/dwarf.c:1.2
--- src/external/gpl3/binutils/dist/binutils/dwarf.c:1.1.1.8 Fri Apr 3 19:39:56 2020
+++ src/external/gpl3/binutils/dist/binutils/dwarf.c Fri Jun 17 12:45:22 2022
@@ -343,20 +343,34 @@ read_leb128 (unsigned char *data,
while (data < end)
{
unsigned char byte = *data++;
+ bfd_boolean cont = (byte & 0x80) ? TRUE : FALSE;
+
+ byte &= 0x7f;
num_read++;
if (shift < sizeof (result) * 8)
- {
- result |= ((dwarf_vma) (byte & 0x7f)) << shift;
- if ((result >> shift) != (byte & 0x7f))
- /* Overflow. */
- status |= 2;
+{
+ result |= ((dwarf_vma) byte) << shift;
+ if (sign)
+{
+ if dwarf_signed_vma) result >> shift) & 0x7f) != byte)
+/* Overflow. */
+status |= 2;
+}
+ else if ((result >> shift) != byte)
+{
+ /* Overflow. */
+ status |= 2;
+}
+
shift += 7;
}
- else if ((byte & 0x7f) != 0)
- status |= 2;
+ else if (byte != 0)
+{
+ status |= 2;
+}
- if ((byte & 0x80) == 0)
+ if (!cont)
{
status &= ~1;
if (sign && (shift < 8 * sizeof (result)) && (byte & 0x40))
CVS commit: src/external/gpl3/binutils/dist/binutils
Module Name:src Committed By: christos Date: Fri Jun 17 16:45:22 UTC 2022 Modified Files: src/external/gpl3/binutils/dist/binutils: dwarf.c Log Message: Fix readelf: Error: LEB value too large when running: readelf --debug-dump /usr/libdata/lib/libc.so.X.Y.debug Apply patch from: https://www.mail-archive.com/bug-binutils@gnu.org/msg35315.html affects objdump, readelf. To generate a diff of this commit: cvs rdiff -u -r1.1.1.8 -r1.2 src/external/gpl3/binutils/dist/binutils/dwarf.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man/man4/man4.hp300
Module Name:src Committed By: tsutsui Date: Fri Jun 17 16:43:52 UTC 2022 Modified Files: src/share/man/man4/man4.hp300: autoconf.4 Log Message: Sync device autoconf(9) messages in DIAGNOSTICS with reality a bit. Also pull some fixes from luna68k by wizd(8). To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/share/man/man4/man4.hp300/autoconf.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/man4.hp300/autoconf.4 diff -u src/share/man/man4/man4.hp300/autoconf.4:1.11 src/share/man/man4/man4.hp300/autoconf.4:1.12 --- src/share/man/man4/man4.hp300/autoconf.4:1.11 Fri Feb 17 22:24:46 2017 +++ src/share/man/man4/man4.hp300/autoconf.4 Fri Jun 17 16:43:52 2022 @@ -1,4 +1,4 @@ -.\" $NetBSD: autoconf.4,v 1.11 2017/02/17 22:24:46 christos Exp $ +.\" $NetBSD: autoconf.4,v 1.12 2022/06/17 16:43:52 tsutsui Exp $ .\" .\" Copyright (c) 1990, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\" .\" from: @(#)autoconf.4 8.1 (Berkeley) 6/9/93 .\" -.Dd February 17, 2017 +.Dd June 17, 2022 .Dt AUTOCONF 4 hp300 .Os .Sh NAME @@ -41,7 +41,8 @@ When bootstraps it probes the innards of the machine on which it is running and locates controllers, drives, and other devices, printing out -what it finds on the console. This procedure is driven by a system +what it finds on the console. +This procedure is driven by a system configuration table which is processed by .Xr config 1 and compiled into each kernel. @@ -70,26 +71,26 @@ then the name of the root device is read time, and any available device may be used. .Sh DIAGNOSTICS .Bl -diag -.It CPU type not configured. +.It SPU type not configured You tried to boot .Nx -on a -.Tn CPU -type which it doesn't +on an SPU type which it doesn't (or at least this compiled version of .Nx doesn't) understand. -.Pp -.It hpibbus%d at sc%d, ipl %d. +.It nhpib%d at intio0 addr 0x478000 ipl %d +.It nhpib%d at dio0 scode %d ipl %d +.It fhpib%d at dio0 scode %d ipl %d +.It hpibbus%d at nhpib%d +.It hpibbus%d at fhpib%d An .Tn HP-IB -was found at sc%d (the select code) -with ipl%d (interrupt priority level). +was found at the internal bus or scode %d (the select code) +with ipl %d (interrupt priority level). .Nx will call it hpibbus%d. -.Pp -.It %s%d: %s. -.It %s%d at hpibbus%d, slave %d. +.It %s%d at hpibbus%d slave %d punit %d +.It %s%d: %s An .Tn HP-IB disk or tape controller was found. @@ -103,14 +104,23 @@ The .Ql %s in the first line will be a product type like ``7945A'' or ``9144''. The slave number comes from the address select switches on the drive. -.Pp -.It grf0 csr 0x56 -.It grf%d at sc%d -A bit mapped display was found either at the ``internal'' address (first case) -or at some ``external'' select code (second case). +.It dvbox0 at intio0 addr 0x56 +.It dvbox%d at dio0 scode %d +.It gbox0 at intio0 addr 0x56 +.It gbox%d at dio0 scode %d +.It hyper%d at dio0 scode %d +.It rbox0 at intio0 addr 0x56 +.It rbox%d at dio0 scode %d +.It topcat0 at intio0 addr 0x56 +.It topcat%d at dio0 scode %d +.It tvrx%d at dio0 scode %d +.It gendiofb%d at dio0 scode %d +.It sti%d at sgc0 slot %d +A bit mapped display was found either at the ``internal'' address, +at some ``external'' select code, +or at some SGC bus slot. If it exists, the internal display will always be unit 0. -.Pp -.It %s%d at sc%d, ipl %d flags %d +.It %s%d at dio0 scode %d ipl %d Another peripheral controller was found at the indicated select code and with indicated interrupt priority level. .Ql %s
CVS commit: src/share/man/man4/man4.hp300
Module Name:src Committed By: tsutsui Date: Fri Jun 17 16:43:52 UTC 2022 Modified Files: src/share/man/man4/man4.hp300: autoconf.4 Log Message: Sync device autoconf(9) messages in DIAGNOSTICS with reality a bit. Also pull some fixes from luna68k by wizd(8). To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/share/man/man4/man4.hp300/autoconf.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/usr.bin/xlint
Module Name:src Committed By: rillig Date: Fri Jun 17 16:10:10 UTC 2022 Modified Files: src/tests/usr.bin/xlint: check-expect.lua Log Message: tests/lint: rename local variables in check-expect.lua Enough time has passed since I wrote that little program to make me forget the naming scheme I had in mind back then. Prefix the variable names with the source of their data, 'c_' or 'exp_', to provide a bit of orientation. No functional change. To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/tests/usr.bin/xlint/check-expect.lua Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/usr.bin/xlint
Module Name:src
Committed By: rillig
Date: Fri Jun 17 16:10:10 UTC 2022
Modified Files:
src/tests/usr.bin/xlint: check-expect.lua
Log Message:
tests/lint: rename local variables in check-expect.lua
Enough time has passed since I wrote that little program to make me
forget the naming scheme I had in mind back then. Prefix the variable
names with the source of their data, 'c_' or 'exp_', to provide a bit of
orientation.
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/tests/usr.bin/xlint/check-expect.lua
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/xlint/check-expect.lua
diff -u src/tests/usr.bin/xlint/check-expect.lua:1.19 src/tests/usr.bin/xlint/check-expect.lua:1.20
--- src/tests/usr.bin/xlint/check-expect.lua:1.19 Fri Jun 17 07:06:50 2022
+++ src/tests/usr.bin/xlint/check-expect.lua Fri Jun 17 16:10:10 2022
@@ -1,5 +1,5 @@
#! /usr/bin/lua
--- $NetBSD: check-expect.lua,v 1.19 2022/06/17 07:06:50 rillig Exp $
+-- $NetBSD: check-expect.lua,v 1.20 2022/06/17 16:10:10 rillig Exp $
--[[
@@ -8,6 +8,7 @@ usage: lua ./check-expect.lua *.c
Check that the /* expect+-n: ... */ comments in the .c source files match the
actual messages found in the corresponding .exp files.
+To regenerate the .exp files, see lint1/accept.sh.
]]
@@ -33,8 +34,15 @@ local function load_lines(fname)
return lines
end
-
-local function load_expect_comments_from_c(fname)
+-- Load the 'expect:' comments from a C source file.
+--
+-- example return values:
+-- {
+-- ["file.c(18)"] = {"invalid argument 'a'", "invalid argument 'b'"},
+-- ["file.c(23)"] = {"not a constant expression [123]"},
+-- },
+-- { "file.c(18)", "file.c(23)" }
+local function load_c(fname)
local lines = load_lines(fname)
if lines == nil then return nil, nil end
@@ -77,7 +85,16 @@ local function load_expect_comments_from
end
-local function load_actual_messages_from_exp(exp_fname)
+-- Load the expected raw lint output from a .exp file.
+--
+-- example return value: {
+-- {
+-- exp_lineno = "18",
+-- location = "file.c(18)",
+-- message = "not a constant expression [123]",
+-- }
+-- }
+local function load_exp(exp_fname)
local lines = load_lines(exp_fname)
if lines == nil then return {} end
@@ -100,21 +117,21 @@ end
local function check_test(c_fname)
local exp_fname = c_fname:gsub("%.c$", ".exp")
- local comment_locations, comments_by_location =
-load_expect_comments_from_c(c_fname)
- if comment_locations == nil then return end
-
- local messages = load_actual_messages_from_exp(exp_fname)
- if messages == nil then return end
-
- for _, act in ipairs(messages) do
-local exp = comments_by_location[act.location] or {}
-local exp_comment = act.message:gsub("/%*", "**"):gsub("%*/", "**")
+ local c_comment_locations, c_comments_by_location = load_c(c_fname)
+ if c_comment_locations == nil then return end
+
+ local exp_messages = load_exp(exp_fname)
+ if exp_messages == nil then return end
+
+ for _, exp_message in ipairs(exp_messages) do
+local c_comments = c_comments_by_location[exp_message.location] or {}
+local expected_comment =
+ exp_message.message:gsub("/%*", "**"):gsub("%*/", "**")
local found = false
-for i, message in ipairs(exp) do
- if message ~= "" and exp_comment:find(message, 1, true) then
-exp[i] = ""
+for i, c_comment in ipairs(c_comments) do
+ if c_comment ~= "" and expected_comment:find(c_comment, 1, true) then
+c_comments[i] = ""
found = true
break
end
@@ -122,16 +139,16 @@ local function check_test(c_fname)
if not found then
print_error("error: %s: missing /* expect+1: %s */",
-act.location, exp_comment)
+exp_message.location, expected_comment)
end
end
- for _, location in ipairs(comment_locations) do
-for _, message in ipairs(comments_by_location[location]) do
- if message ~= "" then
+ for _, c_comment_location in ipairs(c_comment_locations) do
+for _, c_comment in ipairs(c_comments_by_location[c_comment_location]) do
+ if c_comment ~= "" then
print_error(
"error: %s: declared message \"%s\" is not in the actual output",
- location, message)
+ c_comment_location, c_comment)
end
end
end
CVS commit: src/usr.sbin/sysinst/arch
Module Name:src Committed By: tsutsui Date: Fri Jun 17 16:09:47 UTC 2022 Modified Files: src/usr.sbin/sysinst/arch/luna68k: md.h src/usr.sbin/sysinst/arch/news68k: md.h src/usr.sbin/sysinst/arch/x68k: md.h Log Message: Use #define consistently. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/sysinst/arch/luna68k/md.h cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/sysinst/arch/news68k/md.h cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/sysinst/arch/x68k/md.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/sysinst/arch
Module Name:src Committed By: tsutsui Date: Fri Jun 17 16:09:47 UTC 2022 Modified Files: src/usr.sbin/sysinst/arch/luna68k: md.h src/usr.sbin/sysinst/arch/news68k: md.h src/usr.sbin/sysinst/arch/x68k: md.h Log Message: Use #define consistently. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/sysinst/arch/luna68k/md.h cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/sysinst/arch/news68k/md.h cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/sysinst/arch/x68k/md.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.sbin/sysinst/arch/luna68k/md.h diff -u src/usr.sbin/sysinst/arch/luna68k/md.h:1.5 src/usr.sbin/sysinst/arch/luna68k/md.h:1.6 --- src/usr.sbin/sysinst/arch/luna68k/md.h:1.5 Fri Jun 17 16:06:19 2022 +++ src/usr.sbin/sysinst/arch/luna68k/md.h Fri Jun 17 16:09:47 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: md.h,v 1.5 2022/06/17 16:06:19 tsutsui Exp $ */ +/* $NetBSD: md.h,v 1.6 2022/06/17 16:09:47 tsutsui Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -43,7 +43,7 @@ #define PART_BOOT (8 * MEG) /* for a.out kernel and boot */ #define PART_BOOT_TYPE FS_BSDFFS -#define PART_BOOT_SUBT 1 /* old 4.3BSD UFS */ +#define PART_BOOT_SUBT 1 /* old 4.3BSD UFS */ #define DEFROOTSIZE 40 /* Default root size */ #define DEFSWAPSIZE 32 /* Default swap size */ @@ -63,4 +63,4 @@ * If not defined, we assume the port does not support disklabels and * the hand-edited disklabel will NOT be written by MI code. */ -#define DISKLABEL_CMD "disklabel -w -r" +#define DISKLABEL_CMD "disklabel -w -r" Index: src/usr.sbin/sysinst/arch/news68k/md.h diff -u src/usr.sbin/sysinst/arch/news68k/md.h:1.3 src/usr.sbin/sysinst/arch/news68k/md.h:1.4 --- src/usr.sbin/sysinst/arch/news68k/md.h:1.3 Thu Jun 16 14:03:38 2022 +++ src/usr.sbin/sysinst/arch/news68k/md.h Fri Jun 17 16:09:47 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: md.h,v 1.3 2022/06/16 14:03:38 tsutsui Exp $ */ +/* $NetBSD: md.h,v 1.4 2022/06/17 16:09:47 tsutsui Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -67,4 +67,4 @@ * If not defined, we assume the port does not support disklabels and * the hand-edited disklabel will NOT be written by MI code. */ -#define DISKLABEL_CMD "disklabel -w -r" +#define DISKLABEL_CMD "disklabel -w -r" Index: src/usr.sbin/sysinst/arch/x68k/md.h diff -u src/usr.sbin/sysinst/arch/x68k/md.h:1.7 src/usr.sbin/sysinst/arch/x68k/md.h:1.8 --- src/usr.sbin/sysinst/arch/x68k/md.h:1.7 Fri Jun 17 16:06:19 2022 +++ src/usr.sbin/sysinst/arch/x68k/md.h Fri Jun 17 16:09:47 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: md.h,v 1.7 2022/06/17 16:06:19 tsutsui Exp $ */ +/* $NetBSD: md.h,v 1.8 2022/06/17 16:09:47 tsutsui Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -59,7 +59,7 @@ #define DEFVARSIZE 32 /* Default /var size, if created */ #define DEFUSRSIZE 700 /* Default /usr size, if /home */ #define XNEEDMB 250 /* Extra megs for full X installation */ -#define DEBNEEDMB 800 /* Extra megs for debug sets */ +#define DEBNEEDMB 800 /* Extra megs for debug sets */ /* have support for booting from UFS2 */ #define HAVE_UFS2_BOOT @@ -95,4 +95,4 @@ * to in-core disklabels, so we can not check for existence of "real" * disklabels on-disk before offering disklabel partitions. */ -#define DISKLABEL_NO_ONDISK_VERIFY 1 +#define DISKLABEL_NO_ONDISK_VERIFY 1
CVS commit: src/usr.sbin/sysinst/arch
Module Name:src Committed By: tsutsui Date: Fri Jun 17 16:06:19 UTC 2022 Modified Files: src/usr.sbin/sysinst/arch/atari: md.h src/usr.sbin/sysinst/arch/luna68k: md.h src/usr.sbin/sysinst/arch/x68k: md.h Log Message: Use consistent default partition sizes for similar ports. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/sysinst/arch/atari/md.h cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/sysinst/arch/luna68k/md.h cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/sysinst/arch/x68k/md.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.sbin/sysinst/arch/atari/md.h diff -u src/usr.sbin/sysinst/arch/atari/md.h:1.4 src/usr.sbin/sysinst/arch/atari/md.h:1.5 --- src/usr.sbin/sysinst/arch/atari/md.h:1.4 Thu Jun 16 14:03:37 2022 +++ src/usr.sbin/sysinst/arch/atari/md.h Fri Jun 17 16:06:19 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: md.h,v 1.4 2022/06/16 14:03:37 tsutsui Exp $ */ +/* $NetBSD: md.h,v 1.5 2022/06/17 16:06:19 tsutsui Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -51,9 +51,9 @@ #define DEFROOTSIZE 40 /* Default root size */ #define DEFSWAPSIZE 32 /* Default swap size */ #define DEFVARSIZE 32 /* Default /var size, if created */ -#define DEFUSRSIZE 650 /* Default /usr size, if /home */ +#define DEFUSRSIZE 700 /* Default /usr size, if /home */ #define XNEEDMB 250 /* Extra megs for full X installation */ -#define DEBNEEDMB 900 /* Extra megs for debug sets */ +#define DEBNEEDMB 800 /* Extra megs for debug sets */ /* * Default filesets to fetch and install during installation Index: src/usr.sbin/sysinst/arch/luna68k/md.h diff -u src/usr.sbin/sysinst/arch/luna68k/md.h:1.4 src/usr.sbin/sysinst/arch/luna68k/md.h:1.5 --- src/usr.sbin/sysinst/arch/luna68k/md.h:1.4 Thu Jun 16 14:03:38 2022 +++ src/usr.sbin/sysinst/arch/luna68k/md.h Fri Jun 17 16:06:19 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: md.h,v 1.4 2022/06/16 14:03:38 tsutsui Exp $ */ +/* $NetBSD: md.h,v 1.5 2022/06/17 16:06:19 tsutsui Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -45,12 +45,12 @@ #define PART_BOOT_TYPE FS_BSDFFS #define PART_BOOT_SUBT 1 /* old 4.3BSD UFS */ -#define DEFROOTSIZE 64 /* Default root size */ +#define DEFROOTSIZE 40 /* Default root size */ #define DEFSWAPSIZE 32 /* Default swap size */ -#define DEFVARSIZE 64 /* Default /var size, if created */ -#define DEFUSRSIZE 750 /* Default /usr size, if created */ +#define DEFVARSIZE 32 /* Default /var size, if created */ +#define DEFUSRSIZE 700 /* Default /usr size, if created */ #define XNEEDMB 250 /* Extra megs for full X installation */ -#define DEBNEEDMB 900 /* Extra megs for debug sets */ +#define DEBNEEDMB 800 /* Extra megs for debug sets */ /* * Default filesets to fetch and install during installation Index: src/usr.sbin/sysinst/arch/x68k/md.h diff -u src/usr.sbin/sysinst/arch/x68k/md.h:1.6 src/usr.sbin/sysinst/arch/x68k/md.h:1.7 --- src/usr.sbin/sysinst/arch/x68k/md.h:1.6 Thu Jun 16 14:03:39 2022 +++ src/usr.sbin/sysinst/arch/x68k/md.h Fri Jun 17 16:06:19 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: md.h,v 1.6 2022/06/16 14:03:39 tsutsui Exp $ */ +/* $NetBSD: md.h,v 1.7 2022/06/17 16:06:19 tsutsui Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -54,11 +54,11 @@ #define PART_USR PART_D /* Can be after PART_FIRST_FREE */ #define PART_FIRST_FREE PART_E -#define DEFROOTSIZE 48 /* Default root size */ +#define DEFROOTSIZE 40 /* Default root size */ #define DEFSWAPSIZE 32 /* Default swap size */ #define DEFVARSIZE 32 /* Default /var size, if created */ -#define DEFUSRSIZE 1024 /* Default /usr size, if /home */ -#define XNEEDMB 256 /* Extra megs for full X installation */ +#define DEFUSRSIZE 700 /* Default /usr size, if /home */ +#define XNEEDMB 250 /* Extra megs for full X installation */ #define DEBNEEDMB 800 /* Extra megs for debug sets */ /* have support for booting from UFS2 */
CVS commit: src/usr.sbin/sysinst/arch
Module Name:src Committed By: tsutsui Date: Fri Jun 17 16:06:19 UTC 2022 Modified Files: src/usr.sbin/sysinst/arch/atari: md.h src/usr.sbin/sysinst/arch/luna68k: md.h src/usr.sbin/sysinst/arch/x68k: md.h Log Message: Use consistent default partition sizes for similar ports. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/sysinst/arch/atari/md.h cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/sysinst/arch/luna68k/md.h cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/sysinst/arch/x68k/md.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Fri Jun 17 15:33:02 UTC 2022 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: Remove bogus ticket #1748 entry that was actually a fixup of ticket #1746 To generate a diff of this commit: cvs rdiff -u -r1.1.2.136 -r1.1.2.137 src/doc/CHANGES-8.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-8.3 diff -u src/doc/CHANGES-8.3:1.1.2.136 src/doc/CHANGES-8.3:1.1.2.137 --- src/doc/CHANGES-8.3:1.1.2.136 Fri Jun 17 15:28:01 2022 +++ src/doc/CHANGES-8.3 Fri Jun 17 15:33:02 2022 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-8.3,v 1.1.2.136 2022/06/17 15:28:01 martin Exp $ +# $NetBSD: CHANGES-8.3,v 1.1.2.137 2022/06/17 15:33:02 martin Exp $ A complete list of changes from the NetBSD 8.2 release to the NetBSD 8.3 release: @@ -2679,11 +2679,6 @@ sys/arch/atari/atari/stalloc.c 1.17 PR 56859: restore NULL pointer checks lost in rev 1.16. [tsutsui, ticket #1747] -sys/dev/pci/ixgbe/ixgbe.c (apply patch) - - Fix the location of "break" statement. No functional change intended. - [msaitoh, ticket #1748] - sys/miscfs/procfs/procfs_vnops.c 1.229 procfs: add missing permission check.
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Fri Jun 17 15:33:02 UTC 2022 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: Remove bogus ticket #1748 entry that was actually a fixup of ticket #1746 To generate a diff of this commit: cvs rdiff -u -r1.1.2.136 -r1.1.2.137 src/doc/CHANGES-8.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Fri Jun 17 15:28:01 UTC 2022 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: Ticket #1748 To generate a diff of this commit: cvs rdiff -u -r1.1.2.135 -r1.1.2.136 src/doc/CHANGES-8.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-8.3 diff -u src/doc/CHANGES-8.3:1.1.2.135 src/doc/CHANGES-8.3:1.1.2.136 --- src/doc/CHANGES-8.3:1.1.2.135 Mon Jun 6 11:10:24 2022 +++ src/doc/CHANGES-8.3 Fri Jun 17 15:28:01 2022 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-8.3,v 1.1.2.135 2022/06/06 11:10:24 martin Exp $ +# $NetBSD: CHANGES-8.3,v 1.1.2.136 2022/06/17 15:28:01 martin Exp $ A complete list of changes from the NetBSD 8.2 release to the NetBSD 8.3 release: @@ -2684,3 +2684,8 @@ sys/dev/pci/ixgbe/ixgbe.c (apply patch Fix the location of "break" statement. No functional change intended. [msaitoh, ticket #1748] +sys/miscfs/procfs/procfs_vnops.c 1.229 + + procfs: add missing permission check. + [shm, ticket #1748] +
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Fri Jun 17 15:28:01 UTC 2022 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: Ticket #1748 To generate a diff of this commit: cvs rdiff -u -r1.1.2.135 -r1.1.2.136 src/doc/CHANGES-8.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/sys/miscfs/procfs
Module Name:src Committed By: martin Date: Fri Jun 17 15:27:10 UTC 2022 Modified Files: src/sys/miscfs/procfs [netbsd-8]: procfs_vnops.c Log Message: Pull up following revision(s) (requested by shm in ticket #1748): sys/miscfs/procfs/procfs_vnops.c: revision 1.229 Add missing permission check To generate a diff of this commit: cvs rdiff -u -r1.197.2.3 -r1.197.2.4 src/sys/miscfs/procfs/procfs_vnops.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/miscfs/procfs/procfs_vnops.c diff -u src/sys/miscfs/procfs/procfs_vnops.c:1.197.2.3 src/sys/miscfs/procfs/procfs_vnops.c:1.197.2.4 --- src/sys/miscfs/procfs/procfs_vnops.c:1.197.2.3 Thu Aug 29 16:28:47 2019 +++ src/sys/miscfs/procfs/procfs_vnops.c Fri Jun 17 15:27:10 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: procfs_vnops.c,v 1.197.2.3 2019/08/29 16:28:47 martin Exp $ */ +/* $NetBSD: procfs_vnops.c,v 1.197.2.4 2022/06/17 15:27:10 martin Exp $ */ /*- * Copyright (c) 2006, 2007, 2008 The NetBSD Foundation, Inc. @@ -105,7 +105,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: procfs_vnops.c,v 1.197.2.3 2019/08/29 16:28:47 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: procfs_vnops.c,v 1.197.2.4 2022/06/17 15:27:10 martin Exp $"); #include #include @@ -1040,6 +1040,9 @@ procfs_lookup(void *v) *vpp = NULL; + if ((error = VOP_ACCESS(dvp, VEXEC, cnp->cn_cred)) != 0) + return (error); + if (cnp->cn_nameiop == DELETE || cnp->cn_nameiop == RENAME) return (EROFS);
CVS commit: [netbsd-8] src/sys/miscfs/procfs
Module Name:src Committed By: martin Date: Fri Jun 17 15:27:10 UTC 2022 Modified Files: src/sys/miscfs/procfs [netbsd-8]: procfs_vnops.c Log Message: Pull up following revision(s) (requested by shm in ticket #1748): sys/miscfs/procfs/procfs_vnops.c: revision 1.229 Add missing permission check To generate a diff of this commit: cvs rdiff -u -r1.197.2.3 -r1.197.2.4 src/sys/miscfs/procfs/procfs_vnops.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Fri Jun 17 15:26:31 UTC 2022 Modified Files: src/doc [netbsd-9]: CHANGES-9.3 Log Message: Ticket #1475 To generate a diff of this commit: cvs rdiff -u -r1.1.2.107 -r1.1.2.108 src/doc/CHANGES-9.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-9.3 diff -u src/doc/CHANGES-9.3:1.1.2.107 src/doc/CHANGES-9.3:1.1.2.108 --- src/doc/CHANGES-9.3:1.1.2.107 Thu Jun 16 14:23:27 2022 +++ src/doc/CHANGES-9.3 Fri Jun 17 15:26:31 2022 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.3,v 1.1.2.107 2022/06/16 14:23:27 martin Exp $ +# $NetBSD: CHANGES-9.3,v 1.1.2.108 2022/06/17 15:26:31 martin Exp $ A complete list of changes from the NetBSD 9.2 release to the NetBSD 9.3 release: @@ -1838,3 +1838,8 @@ sys/arch/hppa/hppa/pmap.c 1.120 PR 56867: purge the translations from the TLBs in pmap_procwr. [skrll, ticket #1474] +sys/miscfs/procfs/procfs_vnops.c 1.229 + + procfs: add missing permission check. + [shm, ticket #1475] +
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Fri Jun 17 15:26:31 UTC 2022 Modified Files: src/doc [netbsd-9]: CHANGES-9.3 Log Message: Ticket #1475 To generate a diff of this commit: cvs rdiff -u -r1.1.2.107 -r1.1.2.108 src/doc/CHANGES-9.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/miscfs/procfs
Module Name:src Committed By: martin Date: Fri Jun 17 15:25:21 UTC 2022 Modified Files: src/sys/miscfs/procfs [netbsd-9]: procfs_vnops.c Log Message: Pull up following revision(s) (requested by shm in ticket #1475): sys/miscfs/procfs/procfs_vnops.c: revision 1.229 Add missing permission check To generate a diff of this commit: cvs rdiff -u -r1.206.4.1 -r1.206.4.2 src/sys/miscfs/procfs/procfs_vnops.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/miscfs/procfs/procfs_vnops.c diff -u src/sys/miscfs/procfs/procfs_vnops.c:1.206.4.1 src/sys/miscfs/procfs/procfs_vnops.c:1.206.4.2 --- src/sys/miscfs/procfs/procfs_vnops.c:1.206.4.1 Sun Sep 1 11:02:27 2019 +++ src/sys/miscfs/procfs/procfs_vnops.c Fri Jun 17 15:25:21 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: procfs_vnops.c,v 1.206.4.1 2019/09/01 11:02:27 martin Exp $ */ +/* $NetBSD: procfs_vnops.c,v 1.206.4.2 2022/06/17 15:25:21 martin Exp $ */ /*- * Copyright (c) 2006, 2007, 2008 The NetBSD Foundation, Inc. @@ -105,7 +105,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: procfs_vnops.c,v 1.206.4.1 2019/09/01 11:02:27 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: procfs_vnops.c,v 1.206.4.2 2022/06/17 15:25:21 martin Exp $"); #include #include @@ -1022,6 +1022,9 @@ procfs_lookup(void *v) *vpp = NULL; + if ((error = VOP_ACCESS(dvp, VEXEC, cnp->cn_cred)) != 0) + return (error); + if (cnp->cn_nameiop == DELETE || cnp->cn_nameiop == RENAME) return (EROFS);
CVS commit: [netbsd-9] src/sys/miscfs/procfs
Module Name:src Committed By: martin Date: Fri Jun 17 15:25:21 UTC 2022 Modified Files: src/sys/miscfs/procfs [netbsd-9]: procfs_vnops.c Log Message: Pull up following revision(s) (requested by shm in ticket #1475): sys/miscfs/procfs/procfs_vnops.c: revision 1.229 Add missing permission check To generate a diff of this commit: cvs rdiff -u -r1.206.4.1 -r1.206.4.2 src/sys/miscfs/procfs/procfs_vnops.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/usr.sbin/sysinst/arch
On Fri, 17 Jun 2022 at 15:31, Izumi Tsutsui wrote: > > > > Modified Files: > > > src/usr.sbin/sysinst/arch/atari: Makefile > > > src/usr.sbin/sysinst/arch/hp300: Makefile > > > src/usr.sbin/sysinst/arch/luna68k: Makefile > > > src/usr.sbin/sysinst/arch/news68k: Makefile > > > src/usr.sbin/sysinst/arch/newsmips: Makefile > > > src/usr.sbin/sysinst/arch/x68k: Makefile > > > > > > Log Message: > > > Pull SMALLPROG stuff to disable unnecessary partitioning methods etc. > > > > I'm a bit concerned about the CHECK_ENTROPY part. This has a good chance > > of resulting in a inferior user experience, so is that really worth > > saving a few bytes? > > - ramdiskbin with CHECK_ENTROPY requires extra 7000 bytes, at least on > m68k, so poor tier-II ports that have size restrictions on install media > or use slow floppies rather prefer smaller binaries > - CHECK_ENTROPY has been added after netbsd-9 was branched so I guess > ordinary release users won't notice differences > - actually sysinst(8) itself has been broken on several these ports > hp300 (PR/55197), luna68k (PR/55058), and x68k (PR/55384 etc.) > since netbsd-9, so it would be much more important to bring them > installable state for better user experience > - src/distrib/atari/floppies/common/Makefile.images already has > NO_PROGRESS due to 1440KB restriction, and users (including me) > will rather prefer to restore progress bar on ftp for better experience > - if you would like to discuss about pros and cons without numbers, > maybe it would be worth to try installation on various emulators > and describe actual experiences Just wondering - might it be worth an option for a SMALLPROG built sysinst to be able to exec the version on an installed filesystem - could allow the SMALLPROG built sysinst to exclude check_entropy() and even config_menu, at the cost of the extra faff to switch between the versions (I'm assuming a full-fat sysinst could gain a '--from-install-path X' or similar to know how to get back to the base version. Of course, we could take a page from the sun miniroot install and have a OHGODITSSOSMALLPROG version which just knows enough to partition and disk, get the miniroot kernel+fs image written to the swap partition and then reboot into it. This would need kexec, or something like pivot_root and the ability to free the in memory filesystem (which would be cool features to have generally). Anyway, random ideas, and thanks again to tsutsui@ for all the work on m68k NetBSD :) David
Re: CVS commit: src/usr.sbin/sysinst/arch
> > Modified Files: > > src/usr.sbin/sysinst/arch/atari: Makefile > > src/usr.sbin/sysinst/arch/hp300: Makefile > > src/usr.sbin/sysinst/arch/luna68k: Makefile > > src/usr.sbin/sysinst/arch/news68k: Makefile > > src/usr.sbin/sysinst/arch/newsmips: Makefile > > src/usr.sbin/sysinst/arch/x68k: Makefile > > > > Log Message: > > Pull SMALLPROG stuff to disable unnecessary partitioning methods etc. > > I'm a bit concerned about the CHECK_ENTROPY part. This has a good chance > of resulting in a inferior user experience, so is that really worth > saving a few bytes? - ramdiskbin with CHECK_ENTROPY requires extra 7000 bytes, at least on m68k, so poor tier-II ports that have size restrictions on install media or use slow floppies rather prefer smaller binaries - CHECK_ENTROPY has been added after netbsd-9 was branched so I guess ordinary release users won't notice differences - actually sysinst(8) itself has been broken on several these ports hp300 (PR/55197), luna68k (PR/55058), and x68k (PR/55384 etc.) since netbsd-9, so it would be much more important to bring them installable state for better user experience - src/distrib/atari/floppies/common/Makefile.images already has NO_PROGRESS due to 1440KB restriction, and users (including me) will rather prefer to restore progress bar on ftp for better experience - if you would like to discuss about pros and cons without numbers, maybe it would be worth to try installation on various emulators and describe actual experiences --- Izumi Tsutsui
CVS commit: src/sys/miscfs/procfs
Module Name:src Committed By: shm Date: Fri Jun 17 14:30:37 UTC 2022 Modified Files: src/sys/miscfs/procfs: procfs_vnops.c Log Message: Add missing permission check To generate a diff of this commit: cvs rdiff -u -r1.228 -r1.229 src/sys/miscfs/procfs/procfs_vnops.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/miscfs/procfs/procfs_vnops.c diff -u src/sys/miscfs/procfs/procfs_vnops.c:1.228 src/sys/miscfs/procfs/procfs_vnops.c:1.229 --- src/sys/miscfs/procfs/procfs_vnops.c:1.228 Sun Mar 27 17:10:56 2022 +++ src/sys/miscfs/procfs/procfs_vnops.c Fri Jun 17 14:30:37 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: procfs_vnops.c,v 1.228 2022/03/27 17:10:56 christos Exp $ */ +/* $NetBSD: procfs_vnops.c,v 1.229 2022/06/17 14:30:37 shm Exp $ */ /*- * Copyright (c) 2006, 2007, 2008, 2020 The NetBSD Foundation, Inc. @@ -105,7 +105,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: procfs_vnops.c,v 1.228 2022/03/27 17:10:56 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: procfs_vnops.c,v 1.229 2022/06/17 14:30:37 shm Exp $"); #include #include @@ -976,6 +976,9 @@ procfs_lookup(void *v) *vpp = NULL; + if ((error = VOP_ACCESS(dvp, VEXEC, cnp->cn_cred)) != 0) + return (error); + if (cnp->cn_nameiop == DELETE || cnp->cn_nameiop == RENAME) return (EROFS);
CVS commit: src/sys/miscfs/procfs
Module Name:src Committed By: shm Date: Fri Jun 17 14:30:37 UTC 2022 Modified Files: src/sys/miscfs/procfs: procfs_vnops.c Log Message: Add missing permission check To generate a diff of this commit: cvs rdiff -u -r1.228 -r1.229 src/sys/miscfs/procfs/procfs_vnops.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/sysinst/arch/sparc64
Module Name:src Committed By: tsutsui Date: Fri Jun 17 14:08:54 UTC 2022 Modified Files: src/usr.sbin/sysinst/arch/sparc64: md.h Log Message: Restore DEFSWAPSIZE value to (-1) to determine it by get_ramsize(). Thanks hannken@ for informing this botch. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/sysinst/arch/sparc64/md.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.sbin/sysinst/arch/sparc64/md.h diff -u src/usr.sbin/sysinst/arch/sparc64/md.h:1.7 src/usr.sbin/sysinst/arch/sparc64/md.h:1.8 --- src/usr.sbin/sysinst/arch/sparc64/md.h:1.7 Fri Jun 17 09:00:08 2022 +++ src/usr.sbin/sysinst/arch/sparc64/md.h Fri Jun 17 14:08:54 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: md.h,v 1.7 2022/06/17 09:00:08 hannken Exp $ */ +/* $NetBSD: md.h,v 1.8 2022/06/17 14:08:54 tsutsui Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -35,8 +35,6 @@ /* md.h -- Machine specific definitions for the sparc */ -/* Constants and defines */ - /* * Symbolic names for disk partitions. */ @@ -47,7 +45,7 @@ #define PART_FIRST_FREE PART_D #define DEFROOTSIZE 64 /* Default root size */ -#define DEFSWAPSIZE 64 /* Default swap size */ +#define DEFSWAPSIZE (-1) /* Default swap size */ #define DEFVARSIZE 32 /* Default /var size, if created */ #define DEFUSRSIZE 1200 /* Default /usr size, if /home */ #define XNEEDMB 300 /* Extra megs for full X installation */
CVS commit: src/usr.sbin/sysinst/arch/sparc64
Module Name:src Committed By: tsutsui Date: Fri Jun 17 14:08:54 UTC 2022 Modified Files: src/usr.sbin/sysinst/arch/sparc64: md.h Log Message: Restore DEFSWAPSIZE value to (-1) to determine it by get_ramsize(). Thanks hannken@ for informing this botch. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/sysinst/arch/sparc64/md.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/sysinst/arch/sparc64
Module Name:src Committed By: hannken Date: Fri Jun 17 09:00:08 UTC 2022 Modified Files: src/usr.sbin/sysinst/arch/sparc64: md.h Log Message: Remove now obsolete "#define DEFSWAPSIZE (-1)" to fix the build. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/sysinst/arch/sparc64/md.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.sbin/sysinst/arch/sparc64/md.h diff -u src/usr.sbin/sysinst/arch/sparc64/md.h:1.6 src/usr.sbin/sysinst/arch/sparc64/md.h:1.7 --- src/usr.sbin/sysinst/arch/sparc64/md.h:1.6 Thu Jun 16 14:03:39 2022 +++ src/usr.sbin/sysinst/arch/sparc64/md.h Fri Jun 17 09:00:08 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: md.h,v 1.6 2022/06/16 14:03:39 tsutsui Exp $ */ +/* $NetBSD: md.h,v 1.7 2022/06/17 09:00:08 hannken Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -36,7 +36,6 @@ /* md.h -- Machine specific definitions for the sparc */ /* Constants and defines */ -#define DEFSWAPSIZE (-1) /* * Symbolic names for disk partitions.
CVS commit: src/usr.sbin/sysinst/arch/sparc64
Module Name:src Committed By: hannken Date: Fri Jun 17 09:00:08 UTC 2022 Modified Files: src/usr.sbin/sysinst/arch/sparc64: md.h Log Message: Remove now obsolete "#define DEFSWAPSIZE (-1)" to fix the build. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/sysinst/arch/sparc64/md.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/usr.bin/xlint
Module Name:src
Committed By: rillig
Date: Fri Jun 17 07:06:50 UTC 2022
Modified Files:
src/tests/usr.bin/xlint: check-expect.lua
Log Message:
tests/lint: do not interpret 'expect:' comments, only 'expect+-n:'
Only the tests in msg_*.c had used the short form of the 'expect:'
comments. The other tests used the more detailed variant 'expect+n:' or
'expect-n:'.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/tests/usr.bin/xlint/check-expect.lua
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/xlint/check-expect.lua
diff -u src/tests/usr.bin/xlint/check-expect.lua:1.18 src/tests/usr.bin/xlint/check-expect.lua:1.19
--- src/tests/usr.bin/xlint/check-expect.lua:1.18 Fri Jun 17 06:59:16 2022
+++ src/tests/usr.bin/xlint/check-expect.lua Fri Jun 17 07:06:50 2022
@@ -1,11 +1,11 @@
#! /usr/bin/lua
--- $NetBSD: check-expect.lua,v 1.18 2022/06/17 06:59:16 rillig Exp $
+-- $NetBSD: check-expect.lua,v 1.19 2022/06/17 07:06:50 rillig Exp $
--[[
usage: lua ./check-expect.lua *.c
-Check that the /* expect: ... */ comments in the .c source files match the
+Check that the /* expect+-n: ... */ comments in the .c source files match the
actual messages found in the corresponding .exp files.
]]
@@ -60,15 +60,6 @@ local function load_expect_comments_from
add_expectation(tonumber(offset), comment)
end
--- TODO: Remove these comments for all tests, as they often contain
--- only the raw message ID, without the actual message text,
--- which makes them harder to understand without looking up more context.
-for comment in line:gmatch("/%* expect: (.-) %*/") do
- if not fname:match("^msg_") then
-add_expectation(0, comment)
- end
-end
-
pp_lineno = pp_lineno + 1
local ppl_lineno, ppl_fname = line:match("^#%s*(%d+)%s+\"([^\"]+)\"")
CVS commit: src/tests/usr.bin/xlint
Module Name:src Committed By: rillig Date: Fri Jun 17 07:06:50 UTC 2022 Modified Files: src/tests/usr.bin/xlint: check-expect.lua Log Message: tests/lint: do not interpret 'expect:' comments, only 'expect+-n:' Only the tests in msg_*.c had used the short form of the 'expect:' comments. The other tests used the more detailed variant 'expect+n:' or 'expect-n:'. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/tests/usr.bin/xlint/check-expect.lua Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/usr.bin/xlint
Module Name:src
Committed By: rillig
Date: Fri Jun 17 06:59:16 UTC 2022
Modified Files:
src/tests/usr.bin/xlint: check-expect.lua
src/tests/usr.bin/xlint/lint1: msg_300.c msg_300.exp msg_301.c
msg_301.exp msg_302.c msg_302.exp msg_306.c msg_306.exp msg_308.c
msg_308.exp msg_309.c msg_309.exp msg_310.c msg_310.exp msg_311.c
msg_311.exp msg_316.c msg_316.exp msg_318.c msg_318.exp msg_320.c
msg_320.exp msg_322.c msg_322.exp msg_324.c msg_324.exp msg_325.c
msg_325.exp msg_326.c msg_326.exp msg_327.c msg_327.exp msg_329.c
msg_329.exp msg_330.c msg_330.exp msg_331.c msg_331.exp msg_332.c
msg_332.exp msg_334.c msg_334.exp msg_335.c msg_335.exp msg_336.c
msg_336.exp msg_337.c msg_337.exp msg_338.c msg_338.exp msg_339.c
msg_339.exp msg_340.c msg_340.exp msg_343.c msg_343.exp
Log Message:
tests/lint: add more details to tests from msg_300 until msg_343
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/tests/usr.bin/xlint/check-expect.lua
cvs rdiff -u -r1.2 -r1.3 src/tests/usr.bin/xlint/lint1/msg_300.c \
src/tests/usr.bin/xlint/lint1/msg_300.exp \
src/tests/usr.bin/xlint/lint1/msg_301.c \
src/tests/usr.bin/xlint/lint1/msg_301.exp \
src/tests/usr.bin/xlint/lint1/msg_302.c \
src/tests/usr.bin/xlint/lint1/msg_302.exp \
src/tests/usr.bin/xlint/lint1/msg_306.c \
src/tests/usr.bin/xlint/lint1/msg_306.exp \
src/tests/usr.bin/xlint/lint1/msg_310.c \
src/tests/usr.bin/xlint/lint1/msg_310.exp \
src/tests/usr.bin/xlint/lint1/msg_311.c \
src/tests/usr.bin/xlint/lint1/msg_311.exp \
src/tests/usr.bin/xlint/lint1/msg_316.c \
src/tests/usr.bin/xlint/lint1/msg_316.exp \
src/tests/usr.bin/xlint/lint1/msg_318.c \
src/tests/usr.bin/xlint/lint1/msg_318.exp \
src/tests/usr.bin/xlint/lint1/msg_320.c \
src/tests/usr.bin/xlint/lint1/msg_320.exp \
src/tests/usr.bin/xlint/lint1/msg_322.c \
src/tests/usr.bin/xlint/lint1/msg_322.exp \
src/tests/usr.bin/xlint/lint1/msg_325.c \
src/tests/usr.bin/xlint/lint1/msg_325.exp \
src/tests/usr.bin/xlint/lint1/msg_326.c \
src/tests/usr.bin/xlint/lint1/msg_326.exp \
src/tests/usr.bin/xlint/lint1/msg_334.exp \
src/tests/usr.bin/xlint/lint1/msg_335.exp \
src/tests/usr.bin/xlint/lint1/msg_339.c
cvs rdiff -u -r1.6 -r1.7 src/tests/usr.bin/xlint/lint1/msg_308.c
cvs rdiff -u -r1.5 -r1.6 src/tests/usr.bin/xlint/lint1/msg_308.exp \
src/tests/usr.bin/xlint/lint1/msg_324.c \
src/tests/usr.bin/xlint/lint1/msg_327.c \
src/tests/usr.bin/xlint/lint1/msg_338.exp \
src/tests/usr.bin/xlint/lint1/msg_343.c \
src/tests/usr.bin/xlint/lint1/msg_343.exp
cvs rdiff -u -r1.4 -r1.5 src/tests/usr.bin/xlint/lint1/msg_309.c \
src/tests/usr.bin/xlint/lint1/msg_309.exp \
src/tests/usr.bin/xlint/lint1/msg_327.exp \
src/tests/usr.bin/xlint/lint1/msg_329.exp \
src/tests/usr.bin/xlint/lint1/msg_330.c \
src/tests/usr.bin/xlint/lint1/msg_340.exp
cvs rdiff -u -r1.3 -r1.4 src/tests/usr.bin/xlint/lint1/msg_324.exp \
src/tests/usr.bin/xlint/lint1/msg_329.c \
src/tests/usr.bin/xlint/lint1/msg_330.exp \
src/tests/usr.bin/xlint/lint1/msg_331.c \
src/tests/usr.bin/xlint/lint1/msg_331.exp \
src/tests/usr.bin/xlint/lint1/msg_332.c \
src/tests/usr.bin/xlint/lint1/msg_332.exp \
src/tests/usr.bin/xlint/lint1/msg_336.c \
src/tests/usr.bin/xlint/lint1/msg_336.exp \
src/tests/usr.bin/xlint/lint1/msg_337.c \
src/tests/usr.bin/xlint/lint1/msg_337.exp \
src/tests/usr.bin/xlint/lint1/msg_340.c
cvs rdiff -u -r1.1 -r1.2 src/tests/usr.bin/xlint/lint1/msg_334.c \
src/tests/usr.bin/xlint/lint1/msg_335.c \
src/tests/usr.bin/xlint/lint1/msg_339.exp
cvs rdiff -u -r1.7 -r1.8 src/tests/usr.bin/xlint/lint1/msg_338.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/xlint/check-expect.lua
diff -u src/tests/usr.bin/xlint/check-expect.lua:1.17 src/tests/usr.bin/xlint/check-expect.lua:1.18
--- src/tests/usr.bin/xlint/check-expect.lua:1.17 Thu Jun 16 21:24:41 2022
+++ src/tests/usr.bin/xlint/check-expect.lua Fri Jun 17 06:59:16 2022
@@ -1,5 +1,5 @@
#! /usr/bin/lua
--- $NetBSD: check-expect.lua,v 1.17 2022/06/16 21:24:41 rillig Exp $
+-- $NetBSD: check-expect.lua,v 1.18 2022/06/17 06:59:16 rillig Exp $
--[[
@@ -64,7 +64,7 @@ local function load_expect_comments_from
-- only the raw message ID, without the actual message text,
-- which makes them harder to understand without looking up more context.
for comment in line:gmatch("/%* expect: (.-) %*/") do
- if not fname:match("^msg_[012]") then
+ if not fname:match("^msg_") then
add_expectation(0, comment)
end
end
Index: src/tests/usr.bin/xlint/lint1/msg_300.c
diff -u src/tests/usr.bin/xlint/lint1/msg_300.c:1.2 src/tests/usr.bin/xl
CVS commit: src/tests/usr.bin/xlint
Module Name:src Committed By: rillig Date: Fri Jun 17 06:59:16 UTC 2022 Modified Files: src/tests/usr.bin/xlint: check-expect.lua src/tests/usr.bin/xlint/lint1: msg_300.c msg_300.exp msg_301.c msg_301.exp msg_302.c msg_302.exp msg_306.c msg_306.exp msg_308.c msg_308.exp msg_309.c msg_309.exp msg_310.c msg_310.exp msg_311.c msg_311.exp msg_316.c msg_316.exp msg_318.c msg_318.exp msg_320.c msg_320.exp msg_322.c msg_322.exp msg_324.c msg_324.exp msg_325.c msg_325.exp msg_326.c msg_326.exp msg_327.c msg_327.exp msg_329.c msg_329.exp msg_330.c msg_330.exp msg_331.c msg_331.exp msg_332.c msg_332.exp msg_334.c msg_334.exp msg_335.c msg_335.exp msg_336.c msg_336.exp msg_337.c msg_337.exp msg_338.c msg_338.exp msg_339.c msg_339.exp msg_340.c msg_340.exp msg_343.c msg_343.exp Log Message: tests/lint: add more details to tests from msg_300 until msg_343 To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/tests/usr.bin/xlint/check-expect.lua cvs rdiff -u -r1.2 -r1.3 src/tests/usr.bin/xlint/lint1/msg_300.c \ src/tests/usr.bin/xlint/lint1/msg_300.exp \ src/tests/usr.bin/xlint/lint1/msg_301.c \ src/tests/usr.bin/xlint/lint1/msg_301.exp \ src/tests/usr.bin/xlint/lint1/msg_302.c \ src/tests/usr.bin/xlint/lint1/msg_302.exp \ src/tests/usr.bin/xlint/lint1/msg_306.c \ src/tests/usr.bin/xlint/lint1/msg_306.exp \ src/tests/usr.bin/xlint/lint1/msg_310.c \ src/tests/usr.bin/xlint/lint1/msg_310.exp \ src/tests/usr.bin/xlint/lint1/msg_311.c \ src/tests/usr.bin/xlint/lint1/msg_311.exp \ src/tests/usr.bin/xlint/lint1/msg_316.c \ src/tests/usr.bin/xlint/lint1/msg_316.exp \ src/tests/usr.bin/xlint/lint1/msg_318.c \ src/tests/usr.bin/xlint/lint1/msg_318.exp \ src/tests/usr.bin/xlint/lint1/msg_320.c \ src/tests/usr.bin/xlint/lint1/msg_320.exp \ src/tests/usr.bin/xlint/lint1/msg_322.c \ src/tests/usr.bin/xlint/lint1/msg_322.exp \ src/tests/usr.bin/xlint/lint1/msg_325.c \ src/tests/usr.bin/xlint/lint1/msg_325.exp \ src/tests/usr.bin/xlint/lint1/msg_326.c \ src/tests/usr.bin/xlint/lint1/msg_326.exp \ src/tests/usr.bin/xlint/lint1/msg_334.exp \ src/tests/usr.bin/xlint/lint1/msg_335.exp \ src/tests/usr.bin/xlint/lint1/msg_339.c cvs rdiff -u -r1.6 -r1.7 src/tests/usr.bin/xlint/lint1/msg_308.c cvs rdiff -u -r1.5 -r1.6 src/tests/usr.bin/xlint/lint1/msg_308.exp \ src/tests/usr.bin/xlint/lint1/msg_324.c \ src/tests/usr.bin/xlint/lint1/msg_327.c \ src/tests/usr.bin/xlint/lint1/msg_338.exp \ src/tests/usr.bin/xlint/lint1/msg_343.c \ src/tests/usr.bin/xlint/lint1/msg_343.exp cvs rdiff -u -r1.4 -r1.5 src/tests/usr.bin/xlint/lint1/msg_309.c \ src/tests/usr.bin/xlint/lint1/msg_309.exp \ src/tests/usr.bin/xlint/lint1/msg_327.exp \ src/tests/usr.bin/xlint/lint1/msg_329.exp \ src/tests/usr.bin/xlint/lint1/msg_330.c \ src/tests/usr.bin/xlint/lint1/msg_340.exp cvs rdiff -u -r1.3 -r1.4 src/tests/usr.bin/xlint/lint1/msg_324.exp \ src/tests/usr.bin/xlint/lint1/msg_329.c \ src/tests/usr.bin/xlint/lint1/msg_330.exp \ src/tests/usr.bin/xlint/lint1/msg_331.c \ src/tests/usr.bin/xlint/lint1/msg_331.exp \ src/tests/usr.bin/xlint/lint1/msg_332.c \ src/tests/usr.bin/xlint/lint1/msg_332.exp \ src/tests/usr.bin/xlint/lint1/msg_336.c \ src/tests/usr.bin/xlint/lint1/msg_336.exp \ src/tests/usr.bin/xlint/lint1/msg_337.c \ src/tests/usr.bin/xlint/lint1/msg_337.exp \ src/tests/usr.bin/xlint/lint1/msg_340.c cvs rdiff -u -r1.1 -r1.2 src/tests/usr.bin/xlint/lint1/msg_334.c \ src/tests/usr.bin/xlint/lint1/msg_335.c \ src/tests/usr.bin/xlint/lint1/msg_339.exp cvs rdiff -u -r1.7 -r1.8 src/tests/usr.bin/xlint/lint1/msg_338.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
