Merge branch 'master' of git.distorted.org.uk:~mdw/publish/public-git/dvdrip

[dvdrip] / chkdvdimg.c

diff --git a/chkdvdimg.c b/chkdvdimg.c
index 0fbb48e..05fa7e1 100644 (file)
--- a/chkdvdimg.c
+++ b/chkdvdimg.c
@@ -96,23 +96,21 @@ static int all_zero_p(const unsigned char *p, size_t sz)
 static void check_img(const char *file)
 {
   int fd = -1;
-  struct stat st;
   unsigned char b[SECTORSZ], bb[SECTORSZ];
+  off_t volsz;
+  int blksz;
   secaddr end;
   unsigned i, j;
 
-  fd = open(file, (flags&F_FIX) ? O_RDWR : O_RDONLY);
-  if (fd < 0)
-    { gripe_syserr(2, errno, "failed to open `%s'", file); goto end; }
-  if (fstat(fd, &st)) {
-    gripe_syserr(2, errno, "failed to retrieve file status for `%s'", file);
-    goto end;
-  }
-  if (st.st_size%SECTORSZ) {
+  open_dvd(file, (flags&F_FIX) ? O_RDWR : O_RDONLY, &fd, 0);
+  blksz = SECTORSZ; volsz = device_size(fd, file, &blksz);
+  if (SECTORSZ != 2048)
+    { gripe(2, "device sector size %d /= 2048", blksz); goto end; }
+  if (volsz%SECTORSZ) {
     gripe(2, "bad length for `%s' -- not whole number of sectors", file);
     goto end;
   }
-  end = st.st_size/SECTORSZ;
+  end = volsz/SECTORSZ;
 
   if (carefully_read(fd, 256*SECTORSZ, b, SECTORSZ, file) ||
       check_anchor_header(b, 256, CAHF_GRIPE | CAHF_FULL, file))
@@ -124,7 +122,7 @@ static void check_img(const char *file)
     if (bb[0] || !all_zero_p(bb, SECTORSZ)) goto nonzero;
   }
   gripe(1, "too many trailing zero sectors: "
-       "couldn't find backup anchor descriptor");
+       "couldn't find backup anchor descriptor in `%s'", file);
   goto end;
 nonzero:
   j = i;
@@ -193,7 +191,9 @@ int main(int argc, char *argv[])
   }
   if (optind >= argc) f |= f_bogus;
   if (f&f_bogus) { usage(stderr); exit(2); }
-
+  setlocale(LC_ALL, "");
+  progress_init(&progress);
   for (i = optind; i < argc; i++) check_img(argv[i]);
+  progress_free(&progress);
   return (status);
 }