Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
This commit is contained in:
reinoud 2022-05-07 08:51:32 +00:00
parent e24a9df723
commit a72532c0e6
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sbin/newfs_udf/udf_core.c
View File

@ -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 * Copyright (c) 2006, 2008, 2021, 2022 Reinoud Zandijk
@ -30,7 +30,7 @@
#endif #endif
#include <sys/cdefs.h> #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 <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@ -3782,6 +3782,7 @@ udf_writeout_writequeue(bool complete)
int blockingnr = layout.blockingnr; int blockingnr = layout.blockingnr;
int linesize, offset, ret; int linesize, offset, ret;
uint8_t *linebuf; uint8_t *linebuf;
int32_t wsects;
uint64_t present, all_present = -1; uint64_t present, all_present = -1;
uint64_t rpos, wpos; uint64_t rpos, wpos;
static int t = 0; static int t = 0;
@ -3832,8 +3833,17 @@ udf_writeout_writequeue(bool complete)
if (complete || (packet->present == all_present)) { if (complete || (packet->present == all_present)) {
printf("%c", "\\|/-"[t++ % 4]); fflush(stdout);fflush(stderr); printf("%c", "\\|/-"[t++ % 4]); fflush(stdout);fflush(stderr);
//printf("write %lu + %d\n", packet->start_sectornr, linesize / context.sector_size); //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; 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"); printf("\b");
if (ret == -1) if (ret == -1)
warn("error writing packet, " warn("error writing packet, "