diff options
| author | David E. O'Brien <obrien@FreeBSD.org> | 1998-10-31 06:42:02 +0000 |
|---|---|---|
| committer | David E. O'Brien <obrien@FreeBSD.org> | 1998-10-31 06:42:02 +0000 |
| commit | 36145bd25199ca993b5db8066e554c4f2c1a6bfc (patch) | |
| tree | 87ad16a88112f293bcf1d44575967bfa3cec6d5a /sysutils | |
| parent | mico 2.2.1 port ... compiles cleanly and installs. (diff) | |
Fix bug related to multi-session burning.
PR: posted to ports@freebsd.org
Submitted by: Joachim Kuebart <joki@kuebart.stuttgart.netsurf.de>
Notes
Notes:
svn path=/head/; revision=14268
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/mkisofs-devel/files/patch-ad | 32 | ||||
| -rw-r--r-- | sysutils/mkisofs/files/patch-ad | 32 |
2 files changed, 54 insertions, 10 deletions
diff --git a/sysutils/mkisofs-devel/files/patch-ad b/sysutils/mkisofs-devel/files/patch-ad index 378f47208d88..de43f3cd91f5 100644 --- a/sysutils/mkisofs-devel/files/patch-ad +++ b/sysutils/mkisofs-devel/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 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 |