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

tar2qfile: fix argument parser

Browse Source 
There is only one input, other arguments are files/directories to
extract. There is no need for a loop.
This commit is contained in:
Marek Marczykowski-Górecki 2019-09-06 17:12:52 +02:00
parent cee32d4f90
commit 13eef467bf
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
qubes-rpc/tar2qfile.c
View File

@ -957,7 +957,6 @@ void tar_file_processor(int fd, struct filters *filters)
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
int i;
char *entry; char *entry;
int fd = -1; int fd = -1;
int use_stdin = 1; int use_stdin = 1;
@ -967,18 +966,15 @@ int main(int argc, char **argv)
/* when extracting backup header, dom0 will terminate the transfer with /* when extracting backup header, dom0 will terminate the transfer with
* EDQUOT just after getting qubes.xml */ * EDQUOT just after getting qubes.xml */
set_ignore_quota_error(1); set_ignore_quota_error(1);
for (i = 1; i < argc; i++) { set_nonblock(0);
set_nonblock(0); if (argc > 1) {
if (strcmp(argv[i], "-")==0) { if (strcmp(argv[1], "-")==0) {
use_stdin = 1; use_stdin = 1;
i++;
break;
} else { } else {
// Parse tar file
use_stdin = 0; use_stdin = 0;
entry = argv[i]; entry = argv[1];
#ifdef DEBUG #ifdef DEBUG
fprintf(stderr,"Parsing file %s\n",entry); fprintf(stderr, "Parsing file %s\n",entry);
#endif #endif
fd = open(entry, O_RDONLY); fd = open(entry, O_RDONLY);
@ -986,12 +982,14 @@ int main(int argc, char **argv)
fprintf(stderr,"Error opening file %s\n",entry); fprintf(stderr,"Error opening file %s\n",entry);
exit(2); exit(2);
} }
i++;
break;
} }
} }
filters.filters_count = argc-i; // Parse tar file
filters.filters = argv+i; if (argc > 2)
filters.filters_count = argc-2;
else
filters.filters_count = 0;
filters.filters = argv+2;
filters.filters_matches = calloc(filters.filters_count, sizeof(int)); filters.filters_matches = calloc(filters.filters_count, sizeof(int));
if (filters.filters_matches == NULL) { if (filters.filters_matches == NULL) {
perror("calloc"); perror("calloc");