X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Ftar.c;h=b460211d6338ef750268741bbf588ef5e641974a;hb=0a848ff669035e31537b452b99806d8692f5238e;hp=0b17359e986725108aef4dc726c375db51055c92;hpb=d989864712d07ebea6fea68d3c8ea57413b21493;p=chaz%2Ftar diff --git a/src/tar.c b/src/tar.c index 0b17359..b460211 100644 --- a/src/tar.c +++ b/src/tar.c @@ -7,7 +7,7 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the - Free Software Foundation; either version 2, or (at your option) any later + Free Software Foundation; either version 3, or (at your option) any later version. This program is distributed in the hope that it will be useful, but @@ -617,7 +617,7 @@ static struct argp_option options[] = { N_("exclude directories containing CACHEDIR.TAG"), GRID+1 }, {"exclude-tag", EXCLUDE_TAG_OPTION, N_("FILE"), 0, N_("exclude contents of directories containing FILE, except" - " for FILE itself"), GRID+1 }, + " for FILE itself"), GRID+1 }, {"exclude-tag-under", EXCLUDE_TAG_UNDER_OPTION, N_("FILE"), 0, N_("exclude everything under directories containing FILE"), GRID+1 }, {"exclude-tag-all", EXCLUDE_TAG_ALL_OPTION, N_("FILE"), 0, @@ -1539,15 +1539,15 @@ parse_opt (int key, char *arg, struct argp_state *state) case EXCLUDE_TAG_OPTION: add_exclusion_tag (arg, exclusion_tag_contents, NULL); break; - + case EXCLUDE_TAG_UNDER_OPTION: add_exclusion_tag (arg, exclusion_tag_under, NULL); break; - + case EXCLUDE_TAG_ALL_OPTION: add_exclusion_tag (arg, exclusion_tag_all, NULL); break; - + case FORCE_LOCAL_OPTION: force_local_option = true; break; @@ -2320,9 +2320,6 @@ main (int argc, char **argv) decode_options (argc, argv); - /* Close all inherited open descriptors, except for the first three */ - closeopen (); - name_init (); /* Main command execution. */ @@ -2411,6 +2408,7 @@ tar_stat_destroy (struct tar_stat_info *st) free (st->gname); free (st->sparse_map); free (st->dumpdir); + xheader_destroy (&st->xhdr); memset (st, 0, sizeof (*st)); }