Qubes/core-agent-linux
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tar2qfile: starting cleanup to get rid of the stat structure which is not required during conversion

Browse Source
This commit is contained in:
Olivier MEDOC 2013-11-14 21:15:33 +01:00 committed by Marek Marczykowski-Górecki
parent 91b84d863c
commit 8a1f87d0ed
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
qubes-rpc/tar2qfile.c
View File

@ -743,8 +743,8 @@ ustar_rd (int fd, struct file_header * untrusted_hdr, char *buf, struct stat * s
}
}
// Extract extra padding
fprintf(stderr,"Need to remove pad:%ld %ld\n",sb->st_size,BLKMULT-(sb->st_size%BLKMULT));
ret = read(fd, buf, BLKMULT-(sb->st_size%BLKMULT));
fprintf(stderr,"Need to remove pad:%ld %ld\n",untrusted_hdr->filelen,BLKMULT-(untrusted_hdr->filelen%BLKMULT));
ret = read(fd, buf, BLKMULT-(untrusted_hdr->filelen%BLKMULT));
fprintf(stderr,"Removed %d bytes of padding\n",ret);
// Resync trailing headers in order to find next file chunck in the tar file
@ -806,15 +806,15 @@ int tar_file_processor(int fd, int filter_count, char **filter)
fprintf(stderr,"Return %d\n",ret);
}
if (current==NEED_SKIP) {
fprintf(stderr,"Need to skip %ld bytes\n",sb.st_size);
to_skip = sb.st_size;
fprintf(stderr,"Need to skip %ld bytes\n",hdr.filelen);
to_skip = hdr.filelen;
while (to_skip > 0) {
to_skip -= read(fd, &buf, MIN(to_skip,BLKMULT));
}
// Extract extra padding
fprintf(stderr,"Need to remove pad:%ld %ld %ld\n",to_skip,sb.st_size,BLKMULT-(sb.st_size%BLKMULT));
ret = read(fd, &buf, BLKMULT-(sb.st_size%BLKMULT));
fprintf(stderr,"Need to remove pad:%ld %ld %ld\n",to_skip,hdr.filelen,BLKMULT-(hdr.filelen%BLKMULT));
ret = read(fd, &buf, BLKMULT-(hdr.filelen%BLKMULT));
fprintf(stderr,"Removed %d bytes of padding\n",ret);
current = NEED_SYNC_TRAIL;
}