Attachment #701 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




}

/* callback function for libisofs */
static int readf(char *buf, long start, long len,void *udata) {

    TQIODevice* dev = ( static_cast<KIso*> (udata) )->device();


    bool special=false;
    KArchiveEntry *entry=NULL,*oldentry=NULL;
    char z_algo[2],z_params[2];
    long long z_size=0;

    if ((idr->flags[0] & 1) && !iso->showhidden) return 0;
    if (iso->level) {


void KIso::addBoot(struct el_torito_boot_descriptor* bootdesc) {

    int i;
    long long size;
    boot_head boot;
    boot_entry *be;
    TQString path;

Lines 20-26 Link Here

(-)a/kioslave/iso/kisofile.cpp (-2 / +2 lines)
20		20
21	KIsoFile::KIsoFile( KArchive* archive, const TQString& name, int access,	21	KIsoFile::KIsoFile( KArchive* archive, const TQString& name, int access,
22	int date, int adate,int cdate, const TQString& user, const TQString& group,	22	int date, int adate,int cdate, const TQString& user, const TQString& group,
23	const TQString& symlink,int pos, int size) :	23	const TQString& symlink,long long pos, long long size) :
24	KArchiveFile(archive, name, access, date, user, group, symlink, pos, size) {	24	KArchiveFile(archive, name, access, date, user, group, symlink, pos, size) {
25		25
26		26
Lines 32-38 KIsoFile::KIsoFile( KArchive* archive, const TQString& name, int access, Link Here
32	KIsoFile::~KIsoFile(){	32	KIsoFile::~KIsoFile(){
33	}	33	}
34		34
35	void KIsoFile::setZF(char algo[2],char parms[2],int realsize) {	35	void KIsoFile::setZF(char algo[2],char parms[2],long long realsize) {
36	m_algo[0]=algo[0];m_algo[1]=algo[1];	36	m_algo[0]=algo[0];m_algo[1]=algo[1];
37	m_parms[0]=parms[0];m_parms[1]=parms[1];	37	m_parms[0]=parms[0];m_parms[1]=parms[1];
38	m_realsize=realsize;	38	m_realsize=realsize;

Lines 29-37 class KIsoFile : public KArchiveFile { Link Here

(-)a/kioslave/iso/kisofile.h (-2 / +2 lines)
29	public:	29	public:
30	KIsoFile( KArchive* archive, const TQString& name, int access, int date,	30	KIsoFile( KArchive* archive, const TQString& name, int access, int date,
31	int adate,int cdate, const TQString& user, const TQString& group,	31	int adate,int cdate, const TQString& user, const TQString& group,
32	const TQString& symlink, int pos, int size);	32	const TQString& symlink, long long pos, long long size);
33	~KIsoFile();	33	~KIsoFile();
34	void setZF(char algo[2],char parms[2],int realsize);	34	void setZF(char algo[2],char parms[2],long long realsize);
35	int adate() const { return m_adate; }	35	int adate() const { return m_adate; }
36	int cdate() const { return m_cdate; }	36	int cdate() const { return m_cdate; }
37	long long realsize() const { return m_realsize; }	37	long long realsize() const { return m_realsize; }




	boot->defentry=NULL;
}

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

	switch(media & 0xf) {
		case 0:

	return entry;
}

int ReadBootTable(readfunc *read,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 sector,void *udata) {
				
	int i;
	struct iso_volume_descriptor buf;

iconv_t iconv_d;
int fd;

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




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

typedef struct _iso_vol_desc {

/**
 * this callback function needs to read 'len' sectors from 'start' into 'buf' 
 */
typedef int readfunc(char *buf,long start, 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 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 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 sector, boot_head *head, void *udata);

#ifdef __cplusplus
} //extern "C"

Return to bug 178

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

(-)a/kioslave/iso/kiso.cpp (-3 / +4 lines)
188	}	188	}
189		189
190	/* callback function for libisofs */	190	/* callback function for libisofs */
191	static int readf(char buf, int start, int len,void udata) {	191	static int readf(char buf, long start, long len,void udata) {
192		192
193	TQIODevice* dev = ( static_cast<KIso*> (udata) )->device();	193	TQIODevice* dev = ( static_cast<KIso*> (udata) )->device();
194		194
Lines 212-218 static int mycallb(struct iso_directory_record idr,void udata) { Link Here
212	bool special=false;	212	bool special=false;
213	KArchiveEntry entry=NULL,oldentry=NULL;	213	KArchiveEntry entry=NULL,oldentry=NULL;
214	char z_algo[2],z_params[2];	214	char z_algo[2],z_params[2];
215	int z_size=0;	215	long long z_size=0;
216		216
217	if ((idr->flags[0] & 1) && !iso->showhidden) return 0;	217	if ((idr->flags[0] & 1) && !iso->showhidden) return 0;
218	if (iso->level) {	218	if (iso->level) {
Lines 289-295 static int mycallb(struct iso_directory_record idr,void udata) { Link Here
289		289
290	void KIso::addBoot(struct el_torito_boot_descriptor* bootdesc) {	290	void KIso::addBoot(struct el_torito_boot_descriptor* bootdesc) {
291		291
292	int i,size;	292	int i;
		293	long long size;
293	boot_head boot;	294	boot_head boot;
294	boot_entry *be;	295	boot_entry *be;
295	TQString path;	296	TQString path;

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

(-)a/kioslave/iso/libisofs/isofs.c (-6 / +6 lines)
122	boot->defentry=NULL;	122	boot->defentry=NULL;
123	}	123	}
124		124
125	int BootImageSize(int media,int len) {	125	int BootImageSize(int media,long len) {
126	int ret;	126	long long ret;
127		127
128	switch(media & 0xf) {	128	switch(media & 0xf) {
129	case 0:	129	case 0:
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,int sector, boot_head head, void *udata) {	161	int ReadBootTable(readfunc read,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,int sector,void *udata) {	224	iso_vol_desc ReadISO9660(readfunc read,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-586 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, int start, int len,void udata) {	580	int readf(char buf, long start, long len,void udata) {
581	int ret;	581	int ret;
582		582
583	if ((ret=lseek(fd, start << 11, SEEK_SET))<0) return ret;	583	if ((ret=lseek64(fd, start << 11, SEEK_SET))<0) return ret;
584	ret=read(fd, buf, len << 11);	584	ret=read(fd, buf, len << 11);
585	if (ret<0) return ret;	585	if (ret<0) return ret;
586	return (ret >> 11);	586	return (ret >> 11);

Lines 50-56 typedef struct _rr_entry { Link Here

(-)a/kioslave/iso/libisofs/isofs.h (-5 / +5 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	int z_size; /* zizofs real_size */	53	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 {
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,int start, int len,void );	81	typedef int readfunc(char buf,long start, 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,int sector,void *udata);	110	iso_vol_desc ReadISO9660(readfunc read,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,int len);	143	int BootImageSize(int media,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,int sector, boot_head head, void *udata);	154	int ReadBootTable(readfunc read,long sector, boot_head head, void *udata);
155		155
156	#ifdef __cplusplus	156	#ifdef __cplusplus
157	} //extern "C"	157	} //extern "C"