Date: Sun, 27 Sep 1998 22:20:02 +0200 (CEST) From: Joachim Kuebart <joki@kuebart.stuttgart.netsurf.de> To: ports@FreeBSD.ORG Subject: Removed bug from mkisofs Message-ID: <199809272020.WAA16156@yacht.domestic.de>
next in thread | raw e-mail | index | archive | help
Hi,
this bug prevented me from burning a multi session CD. With this fix
applied it worked. The new patches/patch-ad should be like shown
below. This patch is not yet commited to the original author of
mkisofs, maybe we should do that.
--- multi.c.orig Tue Jun 2 05:00:25 1998
+++ multi.c Sun Sep 27 22:17:14 1998
@@ -296,7 +296,7 @@
idr = (struct iso_directory_record *) &dirbuff[i];
if(idr->length[0] == 0)
{
- i = (i + SECTOR_SIZE - 1) & ~(SECTOR_SIZE - 1);
+ i = ROUND_UP(i);
continue;
}
(*nent)++;
@@ -324,7 +324,7 @@
idr = (struct iso_directory_record *) &dirbuff[i];
if(idr->length[0] == 0)
{
- i = (i + SECTOR_SIZE - 1) & ~(SECTOR_SIZE - 1);
+ i = ROUND_UP(i);
continue;
}
*pnt = (struct directory_entry *) e_malloc(sizeof(**rtn));
@@ -436,8 +436,9 @@
*/
if( tt_extent != 0 && tt_size != 0 )
{
- tt_buf = (unsigned char *) e_malloc(tt_size);
- readsecs(tt_extent, tt_buf, tt_size/SECTOR_SIZE);
+ tt_buf = (unsigned char *) e_malloc(ROUND_UP(tt_size));
+ memset(tt_buf, 0, tt_size);
+ readsecs(tt_extent, tt_buf, (tt_size + SECTOR_SIZE - 1) / SECTOR_SIZE);
/*
* Loop through the file, examine each entry, and attempt to
@@ -492,7 +493,7 @@
{
free(dirbuff);
}
-
+
return rtn;
}
cu Jo
---------------------------------------------------------------------
FreeBSD: The Power to Serve <http://www.freebsd.org>;
Joachim Kuebart
Tel: +49 711 653706 I like to think.
Germany
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199809272020.WAA16156>