[src/trunk]: src/sbin/newfs_udf Data is written out in fixed sized packets; d...

[reinoud <reinoud%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/0f6a17ee6f9a
branches:  trunk
changeset: 365980:0f6a17ee6f9a
user:      reinoud <reinoud%NetBSD.org@localhost>
date:      Sat May 07 08:51:32 2022 +0000

description:
Data is written out in fixed sized packets; discs are normally a multiple of
the packet size but they don't have to be so never write past the last sector.

diffstat:

 sbin/newfs_udf/udf_core.c |  16 +++++++++++++---
 1 files changed, 13 insertions(+), 3 deletions(-)

diffs (45 lines):

diff -r 816856971198 -r 0f6a17ee6f9a sbin/newfs_udf/udf_core.c
--- a/sbin/newfs_udf/udf_core.c Sat May 07 08:20:03 2022 +0000
+++ b/sbin/newfs_udf/udf_core.c Sat May 07 08:51:32 2022 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: udf_core.c,v 1.9 2022/04/26 15:11:42 reinoud Exp $ */
+/* $NetBSD: udf_core.c,v 1.10 2022/05/07 08:51:32 reinoud Exp $ */
 
 /*
  * Copyright (c) 2006, 2008, 2021, 2022 Reinoud Zandijk
@@ -30,7 +30,7 @@
 #endif
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: udf_core.c,v 1.9 2022/04/26 15:11:42 reinoud Exp $");
+__RCSID("$NetBSD: udf_core.c,v 1.10 2022/05/07 08:51:32 reinoud Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -3782,6 +3782,7 @@
        int              blockingnr = layout.blockingnr;
        int              linesize, offset, ret;
        uint8_t         *linebuf;
+       int32_t          wsects;
        uint64_t         present, all_present = -1;
        uint64_t         rpos, wpos;
        static int       t = 0;
@@ -3832,8 +3833,17 @@
                if (complete || (packet->present == all_present)) {
                        printf("%c", "\\|/-"[t++ % 4]); fflush(stdout);fflush(stderr);
 //printf("write %lu + %d\n", packet->start_sectornr, linesize / context.sector_size);
+
+                       /* don't write past last possible lba */
+                       wsects = (mmc_discinfo.last_possible_lba + 1 - packet->start_sectornr);
+                       assert(wsects >= 0);
+                       wsects = MIN(wsects, blockingnr);
+       
                        wpos = (uint64_t) packet->start_sectornr * context.sector_size;
-                       ret = pwrite(dev_fd, packet->packet_data, linesize, wpos);
+                       ret = pwrite(dev_fd,
+                               packet->packet_data,
+                               wsects * context.sector_size,
+                               wpos);
                        printf("\b");
                        if (ret == -1)
                                warn("error writing packet, "