*** ./mkisofs/multi.c.orig Fri Apr 20 17:46:38 2001 --- ./mkisofs/multi.c Sat Jun 1 22:31:45 2002 *************** *** 1118,1124 **** get_session_start(&file_addr); for (i = 0; i < 100; i++) { ! if (readsecs(file_addr / SECTOR_SIZE, buffer, sizeof(buffer) / SECTOR_SIZE) != sizeof(buffer)) { #ifdef USE_LIBSCHILY comerr(" Read error on old image %s\n", path); --- 1118,1124 ---- get_session_start(&file_addr); for (i = 0; i < 100; i++) { ! if (readsecs(file_addr, buffer, sizeof(buffer) / SECTOR_SIZE) != sizeof(buffer)) { #ifdef USE_LIBSCHILY comerr(" Read error on old image %s\n", path); *************** *** 1133,1139 **** && (isonum_711((unsigned char *) vdp->type) == ISO_VD_PRIMARY)) { break; } ! file_addr += SECTOR_SIZE; } if (i == 100) { --- 1133,1139 ---- && (isonum_711((unsigned char *) vdp->type) == ISO_VD_PRIMARY)) { break; } ! file_addr += 1; } if (i == 100) { *************** *** 1453,1459 **** * we start from the session that starts at 0. */ if (file_addr != NULL) ! *file_addr = (16 << 11); /* * We need to coordinate with cdrecord to get the next writable address --- 1453,1459 ---- * we start from the session that starts at 0. */ if (file_addr != NULL) ! *file_addr = 16; /* * We need to coordinate with cdrecord to get the next writable address *************** *** 1463,1469 **** #else if (file_addr != NULL) ! *file_addr = 0L * SECTOR_SIZE; session_start = last_extent = last_extent_written = 0L; if (check_session && cdrecord_data == NULL) return (0); --- 1463,1469 ---- #else if (file_addr != NULL) ! *file_addr = 0L; session_start = last_extent = last_extent_written = 0L; if (check_session && cdrecord_data == NULL) return (0); *************** *** 1493,1499 **** *pnt = '\0'; if (file_addr != NULL) { ! *file_addr = atol(cdrecord_data) * SECTOR_SIZE; } pnt++; --- 1493,1499 ---- *pnt = '\0'; if (file_addr != NULL) { ! *file_addr = atol(cdrecord_data); } pnt++;