X-Git-Url: https://git.distorted.org.uk/~mdw/dvdrip/blobdiff_plain/dae431c1490f94281b045d1458cb422152649b34..12db0342d238464a54ee65dab857885948e1caf6:/dvd-sector-copy.c diff --git a/dvd-sector-copy.c b/dvd-sector-copy.c index 354d962..c6bad44 100644 --- a/dvd-sector-copy.c +++ b/dvd-sector-copy.c @@ -28,23 +28,14 @@ #include #include -#define SECTORSZ 2048 -#define SECTORS(n) (((n) + (SECTORSZ - 1))/SECTORSZ) - #define CTYPE_HACK(fn, ch) fn((unsigned char)(ch)) #define ISDIGIT(ch) CTYPE_HACK(isdigit, ch) #define ISSPACE(ch) CTYPE_HACK(isspace, ch) #define N(v) (sizeof(v)/sizeof((v)[0])) -enum { RAW, IFO, VOB, BUP }; -typedef uint_least32_t ident; - -static inline ident mkident(unsigned kind, unsigned title, unsigned part) - { return (((ident)kind << 0) | ((ident)title << 8) | ((ident)part << 16)); } -static inline unsigned id_kind(ident id) { return ((id >> 0)&0x0ff); } -static inline unsigned id_title(ident id) { return ((id >> 8)&0x0ff); } -static inline unsigned id_part(ident id) { return ((id >> 16)&0x0ff); } +#define SECTORSZ 2048 +#define SECTORS(n) (((n) + (SECTORSZ - 1))/SECTORSZ) static const char *prog = ""; static int status = 0; @@ -52,8 +43,8 @@ static int status = 0; static void usage(FILE *fp) { fprintf(fp, - "usage: %s [-c] [-D DEV] [-R MAP] " - "[-b OUTMAP] [-o OUTFILE] [-r [START]-[END]]\n", + "usage: %s [-c] [-R MAP] [-b OUTMAP] [-r [START]-[END]]\n" + "\tDEVICE OUTFILE\n", prog); } @@ -90,6 +81,49 @@ static void bail_syserr(int err, const char *fmt, ...) exit(2); } +static void carefully_write(int fd, const void *buf, size_t sz) +{ + const unsigned char *p = buf; + ssize_t n; + + if (fd < 0) return; + while (sz) { + n = write(fd, p, sz); + if (n < 0) { + if (errno == EINTR) continue; + bail_syserr(errno, "failed to write to output file"); + } + if (!n) bail("unexpected short write to output file"); + p += n; sz -= n; + } +} + +#define DEFVEC(vtype, etype) \ + typedef struct { etype *v; size_t n, sz; } vtype +#define VEC_INIT { 0, 0, 0 } +#define VEC_FREE(vv) do { \ + free((vv)->v); (vv)->v 0; (vv)->n = (vv)->sz = 0; \ +} while (0) +#define VEC_PUSH(p, vv) do { \ + size_t _want; \ + if ((vv)->n >= (vv)->sz) { \ + (vv)->sz = (vv)->sz ? 2*(vv)->sz : 32; \ + _want = (vv)->sz*sizeof(*(vv)->v); \ + (vv)->v = realloc((vv)->v, _want); \ + if (!(vv)->v) bail("out of memory allocating %zu bytes", _want); \ + } \ + (p) = &(vv)->v[(vv)->n++]; \ +} while (0) + +enum { RAW, IFO, VOB, BUP }; +typedef uint_least32_t ident; + +static inline ident mkident(unsigned kind, unsigned title, unsigned part) + { return (((ident)kind << 0) | ((ident)title << 8) | ((ident)part << 16)); } +static inline unsigned id_kind(ident id) { return ((id >> 0)&0x0ff); } +static inline unsigned id_title(ident id) { return ((id >> 8)&0x0ff); } +static inline unsigned id_part(ident id) { return ((id >> 16)&0x0ff); } + #define MAXFNSZ (1 + 8 + 1 + 12 + 1) static void store_filename(char *buf, ident id) @@ -116,25 +150,9 @@ static void store_filename(char *buf, ident id) } } -#define DEFVEC(vtype, etype) \ - typedef struct { etype *v; size_t n, sz; } vtype -#define VEC_INIT { 0, 0, 0 } -#define VEC_FREE(vv) do { \ - free((vv)->v); (vv)->v 0; (vv)->n = (vv)->sz = 0; \ -} while (0) -#define VEC_PUSH(p, vv) do { \ - size_t _want; \ - if ((vv)->n >= (vv)->sz) { \ - (vv)->sz = (vv)->sz ? 2*(vv)->sz : 32; \ - _want = (vv)->sz*sizeof(*(vv)->v); \ - (vv)->v = realloc((vv)->v, _want); \ - if (!(vv)->v) bail("out of memory allocating %zu bytes", _want); \ - } \ - (p) = &(vv)->v[(vv)->n++]; \ -} while (0) - typedef uint_least32_t secaddr; #define PRIuSEC PRIuLEAST32 +#define SECLIMIT 0x00400000 #define MAXFILES (1 + 2*99 + 1) struct file { @@ -152,6 +170,22 @@ struct event { DEFVEC(event_v, struct event); static event_v eventq = VEC_INIT; +static int compare_event(const void *a, const void *b) +{ + const struct event *eva = a, *evb = b; + + if (eva->pos < evb->pos) return (-1); + else if (eva->pos > evb->pos) return (+1); + + if (eva->ev < evb->ev) return (-1); + else if (eva->ev > evb->ev) return (+1); + + if (eva->file < evb->file) return (-1); + else if (eva->file > evb->file) return (+1); + + return (0); +} + typedef uint_least32_t bits; static bits live[(MAXFILES + 31)/32]; @@ -248,26 +282,13 @@ static void put_title(dvd_reader_t *dvd, unsigned title) start[0], start[npart - 1] + SECTORS(len[npart - 1])); } -static int compare_event(const void *a, const void *b) -{ - const struct event *eva = a, *evb = b; - - if (eva->pos < evb->pos) return (-1); - else if (eva->pos > evb->pos) return (+1); - - if (eva->ev < evb->ev) return (-1); - else if (eva->ev > evb->ev) return (+1); - - if (eva->file < evb->file) return (-1); - else if (eva->file > evb->file) return (+1); - - return (0); -} - static int progresslen = 0; static void clear_progress_internal(void) - { while (progresslen) { fputs("\b \b", stdout); progresslen--; } } +{ + while (progresslen) { fputs("\b \b", stdout); progresslen--; } + putchar('\r'); +} static void clear_progress(void) { clear_progress_internal(); fflush(stdout); } static void vappend_progress(const char *fmt, va_list ap) @@ -292,22 +313,14 @@ static void print_progress(const char *fmt, ...) va_end(ap); } -struct source { - dvd_reader_t *dvd; - int dvdfd; - struct file *file; - dvd_file_t *vob; - - unsigned f; -#define SRCF_ALLPROGRESS 1u - secaddr last_pos, limit, nsectors, ndone; - struct timeval last_time; - double wsum, wcount; - const char *mapfile; FILE *mapfp; -}; -#define SOURCE_INIT { 0, -1, 0, 0, 0, 0, 0, 0, 0, { 0, 0 }, 0.0, 0.0, 0, 0 } +unsigned flags; +# define F_ALLPROGRESS 1u +static secaddr last_pos, limit, nsectors, ndone; +static struct timeval last_time; +static double wsum, wcount; +static struct file *file; -static void report_progress(struct source *src, secaddr pos) +static void report_progress(secaddr pos) { char etastr[32]; struct timeval now; @@ -319,22 +332,22 @@ static void report_progress(struct source *src, secaddr pos) #define BETA (1 - ALPHA) gettimeofday(&now, 0); - t = (now.tv_sec - src->last_time.tv_sec) + - (now.tv_usec - src->last_time.tv_usec)/1000000.0; + t = (now.tv_sec - last_time.tv_sec) + + (now.tv_usec - last_time.tv_usec)/1000000.0; if (t) { - g = src->wcount ? pow(BETA, t) : 0.0; f = (1 - g)/(1 - BETA); - src->wsum = f*(pos - src->last_pos)/t + g*src->wsum; - src->wcount = f + g*src->wcount; - src->ndone += pos - src->last_pos; - src->last_time = now; src->last_pos = pos; + g = wcount ? pow(BETA, t) : 0.0; f = (1 - g)/(1 - BETA); + wsum = f*(pos - last_pos)/t + g*wsum; + wcount = f + g*wcount; + ndone += pos - last_pos; + last_time = now; last_pos = pos; } - if (!src->wsum || !src->wcount) + if (!wsum || !wcount) { rate = 0; strcpy(etastr, "???"); } else { - rate = src->wsum/src->wcount; - eta = (int)((src->nsectors - src->ndone)/rate); + rate = wsum/wcount; + eta = (int)((nsectors - ndone)/rate); sprintf(etastr, "%d:%02d:%02d", eta/3600, (eta/60)%60, eta%60); } @@ -343,27 +356,26 @@ static void report_progress(struct source *src, secaddr pos) if (rate > 128) { rate /= 1024; unit = "M"; } if (rate > 128) { rate /= 1024; unit = "G"; } - if (src->f&SRCF_ALLPROGRESS) percent = pos*100.0/src->limit; - else percent = src->ndone*100.0/src->nsectors; + if (flags&F_ALLPROGRESS) percent = pos*100.0/limit; + else percent = ndone*100.0/nsectors; print_progress ("copied %.1f%% (%"PRIuSEC" of %"PRIuSEC"; %.1f %sB/s, ETA %s)", - percent, pos, src->limit, rate, unit, etastr); - if (src->file && id_kind(src->file->id) == VOB) { + percent, pos, limit, rate, unit, etastr); + if (file && id_kind(file->id) == VOB) { append_progress(" -- %s %d %3.1f%%", - id_part(src->file->id) ? "title" : "menu", - id_title(src->file->id), - (pos - src->file->start)*100.0/ - (src->file->end - src->file->start)); + id_part(file->id) ? "title" : "menu", + id_title(file->id), + (pos - file->start)*100.0/ + (file->end - file->start)); } #undef ALPHA #undef BETA } -static void report_bad_blocks_progress(struct source *src, - secaddr lo, secaddr hi, int err) +static void report_bad_blocks_progress(secaddr lo, secaddr hi, int err) { - report_progress(src, hi); + report_progress(hi); if (lo == hi) append_progress(": retrying bad sector"); else @@ -373,18 +385,22 @@ static void report_bad_blocks_progress(struct source *src, fflush(stdout); } -static ssize_t read_sectors(struct source *src, secaddr pos, - void *buf, secaddr want) +static dvd_reader_t *dvd; +static int dvdfd = -1, outfd = -1; +static dvd_file_t *vob; +static const char *mapfile; static FILE *mapfp; + +static ssize_t read_sectors(secaddr pos, void *buf, secaddr want) { ssize_t n; again: - if (src->vob) - n = DVDReadBlocks(src->vob, pos - src->file->start, want, buf); - else if (src->file) { - if (lseek(src->dvdfd, (off_t)pos*SECTORSZ, SEEK_SET) < 0) + if (vob) + n = DVDReadBlocks(vob, pos - file->start, want, buf); + else if (file) { + if (lseek(dvdfd, (off_t)pos*SECTORSZ, SEEK_SET) < 0) bail_syserr(errno, "failed to seek to sector %"PRIuSEC"", pos); - n = read(src->dvdfd, buf, want*SECTORSZ); + n = read(dvdfd, buf, want*SECTORSZ); if (n >= 0) n /= SECTORSZ; } else { memset(buf, 0, want*SECTORSZ); @@ -395,24 +411,7 @@ again: return (n); } -static void carefully_write(int fd, const void *buf, size_t sz) -{ - const unsigned char *p = buf; - ssize_t n; - - if (fd < 0) return; - while (sz) { - n = write(fd, p, sz); - if (n < 0) { - if (errno == EINTR) continue; - bail_syserr(errno, "failed to write to output file"); - } - if (!n) bail("unexpected short write to output file"); - p += n; sz -= n; - } -} - -static void emit(struct source *src, int outfd, secaddr start, secaddr end) +static void emit(secaddr start, secaddr end) { #define BUFSECTORS 512 @@ -446,23 +445,23 @@ static void emit(struct source *src, int outfd, secaddr start, secaddr end) #endif if (least == -1) - { src->file = 0; src->vob = 0; } + { file = 0; vob = 0; } else { - src->file = &filetab.v[least]; - switch (id_kind(src->file->id)) { + file = &filetab.v[least]; + switch (id_kind(file->id)) { case RAW: - src->vob = 0; + vob = 0; break; case VOB: if (first_time) { clear_progress(); first_time = 0; } - src->vob = DVDOpenFile(src->dvd, id_title(src->file->id), - id_part(src->file->id) - ? DVD_READ_TITLE_VOBS - : DVD_READ_MENU_VOBS); - if (!src->vob) + vob = DVDOpenFile(dvd, id_title(file->id), + id_part(file->id) + ? DVD_READ_TITLE_VOBS + : DVD_READ_MENU_VOBS); + if (!vob) bail("failed to open %s %u", - id_part(src->file->id) ? "title" : "menu", - id_title(src->file->id)); + id_part(file->id) ? "title" : "menu", + id_title(file->id)); break; default: abort(); @@ -472,12 +471,12 @@ static void emit(struct source *src, int outfd, secaddr start, secaddr end) pos = start; while (pos < end) { want = end - pos; if (want > BUFSECTORS) want = BUFSECTORS; - n = read_sectors(src, pos, buf, want); + n = read_sectors(pos, buf, want); if (n <= 0) { - report_bad_blocks_progress(src, pos, pos, errno); + report_bad_blocks_progress(pos, pos, errno); for (i = 0; i < 4; i++) { - n = read_sectors(src, pos, buf, 1); + n = read_sectors(pos, buf, 1); if (n > 0) { clear_progress(); moan("sector %"PRIuSEC" read ok after retry", pos); @@ -488,7 +487,7 @@ static void emit(struct source *src, int outfd, secaddr start, secaddr end) bad_lo = pos; step = 1; bad_hi = pos + 1; for (;;) { - report_bad_blocks_progress(src, bad_lo, bad_hi, errno); + report_bad_blocks_progress(bad_lo, bad_hi, errno); if (bad_hi >= end) { clear_progress(); moan("giving up on this extent"); @@ -497,16 +496,16 @@ static void emit(struct source *src, int outfd, secaddr start, secaddr end) step *= 2; if (step > end - bad_lo) step = end - bad_lo; pos = bad_lo + step - 1; - n = read_sectors(src, pos, buf, 1); + n = read_sectors(pos, buf, 1); if (n > 0) break; bad_hi = pos + 1; } good = pos; while (good > bad_hi) { - report_bad_blocks_progress(src, bad_lo, bad_hi, errno); + report_bad_blocks_progress(bad_lo, bad_hi, errno); pos = bad_hi + (good - bad_hi)/2; - n = read_sectors(src, pos, buf, 1); + n = read_sectors(pos, buf, 1); if (n > 0) good = pos; else bad_hi = pos + 1; } @@ -515,21 +514,20 @@ static void emit(struct source *src, int outfd, secaddr start, secaddr end) clear_progress(); moan("skipping %"PRIuSEC" bad sectors (%"PRIuSEC" .. %"PRIuSEC")", bad_hi - bad_lo, bad_lo, bad_hi); - if (src->mapfile) { - if (!src->mapfp) { - src->mapfp = fopen(src->mapfile, "w"); - if (!src->mapfp) + if (mapfile) { + if (!mapfp) { + mapfp = fopen(mapfile, "w"); + if (!mapfp) bail_syserr(errno, "failed to open bad-sector map file `%s'", optarg); - fprintf(src->mapfp, "## bad sector map\n\n"); + fprintf(mapfp, "## bad sector map\n\n"); } - fprintf(src->mapfp, "%"PRIuSEC" %"PRIuSEC"\n", bad_lo, bad_hi); - fflush(src->mapfp); - if (ferror(src->mapfp)) + fprintf(mapfp, "%"PRIuSEC" %"PRIuSEC"\n", bad_lo, bad_hi); + fflush(mapfp); + if (ferror(mapfp)) bail_syserr(errno, "error writing bad-sector map file"); } - if (outfd >= 0 && - lseek(outfd, (off_t)(bad_hi - bad_lo)*SECTORSZ, SEEK_CUR) < 0) + if (lseek(outfd, (off_t)(bad_hi - bad_lo)*SECTORSZ, SEEK_CUR) < 0) bail_syserr(errno, "failed to seek past bad sectors"); status = 1; } @@ -537,10 +535,10 @@ static void emit(struct source *src, int outfd, secaddr start, secaddr end) } if (n > 0) { carefully_write(outfd, buf, n*SECTORSZ); pos += n; } - report_progress(src, pos); fflush(stdout); + report_progress(pos); fflush(stdout); } - if (src->vob) { DVDCloseFile(src->vob); src->vob = 0; } + if (vob) { DVDCloseFile(vob); vob = 0; } #undef BUFSECTORS } @@ -600,6 +598,49 @@ static int read_line(FILE *fp, struct buf *b) return (0); } +#define PRF_HYPHEN 1u +static int parse_range(const char *p, unsigned f, + secaddr *start_out, secaddr *end_out) +{ + char *q; + int err, rc; + unsigned long start, end; + + err = errno; + + if (ISDIGIT(*p)) { + start = strtoul(p, &q, 0); + if (errno || start >= SECLIMIT) { rc = -1; goto end; } + *start_out = start; p = q; + } else if (!(f&PRF_HYPHEN)) + { rc = -1; goto end; } + else + start = 0; + + if (f&PRF_HYPHEN) { + if (*p != '-') { rc = -1; goto end; } + p++; + } else { + if (!ISSPACE(*p)) { rc = -1; goto end; } + do p++; while (ISSPACE(*p)); + } + + if (ISDIGIT(*p)) { + end = strtoul(p, &q, 0); + if (errno || end > SECLIMIT || end < start) { rc = -1; goto end; } + *end_out = end; p = q; + } else if (!(f&PRF_HYPHEN)) + { rc = -1; goto end; } + + if (!(f&PRF_HYPHEN)) while (ISSPACE(*p)) p++; + if (*p) { rc = -1; goto end; } + + rc = 0; +end: + errno = err; + return (rc); +} + int main(int argc, char *argv[]) { unsigned f = 0; @@ -607,11 +648,10 @@ int main(int argc, char *argv[]) uint64_t volsz; secaddr pos; off_t off; - struct source src = SOURCE_INIT; - unsigned long start, end; + secaddr start, end, last; const struct event *ev; - const char *device = "/dev/dvd", *outfile = 0; - int opt, err, outfd = -1, blksz; + const char *device, *outfile; + int opt, blksz; unsigned n; size_t i; FILE *fp; @@ -629,93 +669,70 @@ int main(int argc, char *argv[]) p = strrchr(argv[0], '/'); prog = p ? p + 1 : argv[0]; for (;;) { - opt = getopt(argc, argv, "hD:FR:b:co:r:"); if (opt < 0) break; + opt = getopt(argc, argv, "hFR:X:b:cr:"); if (opt < 0) break; switch (opt) { case 'h': usage(stderr); exit(0); - case 'D': device = optarg; break; case 'F': f |= f_fixup; break; case 'R': fp = fopen(optarg, "r"); if (!fp) bail_syserr(errno, "failed to open ranges file `%s'", optarg); - i = 0; + i = 0; last = -1; for (;;) { BUF_REWIND(&buf); if (read_line(fp, &buf)) break; p = buf.p; i++; while (ISSPACE(*p)) p++; if (!*p || *p == '#') continue; - if (!ISDIGIT(*p)) goto bad_range_file; - start = strtoul(p, &p, 0); - if (errno || !ISSPACE(*p)) goto bad_range_file; - do p++; while (ISSPACE(*p)); - if (!ISDIGIT(*p)) goto bad_range_file; - end = strtoul(p, &p, 0); - if (errno || (*p && !ISSPACE(*p))) goto bad_range_file; - while (ISSPACE(*p)) p++; - if (*p) goto bad_range_file; - if (start > end) goto bad_range_file; + if (parse_range(p, 0, &start, &end) || + (last <= SECLIMIT && start < last)) + bail("bad range `%s' at `%s' line %zu", buf.p, optarg, i); if (start < end) { - put_event(EV_WRITE, 0, start); - put_event(EV_STOP, 0, end); + if (start == last) + eventq.v[eventq.n - 1].pos = end; + else { + put_event(EV_WRITE, 0, start); + put_event(EV_STOP, 0, end); + } + last = end; } } if (ferror(fp)) bail_syserr(errno, "failed to read ranges file `%s'", optarg); break; - bad_range_file: - bail("bad range `%s' at `%s' line %zu", buf.p, optarg, i); case 'b': - if (src.mapfile) bail("can't have multiple map files"); - src.mapfile = optarg; + if (mapfile) bail("can't have multiple map files"); + mapfile = optarg; break; case 'c': f |= f_continue; break; - case 'o': outfile = optarg; break; case 'r': - err = errno; errno = 0; - p = optarg; - if (*p == '-') - start = 0; - else { - if (!ISDIGIT(*p)) goto bad_range; - start = strtoul(p, &p, 0); - if (errno || *p != '-') goto bad_range; - } - p++; - if (!*p) + start = 0; end = -1; + if (parse_range(optarg, PRF_HYPHEN, &start, &end)) + bail("bad range `%s'", optarg); + if (start < end) { put_event(EV_WRITE, 0, start); - else { - if (!ISDIGIT(*p)) goto bad_range; - end = strtoul(p, &p, 0); - if (errno || *p) goto bad_range; - if (start > end) goto bad_range; - if (start < end) { - put_event(EV_WRITE, 0, start); - put_event(EV_STOP, 0, end); - } + if (end <= SECLIMIT) put_event(EV_STOP, 0, end); } - errno = err; - break; - bad_range: - bail("bad range `%s'", optarg); break; default: f |= f_bogus; break; } } - if (optind < argc) f |= f_bogus; + if (argc - optind != 2) f |= f_bogus; if (f&f_bogus) { usage(stderr); exit(2); } - src.dvdfd = open(device, O_RDONLY); - if (src.dvdfd < 0) + device = argv[optind]; outfile = argv[optind + 1]; + + dvdfd = open(device, O_RDONLY); + if (dvdfd < 0) bail_syserr(errno, "failed to open device `%s'", device); - if (fstat(src.dvdfd, &st)) + if (fstat(dvdfd, &st)) bail_syserr(errno, "failed to stat device `%s'", device); if (S_ISREG(st.st_mode)) { blksz = SECTORSZ; volsz = st.st_size; } else if (S_ISBLK(st.st_mode)) { - if (ioctl(src.dvdfd, BLKSSZGET, &blksz)) + if (ioctl(dvdfd, BLKSSZGET, &blksz)) bail_syserr(errno, "failed to get block size for `%s'", device); - if (ioctl(src.dvdfd, BLKGETSIZE64, &volsz)) + if (ioctl(dvdfd, BLKGETSIZE64, &volsz)) bail_syserr(errno, "failed to get volume size for `%s'", device); } else bail("can't use `%s' as source: expected file or block device", device); @@ -733,7 +750,6 @@ int main(int argc, char *argv[]) } if (f&f_continue) { - if (!outfile) bail("can't continue without output file"); off = lseek(outfd, 0, SEEK_END); if (off < 0) bail_syserr(errno, "failed to seek to end of output file `%s'", @@ -743,25 +759,25 @@ int main(int argc, char *argv[]) put_event(EV_WRITE, 0, 0); #ifdef notdef - src.dvd = DVDOpen2(0, &logger, device); + dvd = DVDOpen2(0, &logger, device); #else - src.dvd = DVDOpen(device); + dvd = DVDOpen(device); #endif - if (!src.dvd) bail("failed to open DVD on `%s'", device); + if (!dvd) bail("failed to open DVD on `%s'", device); /* It's fast enough just to check everything. */ - put_menu(src.dvd, 0); + put_menu(dvd, 0); for (i = 1; i < 100; i++) { - put_menu(src.dvd, i); - put_title(src.dvd, i); + put_menu(dvd, i); + put_title(dvd, i); } put_file(mkident(RAW, 0, 0), 0, volsz/SECTORSZ); assert(filetab.n <= MAXFILES); - for (i = 0, src.limit = 0; i < filetab.n; i++) - if (filetab.v[i].end > src.limit) src.limit = filetab.v[i].end; + for (i = 0, limit = 0; i < filetab.n; i++) + if (filetab.v[i].end > limit) limit = filetab.v[i].end; - if (end > src.limit) end = src.limit; + if (end > limit) end = limit; #ifdef DEBUG printf("\n;; files:\n"); @@ -780,7 +796,7 @@ int main(int argc, char *argv[]) switch (ev->ev) { case EV_WRITE: if (f&f_write) - bail("overlapping ranges: range from %lu still open at %"PRIuSEC"", + bail("overlapping ranges: range from %"PRIuSEC" still open at %"PRIuSEC"", start, ev->pos); n++; f |= f_write; start = ev->pos; break; @@ -795,9 +811,9 @@ int main(int argc, char *argv[]) ev = &eventq.v[i]; switch (ev->ev) { case EV_WRITE: start = ev->pos; f |= f_write; break; - case EV_STOP: src.nsectors += ev->pos - start; f &= ~f_write; break; + case EV_STOP: nsectors += ev->pos - start; f &= ~f_write; break; } - if (ev->pos >= src.limit) break; + if (ev->pos >= limit) break; if (f&f_fixup) start = ev->pos; } eventq.n = i; @@ -806,11 +822,10 @@ int main(int argc, char *argv[]) n++; f |= f_write; } if (f&f_write) { - src.nsectors += src.limit - start; - put_event(EV_STOP, 0, src.limit); + nsectors += limit - start; + put_event(EV_STOP, 0, limit); } - if (n == 1 && (f&f_write)) - src.f |= SRCF_ALLPROGRESS; + if (n == 1 && (f&f_write)) flags |= F_ALLPROGRESS; f &= ~f_write; #ifdef DEBUG @@ -819,7 +834,7 @@ int main(int argc, char *argv[]) for (pos = 0, i = 0; i < eventq.n; i++) { ev = &eventq.v[i]; if (ev->pos > pos) { - if (f&f_write) emit(&src, outfd, pos, ev->pos); + if (f&f_write) emit(pos, ev->pos); pos = ev->pos; #ifdef DEBUG clear_progress(); @@ -836,9 +851,8 @@ int main(int argc, char *argv[]) #endif break; case EV_WRITE: - gettimeofday(&src.last_time, 0); src.last_pos = pos; - if (outfd >= 0 && - lseek(outfd, (off_t)ev->pos*SECTORSZ, SEEK_SET) < 0) + gettimeofday(&last_time, 0); last_pos = pos; + if (lseek(outfd, (off_t)ev->pos*SECTORSZ, SEEK_SET) < 0) bail_syserr(errno, "failed to seek to resume position " "(sector %"PRIuSEC") in output file `%s'", @@ -870,14 +884,14 @@ int main(int argc, char *argv[]) if (progresslen) putchar('\n'); - if (outfd >= 0 && ftruncate(outfd, (off_t)src.limit*SECTORSZ) < 0) + if (ftruncate(outfd, (off_t)limit*SECTORSZ) < 0) bail_syserr(errno, "failed to set output file `%s' length", outfile); - if (src.dvd) DVDClose(src.dvd); - if (src.dvdfd >= 0) close(src.dvdfd); + if (dvd) DVDClose(dvd); + if (dvdfd >= 0) close(dvdfd); if (outfd >= 0) close(outfd); - if (src.mapfp) { - if (ferror(src.mapfp) || fclose(src.mapfp)) + if (mapfp) { + if (ferror(mapfp) || fclose(mapfp)) bail_syserr(errno, "error writing bad-sector map file"); }