CVS commit: src/sbin/newfs_udf
Module Name:src
Committed By: reinoud
Date: Fri Apr 22 21:22:15 UTC 2022
Modified Files:
src/sbin/newfs_udf: udf_core.c
Log Message:
Fix endian issues with UDF extended attributes
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sbin/newfs_udf/udf_core.c
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_udf/udf_core.c
diff -u src/sbin/newfs_udf/udf_core.c:1.3 src/sbin/newfs_udf/udf_core.c:1.4
--- src/sbin/newfs_udf/udf_core.c:1.3 Fri Apr 22 20:56:46 2022
+++ src/sbin/newfs_udf/udf_core.c Fri Apr 22 21:22:14 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: udf_core.c,v 1.3 2022/04/22 20:56:46 reinoud Exp $ */
+/* $NetBSD: udf_core.c,v 1.4 2022/04/22 21:22:14 reinoud Exp $ */
/*
* Copyright (c) 2006, 2008, 2021, 2022 Reinoud Zandijk
@@ -30,7 +30,7 @@
#endif
#include
-__RCSID("$NetBSD: udf_core.c,v 1.3 2022/04/22 20:56:46 reinoud Exp $");
+__RCSID("$NetBSD: udf_core.c,v 1.4 2022/04/22 21:22:14 reinoud Exp $");
#include
#include
@@ -2269,11 +2269,11 @@ udf_extattr_search_intern(union dscrptr
if ((a_l == 0) || (a_l > l_ea))
return EINVAL;
- if (attrhdr->type != sattr)
+ if (udf_rw32(attrhdr->type) != sattr)
goto next_attribute;
/* we might have found it! */
- if (attrhdr->type < 2048) { /* Ecma-167 attribute */
+ if (udf_rw32(attrhdr->type) < 2048) { /* Ecma-167 attribute */
*offsetp = offset;
*lengthp = a_l;
return 0; /* success */
CVS commit: src/sbin/newfs_udf
Module Name:src Committed By: reinoud Date: Fri Apr 22 21:22:15 UTC 2022 Modified Files: src/sbin/newfs_udf: udf_core.c Log Message: Fix endian issues with UDF extended attributes To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sbin/newfs_udf/udf_core.c 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 Apr 22 21:21:20 UTC 2022 Modified Files: src/tests/usr.bin/indent: Makefile fmt_block.c fmt_decl.c fmt_else_comment.c fmt_expr.c indent_off_on.c label.c lex_char.c lex_ident.c lex_string.c lsym_binary_op.c lsym_case_label.c lsym_colon.c lsym_comma.c lsym_comment.c lsym_do.c lsym_else.c lsym_eof.c lsym_for.c lsym_form_feed.c lsym_funcname.c lsym_if.c lsym_lbrace.c lsym_lparen_or_lbracket.c lsym_newline.c lsym_offsetof.c lsym_period.c lsym_postfix_op.c lsym_preprocessing.c lsym_question.c lsym_rbrace.c lsym_return.c lsym_rparen_or_rbracket.c lsym_semicolon.c lsym_sizeof.c lsym_storage_class.c lsym_switch.c lsym_tag.c lsym_type_in_parentheses.c lsym_type_outside_parentheses.c lsym_typedef.c lsym_unary_op.c lsym_while.c lsym_word.c opt_P.c opt_T.c opt_bacc.c opt_bad.c opt_badp.c opt_bap.c opt_bap_sob.c opt_bbb.c opt_bc.c opt_bl_br.c opt_bs.c opt_c.c opt_cd.c opt_cdb.c opt_ce.c opt_ci.c opt_cli.c opt_cs.c opt_d.c opt_di.c opt_dj.c opt_eei.c opt_ei.c opt_fbs.c opt_fc1.c opt_fcb.c opt_i.c opt_ip.c opt_l.c opt_lc.c opt_ldi.c opt_lp.c opt_lpl.c opt_pcs.c opt_psl.c opt_sc.c opt_sob.c opt_ta.c opt_ts.c opt_ut.c opt_v.c opt_version.c ps_ind_level.c psym_decl.c psym_do.c psym_do_stmt.c psym_else.c psym_for_exprs.c psym_if_expr.c psym_if_expr_stmt.c psym_if_expr_stmt_else.c psym_lbrace.c psym_rbrace.c psym_semicolon.c psym_stmt.c psym_stmt_list.c psym_switch_expr.c psym_while_expr.c t_errors.sh t_misc.sh t_options.awk t_options.sh token_binary_op.c token_comment.c token_decl.c token_do_stmt.c token_end_of_file.c token_for_exprs.c token_form_feed.c token_funcname.c token_ident.c token_if_expr.c token_if_expr_stmt.c token_if_expr_stmt_else.c token_keyword_do.c token_keyword_do_else.c token_keyword_else.c token_keyword_for_if_while.c token_keyword_struct_union_enum.c token_lbrace.c token_lparen.c token_newline.c token_period.c token_postfix_op.c token_preprocessing.c token_rbrace.c token_rparen.c token_semicolon.c token_stmt.c token_stmt_list.c token_storage_class.c token_string_prefix.c token_switch_expr.c token_type_def.c token_unary_op.c token_while_expr.c src/usr.bin/indent: parse.c Log Message: indent: remove FreeBSD IDs Most of the IDs were empty anyway. To generate a diff of this commit: cvs rdiff -u -r1.39 -r1.40 src/tests/usr.bin/indent/Makefile cvs rdiff -u -r1.2 -r1.3 src/tests/usr.bin/indent/fmt_block.c \ src/tests/usr.bin/indent/fmt_else_comment.c \ src/tests/usr.bin/indent/fmt_expr.c src/tests/usr.bin/indent/label.c \ src/tests/usr.bin/indent/lex_char.c src/tests/usr.bin/indent/lex_string.c \ src/tests/usr.bin/indent/lsym_binary_op.c \ src/tests/usr.bin/indent/lsym_offsetof.c \ src/tests/usr.bin/indent/lsym_postfix_op.c \ src/tests/usr.bin/indent/lsym_preprocessing.c \ src/tests/usr.bin/indent/lsym_question.c \ src/tests/usr.bin/indent/lsym_return.c \ src/tests/usr.bin/indent/lsym_tag.c src/tests/usr.bin/indent/opt_T.c \ src/tests/usr.bin/indent/opt_bap_sob.c src/tests/usr.bin/indent/opt_c.c \ src/tests/usr.bin/indent/opt_cd.c src/tests/usr.bin/indent/opt_d.c \ src/tests/usr.bin/indent/opt_i.c src/tests/usr.bin/indent/opt_l.c \ src/tests/usr.bin/indent/opt_lc.c src/tests/usr.bin/indent/opt_ta.c \ src/tests/usr.bin/indent/opt_version.c \ src/tests/usr.bin/indent/psym_for_exprs.c \ src/tests/usr.bin/indent/psym_switch_expr.c \ src/tests/usr.bin/indent/psym_while_expr.c \ src/tests/usr.bin/indent/token_for_exprs.c \ src/tests/usr.bin/indent/token_newline.c \ src/tests/usr.bin/indent/token_period.c \ src/tests/usr.bin/indent/token_preprocessing.c \ src/tests/usr.bin/indent/token_semicolon.c \ src/tests/usr.bin/indent/token_string_prefix.c \ src/tests/usr.bin/indent/token_unary_op.c \ src/tests/usr.bin/indent/token_while_expr.c cvs rdiff -u -r1.32 -r1.33 src/tests/usr.bin/indent/fmt_decl.c cvs rdiff -u -r1.6 -r1.7 src/tests/usr.bin/indent/indent_off_on.c \ src/tests/usr.bin/indent/opt_bacc.c src/tests/usr.bin/indent/opt_badp.c \ src/tests/usr.bin/indent/opt_cdb.c src/tests/usr.bin/indent/opt_di.c \ src/tests/usr.bin/indent/opt_eei.c src/tests/usr.bin/indent/opt_fc1.c \ src/tests/usr.bin/indent/opt_psl.c src/tests/usr.bin/indent/opt_v.c cvs rdiff -u -r1.3 -r1.4 src/tests/usr.bin/indent/lex_ident.c \ src/tests/usr.bin/indent/lsym_colon.c \ src/tests/usr.bin/indent/lsym_comma.c \ src/tests/usr.bin/indent/lsym_lbrace.c \ src/tests/usr.bin/indent/lsym_lparen_or_lbracket.c \
CVS commit: src
Module Name:src Committed By: rillig Date: Fri Apr 22 21:21:20 UTC 2022 Modified Files: src/tests/usr.bin/indent: Makefile fmt_block.c fmt_decl.c fmt_else_comment.c fmt_expr.c indent_off_on.c label.c lex_char.c lex_ident.c lex_string.c lsym_binary_op.c lsym_case_label.c lsym_colon.c lsym_comma.c lsym_comment.c lsym_do.c lsym_else.c lsym_eof.c lsym_for.c lsym_form_feed.c lsym_funcname.c lsym_if.c lsym_lbrace.c lsym_lparen_or_lbracket.c lsym_newline.c lsym_offsetof.c lsym_period.c lsym_postfix_op.c lsym_preprocessing.c lsym_question.c lsym_rbrace.c lsym_return.c lsym_rparen_or_rbracket.c lsym_semicolon.c lsym_sizeof.c lsym_storage_class.c lsym_switch.c lsym_tag.c lsym_type_in_parentheses.c lsym_type_outside_parentheses.c lsym_typedef.c lsym_unary_op.c lsym_while.c lsym_word.c opt_P.c opt_T.c opt_bacc.c opt_bad.c opt_badp.c opt_bap.c opt_bap_sob.c opt_bbb.c opt_bc.c opt_bl_br.c opt_bs.c opt_c.c opt_cd.c opt_cdb.c opt_ce.c opt_ci.c opt_cli.c opt_cs.c opt_d.c opt_di.c opt_dj.c opt_eei.c opt_ei.c opt_fbs.c opt_fc1.c opt_fcb.c opt_i.c opt_ip.c opt_l.c opt_lc.c opt_ldi.c opt_lp.c opt_lpl.c opt_pcs.c opt_psl.c opt_sc.c opt_sob.c opt_ta.c opt_ts.c opt_ut.c opt_v.c opt_version.c ps_ind_level.c psym_decl.c psym_do.c psym_do_stmt.c psym_else.c psym_for_exprs.c psym_if_expr.c psym_if_expr_stmt.c psym_if_expr_stmt_else.c psym_lbrace.c psym_rbrace.c psym_semicolon.c psym_stmt.c psym_stmt_list.c psym_switch_expr.c psym_while_expr.c t_errors.sh t_misc.sh t_options.awk t_options.sh token_binary_op.c token_comment.c token_decl.c token_do_stmt.c token_end_of_file.c token_for_exprs.c token_form_feed.c token_funcname.c token_ident.c token_if_expr.c token_if_expr_stmt.c token_if_expr_stmt_else.c token_keyword_do.c token_keyword_do_else.c token_keyword_else.c token_keyword_for_if_while.c token_keyword_struct_union_enum.c token_lbrace.c token_lparen.c token_newline.c token_period.c token_postfix_op.c token_preprocessing.c token_rbrace.c token_rparen.c token_semicolon.c token_stmt.c token_stmt_list.c token_storage_class.c token_string_prefix.c token_switch_expr.c token_type_def.c token_unary_op.c token_while_expr.c src/usr.bin/indent: parse.c Log Message: indent: remove FreeBSD IDs Most of the IDs were empty anyway. To generate a diff of this commit: cvs rdiff -u -r1.39 -r1.40 src/tests/usr.bin/indent/Makefile cvs rdiff -u -r1.2 -r1.3 src/tests/usr.bin/indent/fmt_block.c \ src/tests/usr.bin/indent/fmt_else_comment.c \ src/tests/usr.bin/indent/fmt_expr.c src/tests/usr.bin/indent/label.c \ src/tests/usr.bin/indent/lex_char.c src/tests/usr.bin/indent/lex_string.c \ src/tests/usr.bin/indent/lsym_binary_op.c \ src/tests/usr.bin/indent/lsym_offsetof.c \ src/tests/usr.bin/indent/lsym_postfix_op.c \ src/tests/usr.bin/indent/lsym_preprocessing.c \ src/tests/usr.bin/indent/lsym_question.c \ src/tests/usr.bin/indent/lsym_return.c \ src/tests/usr.bin/indent/lsym_tag.c src/tests/usr.bin/indent/opt_T.c \ src/tests/usr.bin/indent/opt_bap_sob.c src/tests/usr.bin/indent/opt_c.c \ src/tests/usr.bin/indent/opt_cd.c src/tests/usr.bin/indent/opt_d.c \ src/tests/usr.bin/indent/opt_i.c src/tests/usr.bin/indent/opt_l.c \ src/tests/usr.bin/indent/opt_lc.c src/tests/usr.bin/indent/opt_ta.c \ src/tests/usr.bin/indent/opt_version.c \ src/tests/usr.bin/indent/psym_for_exprs.c \ src/tests/usr.bin/indent/psym_switch_expr.c \ src/tests/usr.bin/indent/psym_while_expr.c \ src/tests/usr.bin/indent/token_for_exprs.c \ src/tests/usr.bin/indent/token_newline.c \ src/tests/usr.bin/indent/token_period.c \ src/tests/usr.bin/indent/token_preprocessing.c \ src/tests/usr.bin/indent/token_semicolon.c \ src/tests/usr.bin/indent/token_string_prefix.c \ src/tests/usr.bin/indent/token_unary_op.c \ src/tests/usr.bin/indent/token_while_expr.c cvs rdiff -u -r1.32 -r1.33 src/tests/usr.bin/indent/fmt_decl.c cvs rdiff -u -r1.6 -r1.7 src/tests/usr.bin/indent/indent_off_on.c \ src/tests/usr.bin/indent/opt_bacc.c src/tests/usr.bin/indent/opt_badp.c \ src/tests/usr.bin/indent/opt_cdb.c src/tests/usr.bin/indent/opt_di.c \ src/tests/usr.bin/indent/opt_eei.c src/tests/usr.bin/indent/opt_fc1.c \ src/tests/usr.bin/indent/opt_psl.c src/tests/usr.bin/indent/opt_v.c cvs rdiff -u -r1.3 -r1.4 src/tests/usr.bin/indent/lex_ident.c \ src/tests/usr.bin/indent/lsym_colon.c \ src/tests/usr.bin/indent/lsym_comma.c \ src/tests/usr.bin/indent/lsym_lbrace.c \ src/tests/usr.bin/indent/lsym_lparen_or_lbracket.c \
CVS commit: src/sys/fs/udf
Module Name:src
Committed By: reinoud
Date: Fri Apr 22 21:21:10 UTC 2022
Modified Files:
src/sys/fs/udf: udf_subr.c
Log Message:
Fix endian issue with UDF extended attribute handling
To generate a diff of this commit:
cvs rdiff -u -r1.168 -r1.169 src/sys/fs/udf/udf_subr.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/fs/udf/udf_subr.c
diff -u src/sys/fs/udf/udf_subr.c:1.168 src/sys/fs/udf/udf_subr.c:1.169
--- src/sys/fs/udf/udf_subr.c:1.168 Sun Apr 10 09:50:46 2022
+++ src/sys/fs/udf/udf_subr.c Fri Apr 22 21:21:10 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: udf_subr.c,v 1.168 2022/04/10 09:50:46 andvar Exp $ */
+/* $NetBSD: udf_subr.c,v 1.169 2022/04/22 21:21:10 reinoud Exp $ */
/*
* Copyright (c) 2006, 2008 Reinoud Zandijk
@@ -29,7 +29,7 @@
#include
#ifndef lint
-__KERNEL_RCSID(0, "$NetBSD: udf_subr.c,v 1.168 2022/04/10 09:50:46 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udf_subr.c,v 1.169 2022/04/22 21:21:10 reinoud Exp $");
#endif /* not lint */
@@ -2439,11 +2439,11 @@ udf_extattr_search_intern(struct udf_nod
if ((a_l == 0) || (a_l > l_ea))
return EINVAL;
- if (attrhdr->type != sattr)
+ if (udf_rw32(attrhdr->type) != sattr)
goto next_attribute;
/* we might have found it! */
- if (attrhdr->type < 2048) { /* Ecma-167 attribute */
+ if (udf_rw32(attrhdr->type) < 2048) { /* Ecma-167 attribute */
*offsetp = offset;
*lengthp = a_l;
return 0; /* success */
CVS commit: src/sys/fs/udf
Module Name:src Committed By: reinoud Date: Fri Apr 22 21:21:10 UTC 2022 Modified Files: src/sys/fs/udf: udf_subr.c Log Message: Fix endian issue with UDF extended attribute handling To generate a diff of this commit: cvs rdiff -u -r1.168 -r1.169 src/sys/fs/udf/udf_subr.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sbin/fsck_udf
Module Name:src
Committed By: reinoud
Date: Fri Apr 22 21:07:56 UTC 2022
Modified Files:
src/sbin/fsck_udf: main.c
Log Message:
Remove the error condition for these cases; the VAT LVExtension is
missing/corrupt but fsck_udf will reconstruct them anyway.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sbin/fsck_udf/main.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/fsck_udf/main.c
diff -u src/sbin/fsck_udf/main.c:1.9 src/sbin/fsck_udf/main.c:1.10
--- src/sbin/fsck_udf/main.c:1.9 Fri Apr 22 21:00:28 2022
+++ src/sbin/fsck_udf/main.c Fri Apr 22 21:07:56 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.9 2022/04/22 21:00:28 reinoud Exp $ */
+/* $NetBSD: main.c,v 1.10 2022/04/22 21:07:56 reinoud Exp $ */
/*
* Copyright (c) 2022 Reinoud Zandijk
@@ -37,7 +37,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: main.c,v 1.9 2022/04/22 21:00:28 reinoud Exp $");
+__RCSID("$NetBSD: main.c,v 1.10 2022/04/22 21:07:56 reinoud Exp $");
#endif /* not lint */
#include
@@ -1873,6 +1873,7 @@ udf_extract_vat(union dscrptr *dscr, uin
error = udf_extattr_search_intern(dscr, 2048, extstr, , _l);
if (error) {
/* VAT LVExtension extended attribute missing */
+ error = 0;
vat_writeout = 1;
goto ok;
}
@@ -1881,6 +1882,7 @@ udf_extract_vat(union dscrptr *dscr, uin
error = udf_impl_extattr_check(implext);
if (error) {
/* VAT LVExtension checksum failed */
+ error = 0;
vat_writeout = 1;
goto ok;
}
@@ -1888,6 +1890,7 @@ udf_extract_vat(union dscrptr *dscr, uin
/* paranoia */
if (a_l != sizeof(*implext) -2 + udf_rw32(implext->iu_l) + sizeof(lvext)) {
/* VAT LVExtension size doesn't compute */
+ error = 0;
vat_writeout = 1;
goto ok;
}
CVS commit: src/sbin/fsck_udf
Module Name:src Committed By: reinoud Date: Fri Apr 22 21:07:56 UTC 2022 Modified Files: src/sbin/fsck_udf: main.c Log Message: Remove the error condition for these cases; the VAT LVExtension is missing/corrupt but fsck_udf will reconstruct them anyway. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/sbin/fsck_udf/main.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sbin/fsck_udf
Module Name:src
Committed By: reinoud
Date: Fri Apr 22 21:00:28 UTC 2022
Modified Files:
src/sbin/fsck_udf: main.c
Log Message:
Prevent reading beyond the early_vat_location
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sbin/fsck_udf/main.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/fsck_udf/main.c
diff -u src/sbin/fsck_udf/main.c:1.8 src/sbin/fsck_udf/main.c:1.9
--- src/sbin/fsck_udf/main.c:1.8 Fri Apr 22 20:56:46 2022
+++ src/sbin/fsck_udf/main.c Fri Apr 22 21:00:28 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.8 2022/04/22 20:56:46 reinoud Exp $ */
+/* $NetBSD: main.c,v 1.9 2022/04/22 21:00:28 reinoud Exp $ */
/*
* Copyright (c) 2022 Reinoud Zandijk
@@ -37,7 +37,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: main.c,v 1.8 2022/04/22 20:56:46 reinoud Exp $");
+__RCSID("$NetBSD: main.c,v 1.9 2022/04/22 21:00:28 reinoud Exp $");
#endif /* not lint */
#include
@@ -2148,6 +2148,8 @@ udf_search_vat(union udf_pmap *mapping,
} else {
late_vat_loc = early_vat_loc - 1;
}
+ if (early_vat_loc == first_possible_vat_location)
+ break;
early_vat_loc = first_possible_vat_location;
if (late_vat_loc > VAT_BLK)
early_vat_loc = MAX(early_vat_loc, late_vat_loc - VAT_BLK);
CVS commit: src/sbin/fsck_udf
Module Name:src Committed By: reinoud Date: Fri Apr 22 21:00:28 UTC 2022 Modified Files: src/sbin/fsck_udf: main.c Log Message: Prevent reading beyond the early_vat_location To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sbin/fsck_udf/main.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sbin
Module Name:src Committed By: reinoud Date: Fri Apr 22 20:56:46 UTC 2022 Modified Files: src/sbin/fsck_udf: main.c src/sbin/newfs_udf: udf_core.c Log Message: Fix endian issues with fsck_udf/newfs_udf/makefs To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sbin/fsck_udf/main.c cvs rdiff -u -r1.2 -r1.3 src/sbin/newfs_udf/udf_core.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sbin
Module Name:src
Committed By: reinoud
Date: Fri Apr 22 20:56:46 UTC 2022
Modified Files:
src/sbin/fsck_udf: main.c
src/sbin/newfs_udf: udf_core.c
Log Message:
Fix endian issues with fsck_udf/newfs_udf/makefs
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sbin/fsck_udf/main.c
cvs rdiff -u -r1.2 -r1.3 src/sbin/newfs_udf/udf_core.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/fsck_udf/main.c
diff -u src/sbin/fsck_udf/main.c:1.7 src/sbin/fsck_udf/main.c:1.8
--- src/sbin/fsck_udf/main.c:1.7 Fri Apr 22 19:21:08 2022
+++ src/sbin/fsck_udf/main.c Fri Apr 22 20:56:46 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.7 2022/04/22 19:21:08 reinoud Exp $ */
+/* $NetBSD: main.c,v 1.8 2022/04/22 20:56:46 reinoud Exp $ */
/*
* Copyright (c) 2022 Reinoud Zandijk
@@ -37,7 +37,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: main.c,v 1.7 2022/04/22 19:21:08 reinoud Exp $");
+__RCSID("$NetBSD: main.c,v 1.8 2022/04/22 20:56:46 reinoud Exp $");
#endif /* not lint */
#include
@@ -362,13 +362,13 @@ udf_wipe_and_reallocate(union dscrptr *d
/* create one short_ad or one long_ad */
if (ad_type == UDF_ICB_SHORT_ALLOC) {
short_adp = (struct short_ad *) bpos;
- short_adp->len= udf_rw64(inf_len);
+ short_adp->len= udf_rw32(inf_len);
short_adp->lb_num = allocated.loc.lb_num;
l_ad = sizeof(struct short_ad);
} else {
long_adp = (struct long_ad *) bpos;
memcpy(long_adp, , sizeof(struct long_ad));
- long_adp->len = udf_rw64(inf_len);
+ long_adp->len = udf_rw32(inf_len);
l_ad = sizeof(struct long_ad);
}
if (id == TAGID_FENTRY)
@@ -2600,7 +2600,7 @@ udf_process_vds(void) {
* data file length
*/
context.part_size[log_part] =
-udf_rw32(context.meta_file->inf_len) / context.sector_size;
+udf_rw64(context.meta_file->inf_len) / context.sector_size;
break;
default:
break;
Index: src/sbin/newfs_udf/udf_core.c
diff -u src/sbin/newfs_udf/udf_core.c:1.2 src/sbin/newfs_udf/udf_core.c:1.3
--- src/sbin/newfs_udf/udf_core.c:1.2 Sat Apr 9 09:58:11 2022
+++ src/sbin/newfs_udf/udf_core.c Fri Apr 22 20:56:46 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: udf_core.c,v 1.2 2022/04/09 09:58:11 riastradh Exp $ */
+/* $NetBSD: udf_core.c,v 1.3 2022/04/22 20:56:46 reinoud Exp $ */
/*
* Copyright (c) 2006, 2008, 2021, 2022 Reinoud Zandijk
@@ -30,7 +30,7 @@
#endif
#include
-__RCSID("$NetBSD: udf_core.c,v 1.2 2022/04/09 09:58:11 riastradh Exp $");
+__RCSID("$NetBSD: udf_core.c,v 1.3 2022/04/22 20:56:46 reinoud Exp $");
#include
#include
@@ -2024,7 +2024,7 @@ udf_fidsize(struct fileid_desc *fid)
if (udf_rw16(fid->tag.id) != TAGID_FID)
errx(1, "internal error, bad tag in %s", __func__);
- size = UDF_FID_SIZE + udf_rw16(fid->l_fi) + udf_rw16(fid->l_iu);
+ size = UDF_FID_SIZE + fid->l_fi + udf_rw16(fid->l_iu);
size = (size + 3) & ~3;
return size;
CVS commit: src/sbin/fsck_udf
Module Name:src
Committed By: reinoud
Date: Fri Apr 22 19:21:08 UTC 2022
Modified Files:
src/sbin/fsck_udf: main.c
Log Message:
Avoid assigned but unused compiler warnings when compiling with clang
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sbin/fsck_udf/main.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/fsck_udf/main.c
diff -u src/sbin/fsck_udf/main.c:1.6 src/sbin/fsck_udf/main.c:1.7
--- src/sbin/fsck_udf/main.c:1.6 Sat Apr 9 09:59:16 2022
+++ src/sbin/fsck_udf/main.c Fri Apr 22 19:21:08 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.6 2022/04/09 09:59:16 riastradh Exp $ */
+/* $NetBSD: main.c,v 1.7 2022/04/22 19:21:08 reinoud Exp $ */
/*
* Copyright (c) 2022 Reinoud Zandijk
@@ -37,7 +37,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: main.c,v 1.6 2022/04/09 09:59:16 riastradh Exp $");
+__RCSID("$NetBSD: main.c,v 1.7 2022/04/22 19:21:08 reinoud Exp $");
#endif /* not lint */
#include
@@ -3545,6 +3545,7 @@ udf_process_node_pass1(struct udf_fsck_n
udf_node_path(node));
return EINVAL;
}
+ (void) fpos;
return 0;
}
@@ -3646,6 +3647,7 @@ udf_node_pass3_repairdir(struct udf_fsck
_context);
if (error)
pwarn("Failed to write out directory!\n");
+ (void) fpos;
}
CVS commit: src/sbin/fsck_udf
Module Name:src Committed By: reinoud Date: Fri Apr 22 19:21:08 UTC 2022 Modified Files: src/sbin/fsck_udf: main.c Log Message: Avoid assigned but unused compiler warnings when compiling with clang To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sbin/fsck_udf/main.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tools
Module Name:src
Committed By: jkoshy
Date: Fri Apr 22 15:47:03 UTC 2022
Removed Files:
src/tools/libdwarf: Makefile
src/tools/libelf: Makefile libelf.inc
Log Message:
Remove the 'tools/lib{elf,dwarf}' directories.
These have been moved to under 'tools/elftoolchain'.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r0 src/tools/libdwarf/Makefile
cvs rdiff -u -r1.10 -r0 src/tools/libelf/Makefile
cvs rdiff -u -r1.2 -r0 src/tools/libelf/libelf.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
CVS commit: src/tools
Module Name:src
Committed By: jkoshy
Date: Fri Apr 22 15:47:03 UTC 2022
Removed Files:
src/tools/libdwarf: Makefile
src/tools/libelf: Makefile libelf.inc
Log Message:
Remove the 'tools/lib{elf,dwarf}' directories.
These have been moved to under 'tools/elftoolchain'.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r0 src/tools/libdwarf/Makefile
cvs rdiff -u -r1.10 -r0 src/tools/libelf/Makefile
cvs rdiff -u -r1.2 -r0 src/tools/libelf/libelf.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/broadcom
Module Name:src
Committed By: skrll
Date: Fri Apr 22 12:41:06 UTC 2022
Modified Files:
src/sys/arch/arm/broadcom: files.bcm2835
Log Message:
Remove stale comment
To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/sys/arch/arm/broadcom/files.bcm2835
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/broadcom/files.bcm2835
diff -u src/sys/arch/arm/broadcom/files.bcm2835:1.42 src/sys/arch/arm/broadcom/files.bcm2835:1.43
--- src/sys/arch/arm/broadcom/files.bcm2835:1.42 Sun Aug 8 18:43:21 2021
+++ src/sys/arch/arm/broadcom/files.bcm2835 Fri Apr 22 12:41:06 2022
@@ -1,4 +1,4 @@
-# $NetBSD: files.bcm2835,v 1.42 2021/08/08 18:43:21 jmcneill Exp $
+# $NetBSD: files.bcm2835,v 1.43 2022/04/22 12:41:06 skrll Exp $
#
# Configuration info for Broadcom BCM2835 ARM Peripherals
#
@@ -9,7 +9,7 @@ file arch/arm/broadcom/bcm283x_platform.
define bcmmboxbus { }
-# Interrupt Controller (BCM2835_ARMICU_BASE) #, pic_splfuncs
+# Interrupt Controller (BCM2835_ARMICU_BASE)
device bcmicu: pic, pic_splfuncs
attach bcmicu at fdt with bcmicu
file arch/arm/broadcom/bcm2835_intr.c bcmicu
CVS commit: src/sys/arch/arm/broadcom
Module Name:src Committed By: skrll Date: Fri Apr 22 12:41:06 UTC 2022 Modified Files: src/sys/arch/arm/broadcom: files.bcm2835 Log Message: Remove stale comment To generate a diff of this commit: cvs rdiff -u -r1.42 -r1.43 src/sys/arch/arm/broadcom/files.bcm2835 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: skrll Date: Fri Apr 22 07:38:45 UTC 2022 Modified Files: src/sys/dev/pci: pcidevs.h pcidevs_data.h Log Message: Regen To generate a diff of this commit: cvs rdiff -u -r1.1435 -r1.1436 src/sys/dev/pci/pcidevs.h cvs rdiff -u -r1.1434 -r1.1435 src/sys/dev/pci/pcidevs_data.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. diffs are larger than 1MB and have been omitted
CVS commit: src/sys/dev/pci
Module Name:src Committed By: skrll Date: Fri Apr 22 07:38:45 UTC 2022 Modified Files: src/sys/dev/pci: pcidevs.h pcidevs_data.h Log Message: Regen To generate a diff of this commit: cvs rdiff -u -r1.1435 -r1.1436 src/sys/dev/pci/pcidevs.h cvs rdiff -u -r1.1434 -r1.1435 src/sys/dev/pci/pcidevs_data.h 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: skrll Date: Fri Apr 22 07:34:56 UTC 2022 Modified Files: src/sys/dev/pci: pcidevs Log Message: Add some Broadcom devices. From OpenBSD. To generate a diff of this commit: cvs rdiff -u -r1.1452 -r1.1453 src/sys/dev/pci/pcidevs 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/pcidevs diff -u src/sys/dev/pci/pcidevs:1.1452 src/sys/dev/pci/pcidevs:1.1453 --- src/sys/dev/pci/pcidevs:1.1452 Thu Mar 24 08:46:49 2022 +++ src/sys/dev/pci/pcidevs Fri Apr 22 07:34:55 2022 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.1452 2022/03/24 08:46:49 yamaguchi Exp $ +$NetBSD: pcidevs,v 1.1453 2022/04/22 07:34:55 skrll Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -2568,6 +2568,9 @@ product BROADCOM BCM4350 0x43a3 BCM4350 product BROADCOM BCM43602 0x43ba BCM43602 802.11ac Wireless LAN SoC product BROADCOM BCM4401 0x4401 BCM4401 10/100 Ethernet product BROADCOM BCM4401_B0 0x4401 BCM4401-B0 10/100 Ethernet +product BROADCOM BCM4371 0x440d BCM4371 +product BROADCOM BCM4378 0x4425 BCM4378 +product BROADCOM BCM4387 0x4433 BCM4387 product BROADCOM BCM4727 0x4727 BCM4727 802.11b/g/n product BROADCOM 5801 0x5801 5801 Security Processor product BROADCOM 5802 0x5802 5802 Security Processor
CVS commit: src/sys/dev/pci
Module Name:src Committed By: skrll Date: Fri Apr 22 07:34:56 UTC 2022 Modified Files: src/sys/dev/pci: pcidevs Log Message: Add some Broadcom devices. From OpenBSD. To generate a diff of this commit: cvs rdiff -u -r1.1452 -r1.1453 src/sys/dev/pci/pcidevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
