X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Ftar.c;h=ae0c739f01aa2bbe77a73c6d962dbd96cf4663bf;hb=b4ec8aedf9c8948bee9bf1635132a7da7a522611;hp=41a53ec5a4f62b53458c081b7d326dbd764d57fc;hpb=620a136e74f211c2fb98b45fe44261d5d775f6a9;p=chaz%2Ftar diff --git a/src/tar.c b/src/tar.c index 41a53ec..ae0c739 100644 --- a/src/tar.c +++ b/src/tar.c @@ -249,8 +249,11 @@ enum ANCHORED_OPTION = CHAR_MAX + 1, ATIME_PRESERVE_OPTION, BACKUP_OPTION, + CHECK_DEVICE_OPTION, CHECKPOINT_OPTION, + CHECKPOINT_ACTION_OPTION, DELAY_DIRECTORY_RESTORE_OPTION, + HARD_DEREFERENCE_OPTION, DELETE_OPTION, EXCLUDE_CACHES_OPTION, EXCLUDE_CACHES_UNDER_OPTION, @@ -268,14 +271,17 @@ enum IGNORE_FAILED_READ_OPTION, INDEX_FILE_OPTION, KEEP_NEWER_FILES_OPTION, - LZMA_OPTION, + LZOP_OPTION, MODE_OPTION, MTIME_OPTION, NEWER_MTIME_OPTION, NO_ANCHORED_OPTION, + NO_AUTO_COMPRESS_OPTION, + NO_CHECK_DEVICE_OPTION, NO_DELAY_DIRECTORY_RESTORE_OPTION, NO_IGNORE_CASE_OPTION, NO_IGNORE_COMMAND_ERROR_OPTION, + NO_NULL_OPTION, NO_OVERWRITE_DIR_OPTION, NO_QUOTE_CHARS_OPTION, NO_RECURSION_OPTION, @@ -346,7 +352,7 @@ The version control may be set with --backup or VERSION_CONTROL, values are:\n\n /* NOTE: - Available option letters are DEIJQY and eqy. Consider the following + Available option letters are DEIQY and eqy. Consider the following assignments: [For Solaris tar compatibility =/= Is it important at all?] @@ -409,6 +415,12 @@ static struct argp_option options[] = { " NUMBER defaults to 1"), GRID+1 }, {"seek", 'n', NULL, 0, N_("archive is seekable"), GRID+1 }, + {"no-check-device", NO_CHECK_DEVICE_OPTION, NULL, 0, + N_("do not check device numbers when creating incremental archives"), + GRID+1 }, + {"check-device", CHECK_DEVICE_OPTION, NULL, 0, + N_("check device numbers when creating incremental archives (default)"), + GRID+1 }, #undef GRID #define GRID 30 @@ -582,6 +594,9 @@ static struct argp_option options[] = { N_("Compression options:"), GRID }, {"auto-compress", 'a', 0, 0, N_("use archive suffix to determine the compression program"), GRID+1 }, + {"no-auto-compress", NO_AUTO_COMPRESS_OPTION, 0, 0, + N_("do not use use archive suffix to determine the compression program"), + GRID+1 }, {"bzip2", 'j', 0, 0, N_("filter the archive through bzip2"), GRID+1 }, {"gzip", 'z', 0, 0, @@ -591,8 +606,10 @@ static struct argp_option options[] = { {"compress", 'Z', 0, 0, N_("filter the archive through compress"), GRID+1 }, {"uncompress", 0, 0, OPTION_ALIAS, NULL, GRID+1 }, - {"lzma", LZMA_OPTION, 0, 0, + {"lzma", 'J', 0, 0, N_("filter the archive through lzma"), GRID+1 }, + {"lzop", LZOP_OPTION, 0, 0, + N_("filter the archive through lzop"), GRID+8 }, {"use-compress-program", USE_COMPRESS_PROGRAM_OPTION, N_("PROG"), 0, N_("filter through PROG (must accept -d)"), GRID+1 }, #undef GRID @@ -609,6 +626,8 @@ static struct argp_option options[] = { N_("get names to extract or create from FILE"), GRID+1 }, {"null", NULL_OPTION, 0, 0, N_("-T reads null-terminated names, disable -C"), GRID+1 }, + {"no-null", NO_NULL_OPTION, 0, 0, + N_("disable the effect of the previous --null option"), GRID+1 }, {"unquote", UNQUOTE_OPTION, 0, 0, N_("unquote filenames read with -T (default)"), GRID+1 }, {"no-unquote", NO_UNQUOTE_OPTION, 0, 0, @@ -644,6 +663,8 @@ static struct argp_option options[] = { N_("don't strip leading `/'s from file names"), GRID+1 }, {"dereference", 'h', 0, 0, N_("follow symlinks; archive and dump the files they point to"), GRID+1 }, + {"hard-dereference", HARD_DEREFERENCE_OPTION, 0, 0, + N_("follow hard links; archive and dump the files they refer to"), GRID+1 }, {"starting-file", 'K', N_("MEMBER-NAME"), 0, N_("begin at member MEMBER-NAME in the archive"), GRID+1 }, {"newer", 'N', N_("DATE-OR-FILE"), 0, @@ -665,6 +686,7 @@ static struct argp_option options[] = { GRID+1 }, {"transform", TRANSFORM_OPTION, N_("EXPRESSION"), 0, N_("use sed replace EXPRESSION to transform file names"), GRID+1 }, + {"xform", 0, 0, OPTION_ALIAS, NULL, GRID+1 }, #undef GRID #define GRID 120 @@ -695,9 +717,12 @@ static struct argp_option options[] = { {"verbose", 'v', 0, 0, N_("verbosely list files processed"), GRID+1 }, - {"checkpoint", CHECKPOINT_OPTION, N_("[.]NUMBER"), OPTION_ARG_OPTIONAL, + {"checkpoint", CHECKPOINT_OPTION, N_("NUMBER"), OPTION_ARG_OPTIONAL, N_("display progress messages every NUMBERth record (default 10)"), GRID+1 }, + {"checkpoint-action", CHECKPOINT_ACTION_OPTION, N_("ACTION"), 0, + N_("execute ACTION on each checkpoint"), + GRID+1 }, {"check-links", 'l', 0, 0, N_("print a message if not all links are dumped"), GRID+1 }, {"totals", TOTALS_OPTION, N_("SIGNAL"), OPTION_ARG_OPTIONAL, @@ -834,6 +859,16 @@ exclude_vcs_files () "=RELEASE-ID", "=meta-update", "=update", + /* Bazaar */ + ".bzr", + ".bzrignore", + ".bzrtags", + /* Mercurial */ + ".hg", + ".hgignore", + ".hgtags", + /* darcs */ + "_darcs", NULL }; @@ -1014,6 +1049,9 @@ report_textual_dates (struct tar_args *args) static volatile int _argp_hang; +/* Either NL or NUL, as decided by the --null option. */ +static char filename_terminator; + enum read_file_list_state /* Result of reading file name from the list file */ { file_list_success, /* OK, name read successfully */ @@ -1022,16 +1060,16 @@ enum read_file_list_state /* Result of reading file name from the list file */ file_list_skip /* Empty (zero-length) entry encountered, skip it */ }; -/* Read from FP a sequence of characters up to FILENAME_TERMINATOR and put them +/* Read from FP a sequence of characters up to TERM and put them into STK. */ static enum read_file_list_state -read_name_from_file (FILE *fp, struct obstack *stk) +read_name_from_file (FILE *fp, struct obstack *stk, int term) { int c; size_t counter = 0; - for (c = getc (fp); c != EOF && c != filename_terminator; c = getc (fp)) + for (c = getc (fp); c != EOF && c != term; c = getc (fp)) { if (c == 0) { @@ -1112,7 +1150,8 @@ update_argv (const char *filename, struct argp_state *state) size_t new_argc; bool is_stdin = false; enum read_file_list_state read_state; - + int term = filename_terminator; + if (!strcmp (filename, "-")) { is_stdin = true; @@ -1126,7 +1165,8 @@ update_argv (const char *filename, struct argp_state *state) open_fatal (filename); } - while ((read_state = read_name_from_file (fp, &argv_stk)) != file_list_end) + while ((read_state = read_name_from_file (fp, &argv_stk, term)) + != file_list_end) { switch (read_state) { @@ -1155,7 +1195,7 @@ update_argv (const char *filename, struct argp_state *state) obstack_1grow (&argv_stk, 0); count = 1; /* Read rest of files using new filename terminator */ - filename_terminator = 0; + term = 0; break; } @@ -1172,7 +1212,7 @@ update_argv (const char *filename, struct argp_state *state) start = obstack_finish (&argv_stk); - if (filename_terminator == 0) + if (term == 0) for (p = start; *p; p += strlen (p) + 1) if (p[0] == '-') count++; @@ -1188,7 +1228,7 @@ update_argv (const char *filename, struct argp_state *state) for (i = state->next, p = start; *p; p += strlen (p) + 1, i++) { - if (filename_terminator == 0 && p[0] == '-') + if (term == 0 && p[0] == '-') state->argv[i++] = "--add-file"; state->argv[i] = p; } @@ -1237,6 +1277,10 @@ parse_opt (int key, char *arg, struct argp_state *state) case 'a': args->compress_autodetect = true; break; + + case NO_AUTO_COMPRESS_OPTION: + args->compress_autodetect = false; + break; case 'b': { @@ -1308,6 +1352,10 @@ parse_opt (int key, char *arg, struct argp_state *state) dereference_option = true; break; + case HARD_DEREFERENCE_OPTION: + hard_dereference_option = true; + break; + case 'i': /* Ignore zero blocks (eofs). This can't be the default, because Unix tar writes two blocks of zeros, then pads out @@ -1326,6 +1374,10 @@ parse_opt (int key, char *arg, struct argp_state *state) set_use_compress_program_option ("bzip2"); break; + case 'J': + set_use_compress_program_option ("lzma"); + break; + case 'k': /* Don't replace existing files. */ old_files_option = KEEP_OLD_FILES; @@ -1357,8 +1409,8 @@ parse_opt (int key, char *arg, struct argp_state *state) } break; - case LZMA_OPTION: - set_use_compress_program_option ("lzma"); + case LZOP_OPTION: + set_use_compress_program_option ("lzop"); break; case 'm': @@ -1534,6 +1586,14 @@ parse_opt (int key, char *arg, struct argp_state *state) " on this platform"))); break; + case CHECK_DEVICE_OPTION: + check_device_option = true; + break; + + case NO_CHECK_DEVICE_OPTION: + check_device_option = false; + break; + case CHECKPOINT_OPTION: if (arg) { @@ -1541,7 +1601,7 @@ parse_opt (int key, char *arg, struct argp_state *state) if (*arg == '.') { - checkpoint_style = checkpoint_dot; + checkpoint_compile_action ("."); arg++; } checkpoint_option = strtoul (arg, &p, 0); @@ -1550,9 +1610,13 @@ parse_opt (int key, char *arg, struct argp_state *state) _("--checkpoint value is not an integer"))); } else - checkpoint_option = 10; + checkpoint_option = DEFAULT_CHECKPOINT; break; + case CHECKPOINT_ACTION_OPTION: + checkpoint_compile_action (arg); + break; + case BACKUP_OPTION: backup_option = true; if (arg) @@ -1690,6 +1754,10 @@ parse_opt (int key, char *arg, struct argp_state *state) filename_terminator = '\0'; break; + case NO_NULL_OPTION: + filename_terminator = '\n'; + break; + case NUMERIC_OWNER_OPTION: numeric_owner_option = true; break; @@ -1752,6 +1820,8 @@ parse_opt (int key, char *arg, struct argp_state *state) /* FIXME: What it is good for? */ same_permissions_option = true; same_order_option = true; + WARN ((0, 0, _("The --preserve option is deprecated, " + "use --preserve-permissions --preserve-order instead"))); break; case RECORD_SIZE_OPTION: @@ -2038,6 +2108,8 @@ decode_options (int argc, char **argv) owner_option = -1; group_option = -1; + check_device_option = true; + /* Convert old-style tar call by exploding option element and rearranging options accordingly. */ @@ -2274,6 +2346,13 @@ decode_options (int argc, char **argv) else if (utc_option) verbose_option = 2; + if (tape_length_option && tape_length_option < record_size) + USAGE_ERROR ((0, 0, _("Volume length cannot be less than record size"))); + + if (same_order_option && listed_incremental_option) + USAGE_ERROR ((0, 0, _("--preserve-order is not compatible with " + "--listed-incremental"))); + /* Forbid using -c with no input files whatsoever. Check that `-f -', explicit or implied, is used correctly. */ @@ -2339,6 +2418,8 @@ decode_options (int argc, char **argv) backup_option = false; } + checkpoint_finish_compile (); + if (verbose_option) report_textual_dates (&args); } @@ -2445,7 +2526,7 @@ main (int argc, char **argv) name_term (); if (exit_status == TAREXIT_FAILURE) - error (0, 0, _("Error exit delayed from previous errors")); + error (0, 0, _("Exiting with failure status due to previous errors")); if (stdlis == stdout) close_stdout ();