Attachment #702 for bug #178

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release. View | Details | Raw Unified | Return to bug 178
Collapse All | Expand All

Lines 188-194 KIso::~KIso() Link Here

(-)a/kioslave/iso/kiso.cpp (-1 / +1 lines)
188	}	188	}
189		189
190	/* callback function for libisofs */	190	/* callback function for libisofs */
191	static int readf(char buf, long start, long len,void udata) {	191	static int readf(char buf, long long start, long long len,void udata) {
192		192
193	TQIODevice* dev = ( static_cast<KIso*> (udata) )->device();	193	TQIODevice* dev = ( static_cast<KIso*> (udata) )->device();
194		194




	boot->defentry=NULL;
}

int BootImageSize(int media,long long len) {
	long long ret;

	switch(media & 0xf) {

	return entry;
}

int ReadBootTable(readfunc *read,long long sector, boot_head *head, void *udata) {

	char buf[2048], *c, *be;
	int i,end=0;

/**
 * Creates the linked list of the volume descriptors
 */
iso_vol_desc *ReadISO9660(readfunc *read,long long sector,void *udata) {
				
	int i;
	struct iso_volume_descriptor buf;

iconv_t iconv_d;
int fd;

int readf(char *buf, long long start, long long len,void *udata) {
	int ret;
	
	if ((ret=lseek64(fd, start << 11, SEEK_SET))<0) return ret;




	int		re; /* relocated */
	char	z_algo[2]; /* zizofs algorithm */
	char	z_params[2]; /* zizofs parameters */
	long long	z_size; /* zizofs real_size */
} rr_entry;

typedef struct _iso_vol_desc {
	struct _iso_vol_desc	*next;
	struct _iso_vol_desc	*prev;
	struct iso_volume_descriptor	data;
} iso_vol_desc;

typedef struct _boot_entry {

/**
 * this callback function needs to read 'len' sectors from 'start' into 'buf' 
 */
typedef int readfunc(char *buf,long long start, long long len,void *);

/**
 * ProcessDir uses this callback

 * If the function fails, returns NULL
 * Don't forget to call FreeISO9660 after using the volume descriptor list!
 */
iso_vol_desc *ReadISO9660(readfunc *read,long long sector,void *udata);

/**
 * Frees the linked list of volume descriptors

/**
 * Returns the size of the boot image (in 512 byte sectors)
 */
int BootImageSize(int media,long long len);

/**
 * Frees the boot catalog entries in 'boot'. If you ever called ReadBootTable,

/**
 * Reads the boot catalog into 'head'. Don't forget to call FreeBootTable!
 */
int ReadBootTable(readfunc *read,long long sector, boot_head *head, void *udata);

#ifdef __cplusplus
} //extern "C"

Return to bug 178

Lines 122-128 void FreeBootTable(boot_head *boot) { Link Here

(-)a/kioslave/iso/libisofs/isofs.c (-4 / +4 lines)
122	boot->defentry=NULL;	122	boot->defentry=NULL;
123	}	123	}
124		124
125	int BootImageSize(int media,long len) {	125	int BootImageSize(int media,long long len) {
126	long long ret;	126	long long ret;
127		127
128	switch(media & 0xf) {	128	switch(media & 0xf) {
Lines 158-164 static boot_entry CreateBootEntry(char be) { Link Here
158	return entry;	158	return entry;
159	}	159	}
160		160
161	int ReadBootTable(readfunc read,long sector, boot_head head, void *udata) {	161	int ReadBootTable(readfunc read,long long sector, boot_head head, void *udata) {
162		162
163	char buf[2048], c, be;	163	char buf[2048], c, be;
164	int i,end=0;	164	int i,end=0;
Lines 221-227 err: Link Here
221	/**	221	/**
222	* Creates the linked list of the volume descriptors	222	* Creates the linked list of the volume descriptors
223	*/	223	*/
224	iso_vol_desc ReadISO9660(readfunc read,long sector,void *udata) {	224	iso_vol_desc ReadISO9660(readfunc read,long long sector,void *udata) {
225		225
226	int i;	226	int i;
227	struct iso_volume_descriptor buf;	227	struct iso_volume_descriptor buf;
Lines 577-583 int level=0,joliet=0,dirs,files; Link Here
577	iconv_t iconv_d;	577	iconv_t iconv_d;
578	int fd;	578	int fd;
579		579
580	int readf(char buf, long start, long len,void udata) {	580	int readf(char buf, long long start, long long len,void udata) {
581	int ret;	581	int ret;
582		582
583	if ((ret=lseek64(fd, start << 11, SEEK_SET))<0) return ret;	583	if ((ret=lseek64(fd, start << 11, SEEK_SET))<0) return ret;

Lines 50-62 typedef struct _rr_entry { Link Here

(-)a/kioslave/iso/libisofs/isofs.h (-6 / +6 lines)
50	int re; /* relocated */	50	int re; /* relocated */
51	char z_algo[2]; /* zizofs algorithm */	51	char z_algo[2]; /* zizofs algorithm */
52	char z_params[2]; /* zizofs parameters */	52	char z_params[2]; /* zizofs parameters */
53	long z_size; /* zizofs real_size */	53	long long z_size; /* zizofs real_size */
54	} rr_entry;	54	} rr_entry;
55		55
56	typedef struct _iso_vol_desc {	56	typedef struct _iso_vol_desc {
57	struct _iso_vol_desc *next;	57	struct _iso_vol_desc *next;
58	struct _iso_vol_desc *prev;	58	struct _iso_vol_desc *prev;
59	struct iso_volume_descriptor data;	59	struct iso_volume_descriptor data;
60	} iso_vol_desc;	60	} iso_vol_desc;
61		61
62	typedef struct _boot_entry {	62	typedef struct _boot_entry {
Lines 78-84 typedef struct _boot_head { Link Here
78	/**	78	/**
79	* this callback function needs to read 'len' sectors from 'start' into 'buf'	79	* this callback function needs to read 'len' sectors from 'start' into 'buf'
80	*/	80	*/
81	typedef int readfunc(char buf,long start, long len,void );	81	typedef int readfunc(char buf,long long start, long long len,void );
82		82
83	/**	83	/**
84	* ProcessDir uses this callback	84	* ProcessDir uses this callback
Lines 107-113 time_t isodate_84261(char * p, int hs); Link Here
107	* If the function fails, returns NULL	107	* If the function fails, returns NULL
108	* Don't forget to call FreeISO9660 after using the volume descriptor list!	108	* Don't forget to call FreeISO9660 after using the volume descriptor list!
109	*/	109	*/
110	iso_vol_desc ReadISO9660(readfunc read,long sector,void *udata);	110	iso_vol_desc ReadISO9660(readfunc read,long long sector,void *udata);
111		111
112	/**	112	/**
113	* Frees the linked list of volume descriptors	113	* Frees the linked list of volume descriptors
Lines 140-146 int JolietLevel(struct iso_volume_descriptor *ivd); Link Here
140	/**	140	/**
141	* Returns the size of the boot image (in 512 byte sectors)	141	* Returns the size of the boot image (in 512 byte sectors)
142	*/	142	*/
143	int BootImageSize(int media,long len);	143	int BootImageSize(int media,long long len);
144		144
145	/**	145	/**
146	* Frees the boot catalog entries in 'boot'. If you ever called ReadBootTable,	146	* Frees the boot catalog entries in 'boot'. If you ever called ReadBootTable,
Lines 151-157 void FreeBootTable(boot_head *boot); Link Here
151	/**	151	/**
152	* Reads the boot catalog into 'head'. Don't forget to call FreeBootTable!	152	* Reads the boot catalog into 'head'. Don't forget to call FreeBootTable!
153	*/	153	*/
154	int ReadBootTable(readfunc read,long sector, boot_head head, void *udata);	154	int ReadBootTable(readfunc read,long long sector, boot_head head, void *udata);
155		155
156	#ifdef __cplusplus	156	#ifdef __cplusplus
157	} //extern "C"	157	} //extern "C"