from gorka; size is in blocks, not bytes

Reference: /n/atom/patch/applied2013/mkisovolsize
Date: Sat Jun 29 03:01:45 CES 2013
Signed-off-by: quanstro@quanstro.net

--- /sys/src/cmd/disk/9660/dump9660.c	Sat Jun 29 03:01:19 2013
+++ /sys/src/cmd/disk/9660/dump9660.c	Sat Jun 29 03:01:19 2013
@@ -23,9 +23,13 @@
 usage(void)
 {
 	if(mk9660)
-		fprint(2, "usage: disk/mk9660 [-D:] [-9cjr] [-b bootfile] [-B bootfile [-x loader]] [-o offset blocksize] [-p proto] [-s src] cdimage\n");
+		fprint(2, "usage: disk/mk9660 [-D:] [-9cjr] "
+			"[-[bB] bootfile] [-o offset blocksize] "
+			"[-p proto] [-s src] cdimage\n");
 	else
-		fprint(2, "usage: disk/dump9660 [-D:] [-9cjr] [-m maxsize] [-n now] [-p proto] [-s src] cdimage\n");
+		fprint(2, "usage: disk/dump9660 [-D:] [-9cjr] "
+			"[-m maxsize] [-n now] "
+			"[-p proto] [-s src] cdimage\n");
 	exits("usage");
 }
 
@@ -318,11 +322,10 @@
 		 * Patch in root directories.
 		 */
 		setroot(cd, cd->iso9660pvd, iroot.block, iroot.length);
-		setvolsize(cd, cd->iso9660pvd, (vlong)cd->nextblock * Blocksize);
+		setvolsize(cd, cd->iso9660pvd, cd->nextblock);
 		if(cd->flags & CDjoliet){
 			setroot(cd, cd->jolietsvd, jroot.block, jroot.length);
-			setvolsize(cd, cd->jolietsvd,
-				(vlong)cd->nextblock * Blocksize);
+			setvolsize(cd, cd->jolietsvd, cd->nextblock);
 		}
 	}else{
 		/*
@@ -352,11 +355,10 @@
 		 * Patch in new root directory entry.
 		 */
 		setroot(cd, cd->iso9660pvd, idumproot.block, idumproot.length);
-		setvolsize(cd, cd->iso9660pvd, (vlong)cd->nextblock * Blocksize);
+		setvolsize(cd, cd->iso9660pvd, cd->nextblock);
 		if(cd->flags & CDjoliet){
 			setroot(cd, cd->jolietsvd, jdumproot.block, jdumproot.length);
-			setvolsize(cd, cd->jolietsvd,
-				(vlong)cd->nextblock * Blocksize);
+			setvolsize(cd, cd->jolietsvd, cd->nextblock);
 		}
 	}
 	writepathtables(cd);	
--- /sys/src/cmd/disk/9660/cdrdwr.c	Sat Jun 29 03:01:20 2013
+++ /sys/src/cmd/disk/9660/cdrdwr.c	Sat Jun 29 03:01:21 2013
@@ -275,7 +275,7 @@
 	assert(block != 0);
 
 	Cwseek(cd, block * Blocksize + offsetof(Cvoldesc, volsize[0]));
-	Cputn(cd, size, 4);
+	Cputn(cd, size, 4);			/* size in blocks */
 }
 
 void