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

tar2qfile: improved error handling

Browse Source
This commit is contained in:
Olivier MEDOC 2013-10-10 08:52:10 +02:00
parent fb2f6688e8
commit 6938e68ee6
1 changed files with 34 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
qubes-rpc/tar2qfile.c
View File

@ -388,7 +388,8 @@ enum {
NEED_NOTHING, NEED_NOTHING,
NEED_SKIP, NEED_SKIP,
NEED_READ, NEED_READ,
NEED_SYNC_TRAIL NEED_SYNC_TRAIL,
INVALID_HEADER,
}; };
@ -417,9 +418,10 @@ ustar_rd (int fd, struct file_header * untrusted_hdr, char *buf, struct stat * s
* we only get proper sized buffers * we only get proper sized buffers
*/ */
fprintf(stderr,"Checking if valid header\n"); fprintf(stderr,"Checking if valid header\n");
if (ustar_id (buf, BLKMULT) < 0) if (ustar_id (buf, BLKMULT) < 0) {
return (-1); fprintf (stderr,"Invalid header\n");
return INVALID_HEADER;
}
fprintf(stderr,"Valid header!\n"); fprintf(stderr,"Valid header!\n");
/* DISABLED: Internal to PAX /* DISABLED: Internal to PAX
arcn->org_name = arcn->name; arcn->org_name = arcn->name;
@ -674,33 +676,35 @@ int tar_file_processor(int fd)
size_t to_skip = 0; size_t to_skip = 0;
int sync_count = 0; int sync_count = 0;
while (size = read(fd, &buf, BLKMULT)) { while (size = read(fd, &buf, BLKMULT)) {
fprintf(stderr,"Read %d bytes\n",size); if (size != -1) {
ret = 0; fprintf(stderr,"Read %d bytes\n",size);
if (current==NEED_SYNC_TRAIL) { ret = 0;
ret = tar_trail (buf, 1, &sync_count); if (current==NEED_SYNC_TRAIL) {
fprintf(stderr,"Synchronizing trail: %d %d\n",ret,sync_count); ret = tar_trail (buf, 1, &sync_count);
if (ret != 1) { fprintf(stderr,"Synchronizing trail: %d %d\n",ret,sync_count);
current = NEED_READ; if (ret != 1) {
current = NEED_READ;
}
} }
} if (current==NEED_READ) {
if (current==NEED_READ) { current = ustar_rd(fd, &hdr, &buf, &sb);
current = ustar_rd(fd, &hdr, &buf, &sb); fprintf(stderr,"Return %d\n",ret);
fprintf(stderr,"Return %d\n",ret);
}
if (current==NEED_SKIP) {
fprintf(stderr,"Need to skip %d bytes\n",sb.st_size);
to_skip = sb.st_size;
while (to_skip > 0) {
to_skip -= read(fd, &buf, MIN(to_skip,BLKMULT));
} }
if (current==NEED_SKIP) {
fprintf(stderr,"Need to skip %d bytes\n",sb.st_size);
to_skip = sb.st_size;
while (to_skip > 0) {
to_skip -= read(fd, &buf, MIN(to_skip,BLKMULT));
}
// Extract extra padding // Extract extra padding
fprintf(stderr,"Need to remove pad:%d %d %d\n",to_skip,sb.st_size,BLKMULT-(sb.st_size%BLKMULT)); fprintf(stderr,"Need to remove pad:%d %d %d\n",to_skip,sb.st_size,BLKMULT-(sb.st_size%BLKMULT));
ret = read(fd, &buf, BLKMULT-(sb.st_size%BLKMULT)); ret = read(fd, &buf, BLKMULT-(sb.st_size%BLKMULT));
fprintf(stderr,"Removed %d bytes of padding\n",ret); fprintf(stderr,"Removed %d bytes of padding\n",ret);
current = NEED_READ; current = NEED_READ;
} }
i++; i++;
}
//if (i >= 10) //if (i >= 10)
// exit(0); // exit(0);
} }
@ -717,7 +721,7 @@ int main(int argc, char **argv)
//signal(SIGPIPE, SIG_IGN); //signal(SIGPIPE, SIG_IGN);
// this will allow checking for possible feedback packet in the middle of transfer // this will allow checking for possible feedback packet in the middle of transfer
//set_nonblock(0); // set_nonblock(0);
notify_progress(0, PROGRESS_FLAG_INIT); notify_progress(0, PROGRESS_FLAG_INIT);
crc32_sum = 0; crc32_sum = 0;
@ -743,6 +747,7 @@ int main(int argc, char **argv)
if (i <= 1) { if (i <= 1) {
// No argument specified. Use STDIN // No argument specified. Use STDIN
fprintf(stderr,"Using STDIN\n"); fprintf(stderr,"Using STDIN\n");
set_block(0);
tar_file_processor(fileno(stdin)); tar_file_processor(fileno(stdin));
} }