OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

jartool.c (extract_jar): Don't lseek to skip extra fields.

Browse Source 
2003-01-31  Daiki Ueno  <ueno@unixuser.org>

	* jartool.c (extract_jar): Don't lseek to skip extra fields.
	(consume): If the stream is seekable, do lseek.

From-SVN: r62208
This commit is contained in:
Daiki Ueno 2003-01-31 22:48:27 +00:00 committed by Tom Tromey
parent 7c712dcc2b
commit 0120f3d478
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fastjar/ChangeLog
View File

@ -1,3 +1,8 @@
2003-01-31 Daiki Ueno <ueno@unixuser.org>
* jartool.c (extract_jar): Don't lseek to skip extra fields.
(consume): If the stream is seekable, do lseek.
2003-01-28 Ranjit Mathew <rmathew@hotmail.com>
* jargrep.c: Include xregex.h from libiberty instead of

16
fastjar/jartool.c
View File

@ -1465,9 +1465,6 @@ int extract_jar(int fd, char **files, int file_num){
}
if(method == 8 || flags & 0x0008){
if(seekable)
lseek(fd, eflen, SEEK_CUR);
else
consume(&pbf, eflen);
inflate_file(&pbf, f_fd, &ze);
@ -1502,9 +1499,6 @@ int extract_jar(int fd, char **files, int file_num){
#endif
}
if(seekable)
lseek(fd, eflen, SEEK_CUR);
else
consume(&pbf, eflen);
}
@ -1849,6 +1843,14 @@ int consume(pb_file *pbf, int amt){
printf("Consuming %d bytes\n", amt);
#endif
if (seekable){
if (amt <= (int)pbf->buff_amt)
pb_read(pbf, buff, amt);
else {
lseek(pbf->fd, amt - pbf->buff_amt, SEEK_CUR);
pb_read(pbf, buff, pbf->buff_amt); /* clear pbf */
}
} else
while(tc < amt){
rdamt = pb_read(pbf, buff, ((amt - tc) < RDSZ ? (amt - tc) : RDSZ));
#ifdef DEBUG
@ -1858,7 +1860,7 @@ int consume(pb_file *pbf, int amt){
}
#ifdef DEBUG
printf("%d bytes consumed\n", tc);
printf("%d bytes consumed\n", amt);
#endif
return 0;