summaryrefslogtreecommitdiff
path: root/sysutils/cdrtools/patches/patch-cj
diff options
context:
space:
mode:
Diffstat (limited to 'sysutils/cdrtools/patches/patch-cj')
-rw-r--r--sysutils/cdrtools/patches/patch-cj23
1 files changed, 5 insertions, 18 deletions
diff --git a/sysutils/cdrtools/patches/patch-cj b/sysutils/cdrtools/patches/patch-cj
index 514a19ab94f..7e1d5237b9d 100644
--- a/sysutils/cdrtools/patches/patch-cj
+++ b/sysutils/cdrtools/patches/patch-cj
@@ -1,14 +1,11 @@
-$NetBSD: patch-cj,v 1.1 2006/08/28 13:56:22 dsainty Exp $
+$NetBSD: patch-cj,v 1.2 2007/03/16 22:04:55 bad Exp $
isoinfo extracts files at the painful rate of 1 sector at a time. This patch
speeds up file extraction significantly by using a much larger buffer.
-Also avoid crashing under NetBSD by not making the assumption that
-fclose(NULL) is legal.
-
---- mkisofs/diag/isoinfo.c.orig 2005-05-16 02:21:05.000000000 +1200
-+++ mkisofs/diag/isoinfo.c 2006-07-15 18:33:06.000000000 +1200
-@@ -644,7 +644,7 @@
+--- mkisofs/diag/isoinfo.c.orig 2006-10-19 12:31:36.000000000 +0200
++++ mkisofs/diag/isoinfo.c
+@@ -649,7 +649,7 @@ extract_file(idr)
struct iso_directory_record *idr;
{
int extent, len, tlen;
@@ -17,7 +14,7 @@ fclose(NULL) is legal.
#if defined(__CYGWIN32__) || defined(__CYGWIN__) || defined(__EMX__) || defined(__DJGPP__)
setmode(fileno(stdout), O_BINARY);
-@@ -654,16 +654,15 @@
+@@ -659,16 +659,15 @@ extract_file(idr)
len = isonum_733((unsigned char *)idr->size);
while (len > 0) {
@@ -37,13 +34,3 @@ fclose(NULL) is legal.
write(STDOUT_FILENO, buff, tlen);
}
}
-@@ -1252,7 +1252,8 @@
- td = td->next;
- }
-
-- fclose(infile);
-+ if (infile != NULL)
-+ fclose(infile);
- return (0);
- }
-