rpms/fuseiso/devel fuseiso-largeiso.patch, NONE, 1.1 fuseiso.spec, 1.2, 1.3

[Tom Callaway (spot)]

Author: spot

Update of /cvs/pkgs/rpms/fuseiso/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24939/devel

Modified Files:
	fuseiso.spec 
Added Files:
	fuseiso-largeiso.patch 
Log Message:

large iso support > 4GB (bz 440436)


fuseiso-largeiso.patch:

--- NEW FILE fuseiso-largeiso.patch ---
Index: src/isofs.c
===================================================================
--- src/isofs.c	(Revision 5)
+++ src/isofs.c	(Arbeitskopie)
@@ -178,7 +178,7 @@
                         context.data_size = isonum_723(context.pd.logical_block_size);
                         
                         if(!context.block_size) {
-                            fprintf(stderr, "init: wrong block data size %d, using default 2048\n", context.data_size);
+                            fprintf(stderr, "init: wrong block data size %Lu, using default 2048\n", context.data_size);
                             context.data_size = 2048;
                         };
                         
@@ -324,7 +324,7 @@
     
     if(context.block_size != 2048) {
         // report unusual data block size
-        printf("Data block size: %d\n", context.block_size);
+        printf("Data block size: %Lu\n", context.block_size);
     };
     
     char buf[129];
@@ -479,7 +479,7 @@
     };
     size_t len = read(context.fd, buf, context.data_size);
     if(len != context.data_size) {
-        fprintf(stderr, "isofs_read_raw_block: can`t read full block, read only %d bytes from offset %d, %d required; errno %d, message %s\n", 
+        fprintf(stderr, "isofs_read_raw_block: can`t read full block, read only %d bytes from offset %d, %Lu required; errno %d, message %s\n", 
             len, (int) off, context.data_size, errno, strerror(errno));
         fprintf(stderr, "isofs_read_raw_block: huh? reading zeros beyond file end? someone want to save a penny?\n");
         memset(buf + len, 0, context.data_size - len);
Index: src/isofs.h
===================================================================
--- src/isofs.h	(Revision 5)
+++ src/isofs.h	(Arbeitskopie)
@@ -38,9 +38,9 @@
     struct iso_directory_record *root;
     int file_offset; // offset to begin of useful data (for .nrg files)
     int id_offset; // offset to CD001 inside file
-    size_t block_size; // raw block size
-    size_t block_offset; // offset from block start to data
-    size_t data_size; // data size inside block 
+    off_t block_size; // raw block size
+    off_t block_offset; // offset from block start to data
+    off_t data_size; // data size inside block 
     int susp; // parse susp entries
     int susp_skip; // skip bytes from susp SP entry
     int joliet_level; // joliet extension level (1, 2 or 3)


Index: fuseiso.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fuseiso/devel/fuseiso.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fuseiso.spec	20 Feb 2008 01:08:24 -0000	1.2
+++ fuseiso.spec	3 Apr 2008 17:03:25 -0000	1.3
@@ -1,10 +1,11 @@
 Name:		fuseiso
 Summary: 	FUSE support for ISO filesystem images
 Version:	20070708
-Release:	3%{?dist}
+Release:	4%{?dist}
 License:	GPLv2+
 Group:		System Environment/Base
 Source0:	http://ubiz.ru/dm/%{name}-%{version}.tar.bz2
+Patch0:		fuseiso-largeiso.patch
 URL:		http://fuse.sourceforge.net/wiki/index.php/FuseIso
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	fuse-devel, glib2-devel, zlib-devel
@@ -16,6 +17,7 @@
 
 %prep
 %setup -q
+%patch0 -p0
 
 %build
 %configure
@@ -34,6 +36,10 @@
 %{_bindir}/fuseiso
 
 %changelog
+* Thu Apr  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> 20070708-4
+- handle larger than 4GB isos (thanks to Thomas Bittermann, resolves 
+  bz440436)
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 20070708-3
 - Autorebuild for GCC 4.3