aboutsummaryrefslogtreecommitdiff
path: root/sysutils/mkisofs/files/patch-ad
diff options
context:
space:
mode:
Diffstat (limited to 'sysutils/mkisofs/files/patch-ad')
-rw-r--r--sysutils/mkisofs/files/patch-ad32
1 files changed, 27 insertions, 5 deletions
diff --git a/sysutils/mkisofs/files/patch-ad b/sysutils/mkisofs/files/patch-ad
index 378f47208d88..de43f3cd91f5 100644
--- a/sysutils/mkisofs/files/patch-ad
+++ b/sysutils/mkisofs/files/patch-ad
@@ -1,10 +1,32 @@
---- multi.c.orig Mon Oct 13 04:46:46 1997
-+++ multi.c Fri Oct 17 14:49:16 1997
-@@ -437,6 +437,7 @@
+--- multi.c.orig Mon Jun 1 20:00:25 1998
++++ multi.c Fri Oct 30 22:36:03 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);
+- 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);
++ readsecs(tt_extent, tt_buf, (tt_size + SECTOR_SIZE - 1) / SECTOR_SIZE);
/*
+ * Loop through the file, examine each entry, and attempt to