Restore extra help output.

[chaz/tar] / src / tar.c

diff --git a/src/tar.c b/src/tar.c
index 68c8801b1dd07be662e6e16d5ab26058f832a406..e3300fbf47a9d5e77b988f32d54d075cb12bdece 100644 (file)
--- a/src/tar.c
+++ b/src/tar.c
@@ -1,13 +1,13 @@
 /* A tar (tape archiver) program.
 
    Copyright (C) 1988, 1992, 1993, 1994, 1995, 1996, 1997, 1999, 2000,
 /* A tar (tape archiver) program.
 
    Copyright (C) 1988, 1992, 1993, 1994, 1995, 1996, 1997, 1999, 2000,

-   2001, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+   2001, 2003, 2004, 2005, 2006, 2007, 2009 Free Software Foundation, Inc.

 
    Written by John Gilmore, starting 1985-08-25.
 
    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
 
    Written by John Gilmore, starting 1985-08-25.
 
    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
    version.
 
    This program is distributed in the hope that it will be useful, but


@@ -22,10 +22,10 @@
 #include <system.h>
 
 #include <fnmatch.h>
 #include <system.h>
 
 #include <fnmatch.h>

-#include <getline.h>

 #include <argp.h>
 #include <argp-namefrob.h>
 #include <argp-fmtstream.h>
 #include <argp.h>
 #include <argp-namefrob.h>
 #include <argp-fmtstream.h>

+#include <argp-version-etc.h>

 
 #include <signal.h>
 #if ! defined SIGCHLD && defined SIGCLD
 
 #include <signal.h>
 #if ! defined SIGCHLD && defined SIGCLD


@@ -51,6 +51,7 @@
 #include <version-etc.h>
 #include <xstrtol.h>
 #include <stdopen.h>
 #include <version-etc.h>
 #include <xstrtol.h>
 #include <stdopen.h>

+#include <priv-set.h>

 
 /* Local declarations.  */
 
 
 /* Local declarations.  */
 


@@ -219,12 +220,18 @@ subcommand_string (enum subcommand c)
 }
 
 void
 }
 
 void

-tar_list_quoting_styles (argp_fmtstream_t fs, char *prefix)
+tar_list_quoting_styles (struct obstack *stk, char *prefix)

 {
   int i;
 {
   int i;

-
+  size_t prefixlen = strlen (prefix);
+  

   for (i = 0; quoting_style_args[i]; i++)
   for (i = 0; quoting_style_args[i]; i++)

-    argp_fmtstream_printf (fs, "%s%s\n", prefix, quoting_style_args[i]);
+    {
+      obstack_grow (stk, prefix, prefixlen);
+      obstack_grow (stk, quoting_style_args[i],
+                   strlen (quoting_style_args[i]));
+      obstack_1grow (stk, '\n');
+    }

 }
 
 void
 }
 
 void


@@ -250,31 +257,47 @@ enum
   ANCHORED_OPTION = CHAR_MAX + 1,
   ATIME_PRESERVE_OPTION,
   BACKUP_OPTION,
   ANCHORED_OPTION = CHAR_MAX + 1,
   ATIME_PRESERVE_OPTION,
   BACKUP_OPTION,

+  CHECK_DEVICE_OPTION,

   CHECKPOINT_OPTION,
   CHECKPOINT_OPTION,

+  CHECKPOINT_ACTION_OPTION,

   DELAY_DIRECTORY_RESTORE_OPTION,
   DELAY_DIRECTORY_RESTORE_OPTION,

+  HARD_DEREFERENCE_OPTION,

   DELETE_OPTION,
   DELETE_OPTION,

+  EXCLUDE_BACKUPS_OPTION,

   EXCLUDE_CACHES_OPTION,
   EXCLUDE_CACHES_OPTION,

+  EXCLUDE_CACHES_UNDER_OPTION,
+  EXCLUDE_CACHES_ALL_OPTION,

   EXCLUDE_OPTION,
   EXCLUDE_OPTION,

+  EXCLUDE_TAG_OPTION,
+  EXCLUDE_TAG_UNDER_OPTION,
+  EXCLUDE_TAG_ALL_OPTION,
+  EXCLUDE_VCS_OPTION,

   FORCE_LOCAL_OPTION,
   GROUP_OPTION,
   FORCE_LOCAL_OPTION,
   GROUP_OPTION,

-  HANG_OPTION,

   IGNORE_CASE_OPTION,
   IGNORE_COMMAND_ERROR_OPTION,
   IGNORE_FAILED_READ_OPTION,
   INDEX_FILE_OPTION,
   KEEP_NEWER_FILES_OPTION,
   IGNORE_CASE_OPTION,
   IGNORE_COMMAND_ERROR_OPTION,
   IGNORE_FAILED_READ_OPTION,
   INDEX_FILE_OPTION,
   KEEP_NEWER_FILES_OPTION,

+  LEVEL_OPTION,
+  LZMA_OPTION,
+  LZOP_OPTION,

   MODE_OPTION,
   MTIME_OPTION,
   NEWER_MTIME_OPTION,
   NO_ANCHORED_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_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,
   NO_SAME_OWNER_OPTION,
   NO_SAME_PERMISSIONS_OPTION,
   NO_OVERWRITE_DIR_OPTION,
   NO_QUOTE_CHARS_OPTION,
   NO_RECURSION_OPTION,
   NO_SAME_OWNER_OPTION,
   NO_SAME_PERMISSIONS_OPTION,

+  NO_SEEK_OPTION,

   NO_UNQUOTE_OPTION,
   NO_WILDCARDS_MATCH_SLASH_OPTION,
   NO_WILDCARDS_OPTION,
   NO_UNQUOTE_OPTION,
   NO_WILDCARDS_MATCH_SLASH_OPTION,
   NO_WILDCARDS_OPTION,


@@ -310,11 +333,9 @@ enum
   TO_COMMAND_OPTION,
   TRANSFORM_OPTION,
   UNQUOTE_OPTION,
   TO_COMMAND_OPTION,
   TRANSFORM_OPTION,
   UNQUOTE_OPTION,

-  USAGE_OPTION,
-  USE_COMPRESS_PROGRAM_OPTION,

   UTC_OPTION,
   UTC_OPTION,

-  VERSION_OPTION,

   VOLNO_FILE_OPTION,
   VOLNO_FILE_OPTION,

+  WARNING_OPTION, 

   WILDCARDS_MATCH_SLASH_OPTION,
   WILDCARDS_OPTION
 };
   WILDCARDS_MATCH_SLASH_OPTION,
   WILDCARDS_OPTION
 };


@@ -340,7 +361,7 @@ The version control may be set with --backup or VERSION_CONTROL, values are:\n\n
 
 /* NOTE:
 
 
 /* NOTE:
 

-   Available option letters are DEIJQY and aeqy. Consider the following
+   Available option letters are DEQY and eqy. Consider the following

    assignments:
 
    [For Solaris tar compatibility =/= Is it important at all?]
    assignments:
 
    [For Solaris tar compatibility =/= Is it important at all?]


@@ -348,10 +369,14 @@ The version control may be set with --backup or VERSION_CONTROL, values are:\n\n
    E  use extended headers (--format=posix)
 
    [q  alias for --occurrence=1 =/= this would better be used for quiet?]
    E  use extended headers (--format=posix)
 
    [q  alias for --occurrence=1 =/= this would better be used for quiet?]

-   [I  same as T =/= will harm star compatibility]

 
    y  per-file gzip compression
 
    y  per-file gzip compression

-   Y  per-block gzip compression */
+   Y  per-block gzip compression.
+
+   Additionally, the 'n' letter is assigned for option --seek, which
+   is probably not needed and should be marked as deprecated, so that
+   -n may become available in the future.
+*/

 
 static struct argp_option options[] = {
 #define GRID 10
 
 static struct argp_option options[] = {
 #define GRID 10


@@ -393,6 +418,8 @@ static struct argp_option options[] = {
    N_("handle old GNU-format incremental backup"), GRID+1 },
   {"listed-incremental", 'g', N_("FILE"), 0,
    N_("handle new GNU-format incremental backup"), GRID+1 },
    N_("handle old GNU-format incremental backup"), GRID+1 },
   {"listed-incremental", 'g', N_("FILE"), 0,
    N_("handle new GNU-format incremental backup"), GRID+1 },

+  {"level", LEVEL_OPTION, N_("NUMBER"), 0,
+   N_("dump level for created listed-incremental archive"), GRID+1 },

   {"ignore-failed-read", IGNORE_FAILED_READ_OPTION, 0, 0,
    N_("do not exit with nonzero on unreadable files"), GRID+1 },
   {"occurrence", OCCURRENCE_OPTION, N_("NUMBER"), OPTION_ARG_OPTIONAL,
   {"ignore-failed-read", IGNORE_FAILED_READ_OPTION, 0, 0,
    N_("do not exit with nonzero on unreadable files"), GRID+1 },
   {"occurrence", OCCURRENCE_OPTION, N_("NUMBER"), OPTION_ARG_OPTIONAL,


@@ -403,6 +430,14 @@ static struct argp_option options[] = {
       " NUMBER defaults to 1"), GRID+1 },
   {"seek", 'n', NULL, 0,
    N_("archive is seekable"), GRID+1 },
       " NUMBER defaults to 1"), GRID+1 },
   {"seek", 'n', NULL, 0,
    N_("archive is seekable"), GRID+1 },

+  {"no-seek", NO_SEEK_OPTION, NULL, 0,
+   N_("archive is not 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
 #undef GRID
 
 #define GRID 30


@@ -464,9 +499,9 @@ static struct argp_option options[] = {
   {"touch", 'm', 0, 0,
    N_("don't extract file modified time"), GRID+1 },
   {"same-owner", SAME_OWNER_OPTION, 0, 0,
   {"touch", 'm', 0, 0,
    N_("don't extract file modified time"), GRID+1 },
   {"same-owner", SAME_OWNER_OPTION, 0, 0,

-   N_("try extracting files with the same ownership"), GRID+1 },
+   N_("try extracting files with the same ownership as exists in the archive (default for superuser)"), GRID+1 },

   {"no-same-owner", NO_SAME_OWNER_OPTION, 0, 0,
   {"no-same-owner", NO_SAME_OWNER_OPTION, 0, 0,

-   N_("extract files as yourself"), GRID+1 },
+   N_("extract files as yourself (default for ordinary users)"), GRID+1 },

   {"numeric-owner", NUMERIC_OWNER_OPTION, 0, 0,
    N_("always use numbers for user/group names"), GRID+1 },
   {"preserve-permissions", 'p', 0, 0,
   {"numeric-owner", NUMERIC_OWNER_OPTION, 0, 0,
    N_("always use numbers for user/group names"), GRID+1 },
   {"preserve-permissions", 'p', 0, 0,


@@ -569,20 +604,36 @@ static struct argp_option options[] = {
    N_("control pax keywords"), GRID+8 },
   {"label", 'V', N_("TEXT"), 0,
    N_("create archive with volume name TEXT; at list/extract time, use TEXT as a globbing pattern for volume name"), GRID+8 },
    N_("control pax keywords"), GRID+8 },
   {"label", 'V', N_("TEXT"), 0,
    N_("create archive with volume name TEXT; at list/extract time, use TEXT as a globbing pattern for volume name"), GRID+8 },

+#undef GRID
+
+#define GRID 90
+  {NULL, 0, NULL, 0,
+   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 archive suffix to determine the compression program"),
+   GRID+1 },

   {"bzip2", 'j', 0, 0,
   {"bzip2", 'j', 0, 0,

-   N_("filter the archive through bzip2"), GRID+8 },
+   N_("filter the archive through bzip2"), GRID+1 },

   {"gzip", 'z', 0, 0,
   {"gzip", 'z', 0, 0,

-   N_("filter the archive through gzip"), GRID+8 },
-  {"gunzip", 0, 0, OPTION_ALIAS, NULL, GRID+8 },
-  {"ungzip", 0, 0, OPTION_ALIAS, NULL, GRID+8 },
+   N_("filter the archive through gzip"), GRID+1 },
+  {"gunzip", 0, 0, OPTION_ALIAS, NULL, GRID+1 },
+  {"ungzip", 0, 0, OPTION_ALIAS, NULL, GRID+1 },

   {"compress", 'Z', 0, 0,
   {"compress", 'Z', 0, 0,

-   N_("filter the archive through compress"), GRID+8 },
-  {"uncompress", 0, 0, OPTION_ALIAS, NULL, GRID+8 },
-  {"use-compress-program", USE_COMPRESS_PROGRAM_OPTION, N_("PROG"), 0,
-   N_("filter through PROG (must accept -d)"), GRID+8 },
+   N_("filter the archive through compress"), GRID+1 },
+  {"uncompress", 0, 0, OPTION_ALIAS, NULL, GRID+1 },
+  {"lzma", LZMA_OPTION, 0, 0,
+   N_("filter the archive through lzma"), GRID+1 },
+  {"lzop", LZOP_OPTION, 0, 0,
+   N_("filter the archive through lzop"), GRID+8 },
+  {"xz", 'J', 0, 0,
+   N_("filter the archive through xz"), GRID+8 },
+  {"use-compress-program", 'I', N_("PROG"), 0,
+   N_("filter through PROG (must accept -d)"), GRID+1 },

 #undef GRID
 #undef GRID

-
-#define GRID 90
+  
+#define GRID 100

   {NULL, 0, NULL, 0,
    N_("Local file selection:"), GRID },
 
   {NULL, 0, NULL, 0,
    N_("Local file selection:"), GRID },
 


@@ -594,6 +645,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 },
    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,
   {"unquote", UNQUOTE_OPTION, 0, 0,
    N_("unquote filenames read with -T (default)"), GRID+1 },
   {"no-unquote", NO_UNQUOTE_OPTION, 0, 0,


@@ -603,7 +656,24 @@ static struct argp_option options[] = {
   {"exclude-from", 'X', N_("FILE"), 0,
    N_("exclude patterns listed in FILE"), GRID+1 },
   {"exclude-caches", EXCLUDE_CACHES_OPTION, 0, 0,
   {"exclude-from", 'X', N_("FILE"), 0,
    N_("exclude patterns listed in FILE"), GRID+1 },
   {"exclude-caches", EXCLUDE_CACHES_OPTION, 0, 0,

-   N_("exclude directories containing a cache tag"), GRID+1 },
+   N_("exclude contents of directories containing CACHEDIR.TAG, "
+      "except for the tag file itself"), GRID+1 },
+  {"exclude-caches-under", EXCLUDE_CACHES_UNDER_OPTION, 0, 0,
+   N_("exclude everything under directories containing CACHEDIR.TAG"),
+   GRID+1 },
+  {"exclude-caches-all", EXCLUDE_CACHES_ALL_OPTION, 0, 0,
+   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 },
+  {"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,
+   N_("exclude directories containing FILE"), GRID+1 },
+  {"exclude-vcs", EXCLUDE_VCS_OPTION, NULL, 0,
+   N_("exclude version control system directories"), GRID+1 },
+  {"exclude-backups", EXCLUDE_BACKUPS_OPTION, NULL, 0,
+   N_("exclude backup and lock files"), GRID+1 },

   {"no-recursion", NO_RECURSION_OPTION, 0, 0,
    N_("avoid descending automatically in directories"), GRID+1 },
   {"one-file-system", ONE_FILE_SYSTEM_OPTION, 0, 0,
   {"no-recursion", NO_RECURSION_OPTION, 0, 0,
    N_("avoid descending automatically in directories"), GRID+1 },
   {"one-file-system", ONE_FILE_SYSTEM_OPTION, 0, 0,


@@ -614,6 +684,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 },
    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,
   {"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,


@@ -627,7 +699,7 @@ static struct argp_option options[] = {
    N_("backup before removal, override usual suffix ('~' unless overridden by environment variable SIMPLE_BACKUP_SUFFIX)"), GRID+1 },
 #undef GRID
 
    N_("backup before removal, override usual suffix ('~' unless overridden by environment variable SIMPLE_BACKUP_SUFFIX)"), GRID+1 },
 #undef GRID
 

-#define GRID 92
+#define GRID 110

   {NULL, 0, NULL, 0,
    N_("File name transformations:"), GRID },
   {"strip-components", STRIP_COMPONENTS_OPTION, N_("NUMBER"), 0,
   {NULL, 0, NULL, 0,
    N_("File name transformations:"), GRID },
   {"strip-components", STRIP_COMPONENTS_OPTION, N_("NUMBER"), 0,


@@ -635,9 +707,10 @@ static struct argp_option options[] = {
    GRID+1 },
   {"transform", TRANSFORM_OPTION, N_("EXPRESSION"), 0,
    N_("use sed replace EXPRESSION to transform file names"), GRID+1 },
    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
 
 #undef GRID
 

-#define GRID 95
+#define GRID 120

   {NULL, 0, NULL, 0,
    N_("File name matching options (affect both exclude and include patterns):"),
    GRID },
   {NULL, 0, NULL, 0,
    N_("File name matching options (affect both exclude and include patterns):"),
    GRID },


@@ -659,15 +732,20 @@ static struct argp_option options[] = {
    N_("wildcards match `/' (default for exclusion)"), GRID+1 },
 #undef GRID
 
    N_("wildcards match `/' (default for exclusion)"), GRID+1 },
 #undef GRID
 

-#define GRID 100
+#define GRID 130

   {NULL, 0, NULL, 0,
    N_("Informative output:"), GRID },
 
   {"verbose", 'v', 0, 0,
    N_("verbosely list files processed"), GRID+1 },
   {NULL, 0, NULL, 0,
    N_("Informative output:"), GRID },
 
   {"verbose", 'v', 0, 0,
    N_("verbosely list files processed"), GRID+1 },

-  {"checkpoint", CHECKPOINT_OPTION, N_("[.]NUMBER"), OPTION_ARG_OPTIONAL,
+  {"warning", WARNING_OPTION, N_("KEYWORD"), 0,
+   N_("warning control"), GRID+1 },
+  {"checkpoint", CHECKPOINT_OPTION, N_("NUMBER"), OPTION_ARG_OPTIONAL,

    N_("display progress messages every NUMBERth record (default 10)"),
    GRID+1 },
    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,
   {"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,


@@ -700,7 +778,7 @@ static struct argp_option options[] = {
    N_("disable quoting for characters from STRING"), GRID+1 },
 #undef GRID
 
    N_("disable quoting for characters from STRING"), GRID+1 },
 #undef GRID
 

-#define GRID 110
+#define GRID 140

   {NULL, 0, NULL, 0,
    N_("Compatibility options:"), GRID },
 
   {NULL, 0, NULL, 0,
    N_("Compatibility options:"), GRID },
 


@@ -708,20 +786,12 @@ static struct argp_option options[] = {
    N_("when creating, same as --old-archive; when extracting, same as --no-same-owner"), GRID+1 },
 #undef GRID
 
    N_("when creating, same as --old-archive; when extracting, same as --no-same-owner"), GRID+1 },
 #undef GRID
 

-#define GRID 120
+#define GRID 150

   {NULL, 0, NULL, 0,
    N_("Other options:"), GRID },
 
   {"restrict", RESTRICT_OPTION, 0, 0,
    N_("disable use of some potentially harmful options"), -1 },
   {NULL, 0, NULL, 0,
    N_("Other options:"), GRID },
 
   {"restrict", RESTRICT_OPTION, 0, 0,
    N_("disable use of some potentially harmful options"), -1 },

-
-  {"help",  '?', 0, 0,  N_("give this help list"), -1},
-  {"usage", USAGE_OPTION, 0, 0,  N_("give a short usage message"), -1},
-  {"version", VERSION_OPTION, 0, 0,  N_("print program version"), -1},
-  /* FIXME -V (--label) conflicts with the default short option for
-     --version */
-  {"HANG",       HANG_OPTION,    "SECS", OPTION_ARG_OPTIONAL | OPTION_HIDDEN,
-   N_("hang for SECS seconds (default 3600)"), 0},

 #undef GRID
 
   {0, 0, 0, 0, 0, 0}
 #undef GRID
 
   {0, 0, 0, 0, 0, 0}


@@ -765,8 +835,11 @@ struct tar_args        /* Variables used during option parsing */
   char const *backup_suffix_string;   /* --suffix option argument */
   char const *version_control_string; /* --backup option argument */
   bool input_files;                /* True if some input files where given */
   char const *backup_suffix_string;   /* --suffix option argument */
   char const *version_control_string; /* --backup option argument */
   bool input_files;                /* True if some input files where given */

+  int compress_autodetect;         /* True if compression autodetection should
+                                     be attempted when creating archives */

 };
 
 };
 

+\f

 #define MAKE_EXCL_OPTIONS(args) \
  ((((args)->wildcards != disable_wildcards) ? EXCLUDE_WILDCARDS : 0) \
   | (args)->matching_flags \
 #define MAKE_EXCL_OPTIONS(args) \
  ((((args)->wildcards != disable_wildcards) ? EXCLUDE_WILDCARDS : 0) \
   | (args)->matching_flags \


@@ -778,39 +851,78 @@ struct tar_args        /* Variables used during option parsing */
   | (args)->matching_flags \
   | recursion_option)
 
   | (args)->matching_flags \
   | recursion_option)
 

-#ifdef REMOTE_SHELL
-# define DECL_SHOW_DEFAULT_SETTINGS(stream, printer)                      \
-{                                                                         \
-  printer (stream,                                                        \
-          "--format=%s -f%s -b%d --quoting-style=%s --rmt-command=%s",   \
-          archive_format_string (DEFAULT_ARCHIVE_FORMAT),                \
-          DEFAULT_ARCHIVE, DEFAULT_BLOCKING,                             \
-          quoting_style_args[DEFAULT_QUOTING_STYLE],                     \
-          DEFAULT_RMT_COMMAND);                                          \
-  printer (stream, " --rsh-command=%s", REMOTE_SHELL);                    \
-  printer (stream, "\n");                                                 \
-}
-#else
-# define DECL_SHOW_DEFAULT_SETTINGS(stream, printer)                      \
-{                                                                         \
-  printer (stream,                                                        \
-          "--format=%s -f%s -b%d --quoting-style=%s --rmt-command=%s",   \
-          archive_format_string (DEFAULT_ARCHIVE_FORMAT),                \
-          DEFAULT_ARCHIVE, DEFAULT_BLOCKING,                             \
-          quoting_style_args[DEFAULT_QUOTING_STYLE],                     \
-          DEFAULT_RMT_COMMAND);                                          \
-  printer (stream, "\n");                                                 \
-}
-#endif
+static char const * const vcs_file_table[] = {
+  /* CVS: */
+  "CVS",
+  ".cvsignore",
+  /* RCS: */
+  "RCS",
+  /* SCCS: */
+  "SCCS",
+  /* SVN: */
+  ".svn",
+  /* git: */
+  ".git",
+  ".gitignore",
+  /* Arch: */
+  ".arch-ids",
+  "{arch}",
+  "=RELEASE-ID",
+  "=meta-update",
+  "=update",
+  /* Bazaar */
+  ".bzr",
+  ".bzrignore",
+  ".bzrtags",
+  /* Mercurial */
+  ".hg",
+  ".hgignore",
+  ".hgtags",
+  /* darcs */
+  "_darcs",
+  NULL
+};

 
 

-static void
-show_default_settings (FILE *fp)
-     DECL_SHOW_DEFAULT_SETTINGS(fp, fprintf)
+static char const * const backup_file_table[] = {
+  ".#*",
+  "*~",
+  "#*#",
+  NULL
+};

 
 

-static void
-show_default_settings_fs (argp_fmtstream_t fs)
-     DECL_SHOW_DEFAULT_SETTINGS(fs, argp_fmtstream_printf)
+void
+add_exclude_array (char const * const * fv)
+{
+  int i;
+
+  for (i = 0; fv[i]; i++)
+    add_exclude (excluded, fv[i], 0);
+}
+
+\f
+static char *
+format_default_settings (void)
+{
+  char *s;
+  
+  asprintf (&s,
+           "--format=%s -f%s -b%d --quoting-style=%s --rmt-command=%s"
+#ifdef REMOTE_SHELL
+           " --rsh-command=%s"
+#endif
+           ,
+           archive_format_string (DEFAULT_ARCHIVE_FORMAT), 
+           DEFAULT_ARCHIVE, DEFAULT_BLOCKING,              
+           quoting_style_args[DEFAULT_QUOTING_STYLE],
+           DEFAULT_RMT_COMMAND,
+#ifdef REMOTE_SHELL
+           REMOTE_SHELL
+#endif
+           );
+  return s;
+}

 
 

+\f

 static void
 set_subcommand_option (enum subcommand subcommand)
 {
 static void
 set_subcommand_option (enum subcommand subcommand)
 {


@@ -818,7 +930,7 @@ set_subcommand_option (enum subcommand subcommand)
       && subcommand_option != subcommand)
     USAGE_ERROR ((0, 0,
                  _("You may not specify more than one `-Acdtrux' option")));
       && subcommand_option != subcommand)
     USAGE_ERROR ((0, 0,
                  _("You may not specify more than one `-Acdtrux' option")));

-
+  

   subcommand_option = subcommand;
 }
 
   subcommand_option = subcommand;
 }
 


@@ -828,7 +940,7 @@ set_use_compress_program_option (const char *string)
   if (use_compress_program_option
       && strcmp (use_compress_program_option, string) != 0)
     USAGE_ERROR ((0, 0, _("Conflicting compression options")));
   if (use_compress_program_option
       && strcmp (use_compress_program_option, string) != 0)
     USAGE_ERROR ((0, 0, _("Conflicting compression options")));

-
+  

   use_compress_program_option = string;
 }
 \f
   use_compress_program_option = string;
 }
 \f


@@ -948,7 +1060,9 @@ report_textual_dates (struct tar_args *args)
 }
 
 \f
 }
 
 \f

-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 */
   {
 
 enum read_file_list_state  /* Result of reading file name from the list file */
   {


@@ -958,16 +1072,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 */
   };
 
     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
    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;
 
 {
   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)
        {
     {
       if (c == 0)
        {


@@ -978,7 +1092,7 @@ read_name_from_file (FILE *fp, struct obstack *stk)
       obstack_1grow (stk, c);
       counter++;
     }
       obstack_1grow (stk, c);
       counter++;
     }

-
+  

   if (counter == 0 && c != EOF)
     return file_list_skip;
 
   if (counter == 0 && c != EOF)
     return file_list_skip;
 


@@ -1048,7 +1162,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;
   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;
   if (!strcmp (filename, "-"))
     {
       is_stdin = true;


@@ -1061,25 +1176,27 @@ update_argv (const char *filename, struct argp_state *state)
       if ((fp = fopen (filename, "r")) == NULL)
        open_fatal (filename);
     }
       if ((fp = fopen (filename, "r")) == NULL)
        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)
        {
        case file_list_success:
          count++;
          break;
     {
       switch (read_state)
        {
        case file_list_success:
          count++;
          break;

-
+         

        case file_list_end: /* won't happen, just to pacify gcc */
          break;
        case file_list_end: /* won't happen, just to pacify gcc */
          break;

-
+         

        case file_list_zero:
          {
            size_t size;
        case file_list_zero:
          {
            size_t size;

-
-           WARN ((0, 0, N_("%s: file name read contains nul character"),
-                  quotearg_colon (filename)));
-
+           
+           WARNOPT (WARN_FILENAME_WITH_NULS,
+                    (0, 0, N_("%s: file name read contains nul character"),
+                     quotearg_colon (filename)));
+           

            /* Prepare new stack contents */
            size = obstack_object_size (&argv_stk);
            p = obstack_finish (&argv_stk);
            /* Prepare new stack contents */
            size = obstack_object_size (&argv_stk);
            p = obstack_finish (&argv_stk);


@@ -1091,66 +1208,69 @@ update_argv (const char *filename, struct argp_state *state)
            obstack_1grow (&argv_stk, 0);
            count = 1;
            /* Read rest of files using new filename terminator */
            obstack_1grow (&argv_stk, 0);
            count = 1;
            /* Read rest of files using new filename terminator */

-           filename_terminator = 0;
+           term = 0;

            break;
          }
            break;
          }

-
+         

        case file_list_skip:
          break;
        }
     }
        case file_list_skip:
          break;
        }
     }

-
+  

   if (!is_stdin)
     fclose (fp);
   if (!is_stdin)
     fclose (fp);

-
+  

   if (count == 0)
     return;
   if (count == 0)
     return;

-
+  

   start = obstack_finish (&argv_stk);
   start = obstack_finish (&argv_stk);

-
-  if (filename_terminator == 0)
+  
+  if (term == 0)

     for (p = start; *p; p += strlen (p) + 1)
       if (p[0] == '-')
        count++;
     for (p = start; *p; p += strlen (p) + 1)
       if (p[0] == '-')
        count++;

-
+  

   new_argc = state->argc + count;
   new_argv = xmalloc (sizeof (state->argv[0]) * (new_argc + 1));
   memcpy (new_argv, state->argv, sizeof (state->argv[0]) * (state->argc + 1));
   state->argv = new_argv;
   memmove (&state->argv[state->next + count], &state->argv[state->next],
           (state->argc - state->next + 1) * sizeof (state->argv[0]));
   new_argc = state->argc + count;
   new_argv = xmalloc (sizeof (state->argv[0]) * (new_argc + 1));
   memcpy (new_argv, state->argv, sizeof (state->argv[0]) * (state->argc + 1));
   state->argv = new_argv;
   memmove (&state->argv[state->next + count], &state->argv[state->next],
           (state->argc - state->next + 1) * sizeof (state->argv[0]));

-
+  

   state->argc = new_argc;
   state->argc = new_argc;

-
+  

   for (i = state->next, p = start; *p; p += strlen (p) + 1, i++)
     {
   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;
     }
 }
 
 \f
        state->argv[i++] = "--add-file";
       state->argv[i] = p;
     }
 }
 
 \f

-static void
-tar_help (struct argp_state *state)
+static char *
+tar_help_filter (int key, const char *text, void *input)

 {
 {

-  argp_fmtstream_t fs;
-  state->flags |= ARGP_NO_EXIT;
-  argp_state_help (state, state->out_stream,
-                  ARGP_HELP_STD_HELP & ~ARGP_HELP_BUG_ADDR);
-  /* FIXME: use struct uparams.rmargin (from argp-help.c) instead of 79 */
-  fs = argp_make_fmtstream (state->out_stream, 0, 79, 0);
-
-  argp_fmtstream_printf (fs, "\n%s\n\n",
-                      _("Valid arguments for --quoting-style options are:"));
-  tar_list_quoting_styles (fs, "  ");
-
-  argp_fmtstream_puts (fs, _("\n*This* tar defaults to:\n"));
-  show_default_settings_fs (fs);
-  argp_fmtstream_putc (fs, '\n');
-  argp_fmtstream_printf (fs, _("Report bugs to %s.\n"),
-                        argp_program_bug_address);
-  argp_fmtstream_free (fs);
+  struct obstack stk;
+  char *s;
+
+  if (key != ARGP_KEY_HELP_EXTRA)
+    return (char*) text;
+
+  obstack_init (&stk);
+  s = _("Valid arguments for the --quoting-style option are:");
+  obstack_grow (&stk, s, strlen (s));
+  obstack_grow (&stk, "\n\n", 2);
+  tar_list_quoting_styles (&stk, "  ");
+  s = _("\n*This* tar defaults to:\n");
+  obstack_grow (&stk, s, strlen (s));
+  s = format_default_settings ();
+  obstack_grow (&stk, s, strlen (s));
+  obstack_1grow (&stk, '\n');
+  obstack_1grow (&stk, 0);
+  s = xstrdup (obstack_finish (&stk));
+  obstack_free (&stk, NULL);
+  return s;

 }
 \f
 static error_t
 }
 \f
 static error_t


@@ -1160,16 +1280,24 @@ parse_opt (int key, char *arg, struct argp_state *state)
 
   switch (key)
     {
 
   switch (key)
     {

-      case ARGP_KEY_ARG:
-       /* File name or non-parsed option, because of ARGP_IN_ORDER */
-       name_add_name (arg, MAKE_INCL_OPTIONS (args));
-       args->input_files = true;
-       break;
-
+    case ARGP_KEY_ARG:
+      /* File name or non-parsed option, because of ARGP_IN_ORDER */
+      name_add_name (arg, MAKE_INCL_OPTIONS (args));
+      args->input_files = true;
+      break;
+      

     case 'A':
       set_subcommand_option (CAT_SUBCOMMAND);
       break;
     case 'A':
       set_subcommand_option (CAT_SUBCOMMAND);
       break;

-
+      
+    case 'a':
+      args->compress_autodetect = true;
+      break;
+      
+    case NO_AUTO_COMPRESS_OPTION:
+      args->compress_autodetect = false;
+      break;
+      

     case 'b':
       {
        uintmax_t u;
     case 'b':
       {
        uintmax_t u;


@@ -1181,103 +1309,105 @@ parse_opt (int key, char *arg, struct argp_state *state)
                        _("Invalid blocking factor")));
       }
       break;
                        _("Invalid blocking factor")));
       }
       break;

-
+      

     case 'B':
       /* Try to reblock input records.  For reading 4.2BSD pipes.  */
     case 'B':
       /* Try to reblock input records.  For reading 4.2BSD pipes.  */

-
+      

       /* It would surely make sense to exchange -B and -R, but it seems
         that -B has been used for a long while in Sun tar and most
         BSD-derived systems.  This is a consequence of the block/record
         terminology confusion.  */
       /* It would surely make sense to exchange -B and -R, but it seems
         that -B has been used for a long while in Sun tar and most
         BSD-derived systems.  This is a consequence of the block/record
         terminology confusion.  */

-
+      

       read_full_records_option = true;
       break;
       read_full_records_option = true;
       break;

-
+      

     case 'c':
       set_subcommand_option (CREATE_SUBCOMMAND);
       break;
     case 'c':
       set_subcommand_option (CREATE_SUBCOMMAND);
       break;

-
+      

     case 'C':
       name_add_dir (arg);
       break;
     case 'C':
       name_add_dir (arg);
       break;

-
+      

     case 'd':
       set_subcommand_option (DIFF_SUBCOMMAND);
       break;
     case 'd':
       set_subcommand_option (DIFF_SUBCOMMAND);
       break;

-
+      

     case 'f':
       if (archive_names == allocated_archive_names)
        archive_name_array = x2nrealloc (archive_name_array,
                                         &allocated_archive_names,
                                         sizeof (archive_name_array[0]));
     case 'f':
       if (archive_names == allocated_archive_names)
        archive_name_array = x2nrealloc (archive_name_array,
                                         &allocated_archive_names,
                                         sizeof (archive_name_array[0]));

-
+      

       archive_name_array[archive_names++] = arg;
       break;
       archive_name_array[archive_names++] = arg;
       break;

-
+      

     case 'F':
       /* Since -F is only useful with -M, make it implied.  Run this
         script at the end of each tape.  */
     case 'F':
       /* Since -F is only useful with -M, make it implied.  Run this
         script at the end of each tape.  */

-
+      

       info_script_option = arg;
       multi_volume_option = true;
       break;
       info_script_option = arg;
       multi_volume_option = true;
       break;

-
+      

     case 'g':
       listed_incremental_option = arg;
       after_date_option = true;
       /* Fall through.  */
     case 'g':
       listed_incremental_option = arg;
       after_date_option = true;
       /* Fall through.  */

-
+      

     case 'G':
       /* We are making an incremental dump (FIXME: are we?); save
         directories at the beginning of the archive, and include in each
         directory its contents.  */
     case 'G':
       /* We are making an incremental dump (FIXME: are we?); save
         directories at the beginning of the archive, and include in each
         directory its contents.  */

-
+      

       incremental_option = true;
       break;
       incremental_option = true;
       break;

-
+      

     case 'h':
       /* Follow symbolic links.  */
       dereference_option = true;
       break;
     case 'h':
       /* Follow symbolic links.  */
       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
         the record with garbage.  */
     case 'i':
       /* Ignore zero blocks (eofs).  This can't be the default,
         because Unix tar writes two blocks of zeros, then pads out
         the record with garbage.  */

-
+      

       ignore_zeros_option = true;
       break;
       ignore_zeros_option = true;
       break;

-
-    case 'I':
-      USAGE_ERROR ((0, 0,
-                   _("Warning: the -I option is not supported;"
-                     " perhaps you meant -j or -T?")));
-      break;
-
+      

     case 'j':
       set_use_compress_program_option ("bzip2");
       break;
     case 'j':
       set_use_compress_program_option ("bzip2");
       break;

-
+      
+    case 'J':
+      set_use_compress_program_option ("xz");
+      break;
+      

     case 'k':
       /* Don't replace existing files.  */
       old_files_option = KEEP_OLD_FILES;
       break;
     case 'k':
       /* Don't replace existing files.  */
       old_files_option = KEEP_OLD_FILES;
       break;

-
+      

     case 'K':
       starting_file_option = true;
     case 'K':
       starting_file_option = true;

-      addname (arg, 0);
+      addname (arg, 0, true, NULL);

       break;
       break;

-
+      

     case ONE_FILE_SYSTEM_OPTION:
       /* When dumping directories, don't dump files/subdirectories
         that are on other filesystems. */
       one_file_system_option = true;
       break;
     case ONE_FILE_SYSTEM_OPTION:
       /* When dumping directories, don't dump files/subdirectories
         that are on other filesystems. */
       one_file_system_option = true;
       break;

-
+      

     case 'l':
       check_links_option = 1;
       break;
     case 'l':
       check_links_option = 1;
       break;

-
+      

     case 'L':
       {
        uintmax_t u;
     case 'L':
       {
        uintmax_t u;


@@ -1288,80 +1418,101 @@ parse_opt (int key, char *arg, struct argp_state *state)
        multi_volume_option = true;
       }
       break;
        multi_volume_option = true;
       }
       break;

-
+      
+    case LEVEL_OPTION:
+      {
+       char *p;
+       incremental_level = strtoul (arg, &p, 10);
+       if (*p)
+         USAGE_ERROR ((0, 0, _("Invalid incremental level value")));
+      }
+      break;
+      
+    case LZMA_OPTION:
+      set_use_compress_program_option ("lzma");
+      break;
+      
+    case LZOP_OPTION:
+      set_use_compress_program_option ("lzop");
+      break;
+      

     case 'm':
       touch_option = true;
       break;
     case 'm':
       touch_option = true;
       break;

-
+      

     case 'M':
       /* Make multivolume archive: when we can't write any more into
         the archive, re-open it, and continue writing.  */
     case 'M':
       /* Make multivolume archive: when we can't write any more into
         the archive, re-open it, and continue writing.  */

-
+      

       multi_volume_option = true;
       break;
       multi_volume_option = true;
       break;

-
+      

     case MTIME_OPTION:
       get_date_or_file (args, "--mtime", arg, &mtime_option);
       set_mtime_option = true;
       break;
     case MTIME_OPTION:
       get_date_or_file (args, "--mtime", arg, &mtime_option);
       set_mtime_option = true;
       break;

-
+      

     case 'n':
     case 'n':

-      seekable_archive = true;
+      seek_option = 1;

       break;
       break;

-
+      
+    case NO_SEEK_OPTION:
+      seek_option = 0;
+      break;
+      

     case 'N':
       after_date_option = true;
       /* Fall through.  */
     case 'N':
       after_date_option = true;
       /* Fall through.  */

-
+      

     case NEWER_MTIME_OPTION:
       if (NEWER_OPTION_INITIALIZED (newer_mtime_option))
        USAGE_ERROR ((0, 0, _("More than one threshold date")));
       get_date_or_file (args,
                        key == NEWER_MTIME_OPTION ? "--newer-mtime"
     case NEWER_MTIME_OPTION:
       if (NEWER_OPTION_INITIALIZED (newer_mtime_option))
        USAGE_ERROR ((0, 0, _("More than one threshold date")));
       get_date_or_file (args,
                        key == NEWER_MTIME_OPTION ? "--newer-mtime"

-                         : "--after-date", arg, &newer_mtime_option);
+                       : "--after-date", arg, &newer_mtime_option);

       break;
       break;

-
+      

     case 'o':
       args->o_option = true;
       break;
     case 'o':
       args->o_option = true;
       break;

-
+      

     case 'O':
       to_stdout_option = true;
       break;
     case 'O':
       to_stdout_option = true;
       break;

-
+      

     case 'p':
       same_permissions_option = true;
       break;
     case 'p':
       same_permissions_option = true;
       break;

-
+      

     case 'P':
       absolute_names_option = true;
       break;
     case 'P':
       absolute_names_option = true;
       break;

-
+      

     case 'r':
       set_subcommand_option (APPEND_SUBCOMMAND);
       break;
     case 'r':
       set_subcommand_option (APPEND_SUBCOMMAND);
       break;

-
+      

     case 'R':
       /* Print block numbers for debugging bad tar archives.  */
     case 'R':
       /* Print block numbers for debugging bad tar archives.  */

-
+      

       /* It would surely make sense to exchange -B and -R, but it seems
         that -B has been used for a long while in Sun tar and most
         BSD-derived systems.  This is a consequence of the block/record
         terminology confusion.  */
       /* It would surely make sense to exchange -B and -R, but it seems
         that -B has been used for a long while in Sun tar and most
         BSD-derived systems.  This is a consequence of the block/record
         terminology confusion.  */

-
+      

       block_number_option = true;
       break;
       block_number_option = true;
       break;

-
+      

     case 's':
       /* Names to extract are sorted.  */
     case 's':
       /* Names to extract are sorted.  */

-
+      

       same_order_option = true;
       break;
       same_order_option = true;
       break;

-
+      

     case 'S':
       sparse_option = true;
       break;
     case 'S':
       sparse_option = true;
       break;

-
+      

     case SPARSE_VERSION_OPTION:
       sparse_option = true;
       {
     case SPARSE_VERSION_OPTION:
       sparse_option = true;
       {


@@ -1377,17 +1528,17 @@ parse_opt (int key, char *arg, struct argp_state *state)
          }
       }
       break;
          }
       }
       break;

-
+      

     case 't':
       set_subcommand_option (LIST_SUBCOMMAND);
       verbose_option++;
       break;
     case 't':
       set_subcommand_option (LIST_SUBCOMMAND);
       verbose_option++;
       break;

-
+      

     case TEST_LABEL_OPTION:
       set_subcommand_option (LIST_SUBCOMMAND);
       test_label_option = true;
       break;
     case TEST_LABEL_OPTION:
       set_subcommand_option (LIST_SUBCOMMAND);
       test_label_option = true;
       break;

-
+      

     case 'T':
       update_argv (arg, state);
       /* Indicate we've been given -T option. This is for backward
     case 'T':
       update_argv (arg, state);
       /* Indicate we've been given -T option. This is for backward


@@ -1395,39 +1546,40 @@ parse_opt (int key, char *arg, struct argp_state *state)
         succeed */
       files_from_option = true;
       break;
         succeed */
       files_from_option = true;
       break;

-
+      

     case 'u':
       set_subcommand_option (UPDATE_SUBCOMMAND);
       break;
     case 'u':
       set_subcommand_option (UPDATE_SUBCOMMAND);
       break;

-
+      

     case 'U':
       old_files_option = UNLINK_FIRST_OLD_FILES;
       break;
     case 'U':
       old_files_option = UNLINK_FIRST_OLD_FILES;
       break;

-
+      

     case UTC_OPTION:
       utc_option = true;
       break;
     case UTC_OPTION:
       utc_option = true;
       break;

-
+      

     case 'v':
       verbose_option++;
     case 'v':
       verbose_option++;

+      warning_option |= WARN_VERBOSE_WARNINGS;

       break;
       break;

-
+      

     case 'V':
       volume_label_option = arg;
       break;
     case 'V':
       volume_label_option = arg;
       break;

-
+      

     case 'w':
       interactive_option = true;
       break;
     case 'w':
       interactive_option = true;
       break;

-
+      

     case 'W':
       verify_option = true;
       break;
     case 'W':
       verify_option = true;
       break;

-
+      

     case 'x':
       set_subcommand_option (EXTRACT_SUBCOMMAND);
       break;
     case 'x':
       set_subcommand_option (EXTRACT_SUBCOMMAND);
       break;

-
+      

     case 'X':
       if (add_exclude_file (add_exclude, excluded, arg,
                            MAKE_EXCL_OPTIONS (args), '\n')
     case 'X':
       if (add_exclude_file (add_exclude, excluded, arg,
                            MAKE_EXCL_OPTIONS (args), '\n')


@@ -1437,19 +1589,19 @@ parse_opt (int key, char *arg, struct argp_state *state)
          FATAL_ERROR ((0, e, "%s", quotearg_colon (arg)));
        }
       break;
          FATAL_ERROR ((0, e, "%s", quotearg_colon (arg)));
        }
       break;

-
+      

     case 'z':
       set_use_compress_program_option ("gzip");
       break;
     case 'z':
       set_use_compress_program_option ("gzip");
       break;

-
+      

     case 'Z':
       set_use_compress_program_option ("compress");
       break;
     case 'Z':
       set_use_compress_program_option ("compress");
       break;

-
+      

     case ANCHORED_OPTION:
       args->matching_flags |= EXCLUDE_ANCHORED;
       break;
     case ANCHORED_OPTION:
       args->matching_flags |= EXCLUDE_ANCHORED;
       break;

-
+      

     case ATIME_PRESERVE_OPTION:
       atime_preserve_option =
        (arg
     case ATIME_PRESERVE_OPTION:
       atime_preserve_option =
        (arg


@@ -1461,15 +1613,23 @@ parse_opt (int key, char *arg, struct argp_state *state)
                      _("--atime-preserve='system' is not supported"
                        " on this platform")));
       break;
                      _("--atime-preserve='system' is not supported"
                        " 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)
        {
          char *p;
     case CHECKPOINT_OPTION:
       if (arg)
        {
          char *p;

-
+         

          if (*arg == '.')
            {
          if (*arg == '.')
            {

-             checkpoint_style = checkpoint_dot;
+             checkpoint_compile_action (".");

              arg++;
            }
          checkpoint_option = strtoul (arg, &p, 0);
              arg++;
            }
          checkpoint_option = strtoul (arg, &p, 0);


@@ -1478,63 +1638,98 @@ parse_opt (int key, char *arg, struct argp_state *state)
                          _("--checkpoint value is not an integer")));
        }
       else
                          _("--checkpoint value is not an integer")));
        }
       else

-       checkpoint_option = 10;
+       checkpoint_option = DEFAULT_CHECKPOINT;

       break;
       break;

-
+      
+    case CHECKPOINT_ACTION_OPTION:
+      checkpoint_compile_action (arg);
+      break;
+      

     case BACKUP_OPTION:
       backup_option = true;
       if (arg)
        args->version_control_string = arg;
       break;
     case BACKUP_OPTION:
       backup_option = true;
       if (arg)
        args->version_control_string = arg;
       break;

-
+      

     case DELAY_DIRECTORY_RESTORE_OPTION:
       delay_directory_restore_option = true;
       break;
     case DELAY_DIRECTORY_RESTORE_OPTION:
       delay_directory_restore_option = true;
       break;

-
+      

     case NO_DELAY_DIRECTORY_RESTORE_OPTION:
       delay_directory_restore_option = false;
       break;
     case NO_DELAY_DIRECTORY_RESTORE_OPTION:
       delay_directory_restore_option = false;
       break;

-
+      

     case DELETE_OPTION:
       set_subcommand_option (DELETE_SUBCOMMAND);
       break;
     case DELETE_OPTION:
       set_subcommand_option (DELETE_SUBCOMMAND);
       break;

-
+      
+    case EXCLUDE_BACKUPS_OPTION:
+      add_exclude_array (backup_file_table);
+      break;
+      

     case EXCLUDE_OPTION:
       add_exclude (excluded, arg, MAKE_EXCL_OPTIONS (args));
       break;
     case EXCLUDE_OPTION:
       add_exclude (excluded, arg, MAKE_EXCL_OPTIONS (args));
       break;

-
+      

     case EXCLUDE_CACHES_OPTION:
     case EXCLUDE_CACHES_OPTION:

-      exclude_caches_option = true;
+      add_exclusion_tag ("CACHEDIR.TAG", exclusion_tag_contents,
+                        cachedir_file_p);

       break;
       break;

-
+      
+    case EXCLUDE_CACHES_UNDER_OPTION:
+      add_exclusion_tag ("CACHEDIR.TAG", exclusion_tag_under,
+                        cachedir_file_p);
+      break;
+      
+    case EXCLUDE_CACHES_ALL_OPTION:
+      add_exclusion_tag ("CACHEDIR.TAG", exclusion_tag_all,
+                        cachedir_file_p);
+      break;
+      
+    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 EXCLUDE_VCS_OPTION:
+      add_exclude_array (vcs_file_table);
+      break;
+      

     case FORCE_LOCAL_OPTION:
       force_local_option = true;
       break;
     case FORCE_LOCAL_OPTION:
       force_local_option = true;
       break;

-
+      

     case 'H':
       set_archive_format (arg);
       break;
     case 'H':
       set_archive_format (arg);
       break;

-
+      

     case INDEX_FILE_OPTION:
       index_file_name = arg;
       break;
     case INDEX_FILE_OPTION:
       index_file_name = arg;
       break;

-
+      

     case IGNORE_CASE_OPTION:
       args->matching_flags |= FNM_CASEFOLD;
       break;
     case IGNORE_CASE_OPTION:
       args->matching_flags |= FNM_CASEFOLD;
       break;

-
+      

     case IGNORE_COMMAND_ERROR_OPTION:
       ignore_command_error_option = true;
       break;
     case IGNORE_COMMAND_ERROR_OPTION:
       ignore_command_error_option = true;
       break;

-
+      

     case IGNORE_FAILED_READ_OPTION:
       ignore_failed_read_option = true;
       break;
     case IGNORE_FAILED_READ_OPTION:
       ignore_failed_read_option = true;
       break;

-
+      

     case KEEP_NEWER_FILES_OPTION:
       old_files_option = KEEP_NEWER_FILES;
       break;
     case KEEP_NEWER_FILES_OPTION:
       old_files_option = KEEP_NEWER_FILES;
       break;

-
+      

     case GROUP_OPTION:
       if (! (strlen (arg) < GNAME_FIELD_SIZE
             && gname_to_gid (arg, &group_option)))
     case GROUP_OPTION:
       if (! (strlen (arg) < GNAME_FIELD_SIZE
             && gname_to_gid (arg, &group_option)))


@@ -1545,10 +1740,10 @@ parse_opt (int key, char *arg, struct argp_state *state)
            group_option = g;
          else
            FATAL_ERROR ((0, 0, "%s: %s", quotearg_colon (arg),
            group_option = g;
          else
            FATAL_ERROR ((0, 0, "%s: %s", quotearg_colon (arg),

-                         _("%s: Invalid group")));
+                         _("Invalid group")));

        }
       break;
        }
       break;

-
+      

     case MODE_OPTION:
       mode_option = mode_compile (arg);
       if (!mode_option)
     case MODE_OPTION:
       mode_option = mode_compile (arg);
       if (!mode_option)


@@ -1556,45 +1751,49 @@ parse_opt (int key, char *arg, struct argp_state *state)
       initial_umask = umask (0);
       umask (initial_umask);
       break;
       initial_umask = umask (0);
       umask (initial_umask);
       break;

-
+      

     case NO_ANCHORED_OPTION:
       args->include_anchored = 0; /* Clear the default for comman line args */
       args->matching_flags &= ~ EXCLUDE_ANCHORED;
       break;
     case NO_ANCHORED_OPTION:
       args->include_anchored = 0; /* Clear the default for comman line args */
       args->matching_flags &= ~ EXCLUDE_ANCHORED;
       break;

-
+      

     case NO_IGNORE_CASE_OPTION:
       args->matching_flags &= ~ FNM_CASEFOLD;
       break;
     case NO_IGNORE_CASE_OPTION:
       args->matching_flags &= ~ FNM_CASEFOLD;
       break;

-
+      

     case NO_IGNORE_COMMAND_ERROR_OPTION:
       ignore_command_error_option = false;
       break;
     case NO_IGNORE_COMMAND_ERROR_OPTION:
       ignore_command_error_option = false;
       break;

-
+      

     case NO_OVERWRITE_DIR_OPTION:
       old_files_option = NO_OVERWRITE_DIR_OLD_FILES;
       break;
     case NO_OVERWRITE_DIR_OPTION:
       old_files_option = NO_OVERWRITE_DIR_OLD_FILES;
       break;

-
+      

     case NO_QUOTE_CHARS_OPTION:
       for (;*arg; arg++)
        set_char_quoting (NULL, *arg, 0);
       break;
     case NO_QUOTE_CHARS_OPTION:
       for (;*arg; arg++)
        set_char_quoting (NULL, *arg, 0);
       break;

-
+      

     case NO_WILDCARDS_OPTION:
       args->wildcards = disable_wildcards;
       break;
     case NO_WILDCARDS_OPTION:
       args->wildcards = disable_wildcards;
       break;

-
+      

     case NO_WILDCARDS_MATCH_SLASH_OPTION:
       args->matching_flags |= FNM_FILE_NAME;
       break;
     case NO_WILDCARDS_MATCH_SLASH_OPTION:
       args->matching_flags |= FNM_FILE_NAME;
       break;

-
+      

     case NULL_OPTION:
       filename_terminator = '\0';
       break;
     case NULL_OPTION:
       filename_terminator = '\0';
       break;

-
+      
+    case NO_NULL_OPTION:
+      filename_terminator = '\n';
+      break;
+      

     case NUMERIC_OWNER_OPTION:
       numeric_owner_option = true;
       break;
     case NUMERIC_OWNER_OPTION:
       numeric_owner_option = true;
       break;

-
+      

     case OCCURRENCE_OPTION:
       if (!arg)
        occurrence_option = 1;
     case OCCURRENCE_OPTION:
       if (!arg)
        occurrence_option = 1;


@@ -1608,15 +1807,15 @@ parse_opt (int key, char *arg, struct argp_state *state)
                          _("Invalid number")));
        }
       break;
                          _("Invalid number")));
        }
       break;

-
+      

     case OVERWRITE_DIR_OPTION:
       old_files_option = DEFAULT_OLD_FILES;
       break;
     case OVERWRITE_DIR_OPTION:
       old_files_option = DEFAULT_OLD_FILES;
       break;

-
+      

     case OVERWRITE_OPTION:
       old_files_option = OVERWRITE_OLD_FILES;
       break;
     case OVERWRITE_OPTION:
       old_files_option = OVERWRITE_OLD_FILES;
       break;

-
+      

     case OWNER_OPTION:
       if (! (strlen (arg) < UNAME_FIELD_SIZE
             && uname_to_uid (arg, &owner_option)))
     case OWNER_OPTION:
       if (! (strlen (arg) < UNAME_FIELD_SIZE
             && uname_to_uid (arg, &owner_option)))


@@ -1630,31 +1829,33 @@ parse_opt (int key, char *arg, struct argp_state *state)
                          _("Invalid owner")));
        }
       break;
                          _("Invalid owner")));
        }
       break;

-
+      

     case QUOTE_CHARS_OPTION:
       for (;*arg; arg++)
        set_char_quoting (NULL, *arg, 1);
       break;
     case QUOTE_CHARS_OPTION:
       for (;*arg; arg++)
        set_char_quoting (NULL, *arg, 1);
       break;

-
+      

     case QUOTING_STYLE_OPTION:
       tar_set_quoting_style (arg);
       break;
     case QUOTING_STYLE_OPTION:
       tar_set_quoting_style (arg);
       break;

-
+      

     case PAX_OPTION:
       args->pax_option = true;
       xheader_set_option (arg);
       break;
     case PAX_OPTION:
       args->pax_option = true;
       xheader_set_option (arg);
       break;

-
+      

     case POSIX_OPTION:
       set_archive_format ("posix");
       break;
     case POSIX_OPTION:
       set_archive_format ("posix");
       break;

-
+      

     case PRESERVE_OPTION:
       /* FIXME: What it is good for? */
       same_permissions_option = true;
       same_order_option = true;
     case PRESERVE_OPTION:
       /* 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;
       break;

-
+      

     case RECORD_SIZE_OPTION:
       {
        uintmax_t u;
     case RECORD_SIZE_OPTION:
       {
        uintmax_t u;


@@ -1669,32 +1870,36 @@ parse_opt (int key, char *arg, struct argp_state *state)
        blocking_factor = record_size / BLOCKSIZE;
       }
       break;
        blocking_factor = record_size / BLOCKSIZE;
       }
       break;

-
+      

     case RECURSIVE_UNLINK_OPTION:
       recursive_unlink_option = true;
       break;
     case RECURSIVE_UNLINK_OPTION:
       recursive_unlink_option = true;
       break;

-
+      

     case REMOVE_FILES_OPTION:
       remove_files_option = true;
       break;
     case REMOVE_FILES_OPTION:
       remove_files_option = true;
       break;

-
+      

     case RESTRICT_OPTION:
       restrict_option = true;
       break;
     case RESTRICT_OPTION:
       restrict_option = true;
       break;

-
+      

     case RMT_COMMAND_OPTION:
       rmt_command = arg;
       break;
     case RMT_COMMAND_OPTION:
       rmt_command = arg;
       break;

-
+      

     case RSH_COMMAND_OPTION:
       rsh_command_option = arg;
       break;
     case RSH_COMMAND_OPTION:
       rsh_command_option = arg;
       break;

-
+      

     case SHOW_DEFAULTS_OPTION:
     case SHOW_DEFAULTS_OPTION:

-      show_default_settings (stdout);
-      close_stdout ();
-      exit (0);
-
+      {
+       char *s = format_default_settings ();
+       printf ("%s\n", s);
+       close_stdout ();
+       free (s);
+       exit (0);
+      }
+      

     case STRIP_COMPONENTS_OPTION:
       {
        uintmax_t u;
     case STRIP_COMPONENTS_OPTION:
       {
        uintmax_t u;


@@ -1736,7 +1941,7 @@ parse_opt (int key, char *arg, struct argp_state *state)
       set_transform_expr (arg);
       break;
 
       set_transform_expr (arg);
       break;
 

-    case USE_COMPRESS_PROGRAM_OPTION:
+    case 'I':

       set_use_compress_program_option (arg);
       break;
 
       set_use_compress_program_option (arg);
       break;
 


@@ -1780,6 +1985,10 @@ parse_opt (int key, char *arg, struct argp_state *state)
       unquote_option = false;
       break;
 
       unquote_option = false;
       break;
 

+    case WARNING_OPTION:
+      set_warning_option (arg);
+      break;
+      

     case '0':
     case '1':
     case '2':
     case '0':
     case '1':
     case '2':


@@ -1844,28 +2053,6 @@ parse_opt (int key, char *arg, struct argp_state *state)
 
 #endif /* not DEVICE_PREFIX */
 
 
 #endif /* not DEVICE_PREFIX */
 

-    case '?':
-      tar_help (state);
-      close_stdout ();
-      exit (0);
-
-    case USAGE_OPTION:
-      argp_state_help (state, state->out_stream, ARGP_HELP_USAGE);
-      close_stdout ();
-      exit (0);
-
-    case VERSION_OPTION:
-      version_etc (state->out_stream, "tar", PACKAGE_NAME, VERSION,
-                  "John Gilmore", "Jay Fenlason", (char *) NULL);
-      close_stdout ();
-      exit (0);
-
-    case HANG_OPTION:
-      _argp_hang = atoi (arg ? arg : "3600");
-      while (_argp_hang-- > 0)
-       sleep (1);
-      break;
-

     default:
       return ARGP_ERR_UNKNOWN;
     }
     default:
       return ARGP_ERR_UNKNOWN;
     }


@@ -1878,7 +2065,7 @@ static struct argp argp = {
   N_("[FILE]..."),
   doc,
   NULL,
   N_("[FILE]..."),
   doc,
   NULL,

-  NULL,
+  tar_help_filter,

   NULL
 };
 
   NULL
 };
 


@@ -1893,25 +2080,33 @@ usage (int status)
 /* Parse the options for tar.  */
 
 static struct argp_option *
 /* Parse the options for tar.  */
 
 static struct argp_option *

-find_argp_option (struct argp_option *options, int letter)
+find_argp_option (struct argp_option *o, int letter)

 {
   for (;
 {
   for (;

-       !(options->name == NULL
-        && options->key == 0
-        && options->arg == 0
-        && options->flags == 0
-        && options->doc == NULL); options++)
-    if (options->key == letter)
-      return options;
+       !(o->name == NULL
+        && o->key == 0
+        && o->arg == 0
+        && o->flags == 0
+        && o->doc == NULL); o++)
+    if (o->key == letter)
+      return o;

   return NULL;
 }
 
   return NULL;
 }
 

+static const char *tar_authors[] = {
+  "John Gilmore",
+  "Jay Fenlason",
+  NULL
+};
+

 static void
 decode_options (int argc, char **argv)
 {
 static void
 decode_options (int argc, char **argv)
 {

-  int index;
+  int idx;

   struct tar_args args;
 
   struct tar_args args;
 

+  argp_version_setup ("tar", tar_authors);
+  

   /* Set some default option values.  */
   args.textual_date = NULL;
   args.wildcards = default_wildcards;
   /* Set some default option values.  */
   args.textual_date = NULL;
   args.wildcards = default_wildcards;


@@ -1922,7 +2117,8 @@ decode_options (int argc, char **argv)
   args.backup_suffix_string = getenv ("SIMPLE_BACKUP_SUFFIX");
   args.version_control_string = 0;
   args.input_files = false;
   args.backup_suffix_string = getenv ("SIMPLE_BACKUP_SUFFIX");
   args.version_control_string = 0;
   args.input_files = false;

-
+  args.compress_autodetect = false;
+  

   subcommand_option = UNKNOWN_SUBCOMMAND;
   archive_format = DEFAULT_FORMAT;
   blocking_factor = DEFAULT_BLOCKING;
   subcommand_option = UNKNOWN_SUBCOMMAND;
   archive_format = DEFAULT_FORMAT;
   blocking_factor = DEFAULT_BLOCKING;


@@ -1938,6 +2134,12 @@ decode_options (int argc, char **argv)
   owner_option = -1;
   group_option = -1;
 
   owner_option = -1;
   group_option = -1;
 

+  check_device_option = true;
+
+  incremental_level = -1;
+
+  seek_option = -1;
+  

   /* Convert old-style tar call by exploding option element and rearranging
      options accordingly.  */
 
   /* Convert old-style tar call by exploding option element and rearranging
      options accordingly.  */
 


@@ -1999,8 +2201,7 @@ decode_options (int argc, char **argv)
 
   prepend_default_options (getenv ("TAR_OPTIONS"), &argc, &argv);
 
 
   prepend_default_options (getenv ("TAR_OPTIONS"), &argc, &argv);
 

-  if (argp_parse (&argp, argc, argv, ARGP_IN_ORDER|ARGP_NO_HELP,
-                 &index, &args))
+  if (argp_parse (&argp, argc, argv, ARGP_IN_ORDER, &idx, &args))

     exit (TAREXIT_FAILURE);
 
 
     exit (TAREXIT_FAILURE);
 
 


@@ -2028,9 +2229,9 @@ decode_options (int argc, char **argv)
     }
 
   /* Handle operands after any "--" argument.  */
     }
 
   /* Handle operands after any "--" argument.  */

-  for (; index < argc; index++)
+  for (; idx < argc; idx++)

     {
     {

-      name_add_name (argv[index], MAKE_INCL_OPTIONS (&args));
+      name_add_name (argv[idx], MAKE_INCL_OPTIONS (&args));

       args.input_files = true;
     }
 
       args.input_files = true;
     }
 


@@ -2069,18 +2270,6 @@ decode_options (int argc, char **argv)
                          _("--occurrence cannot be used in the requested operation mode")));
     }
 
                          _("--occurrence cannot be used in the requested operation mode")));
     }
 

-  if (seekable_archive && subcommand_option == DELETE_SUBCOMMAND)
-    {
-      /* The current code in delete.c is based on the assumption that
-        skip_member() reads all data from the archive. So, we should
-        make sure it won't use seeks. On the other hand, the same code
-        depends on the ability to backspace a record in the archive,
-        so setting seekable_archive to false is technically incorrect.
-         However, it is tested only in skip_member(), so it's not a
-        problem. */
-      seekable_archive = false;
-    }
-

   if (archive_names == 0)
     {
       /* If no archive file name given, try TAPE from the environment, or
   if (archive_names == 0)
     {
       /* If no archive file name given, try TAPE from the environment, or


@@ -2102,7 +2291,10 @@ decode_options (int argc, char **argv)
       && NEWER_OPTION_INITIALIZED (newer_mtime_option))
     USAGE_ERROR ((0, 0,
                  _("Cannot combine --listed-incremental with --newer")));
       && NEWER_OPTION_INITIALIZED (newer_mtime_option))
     USAGE_ERROR ((0, 0,
                  _("Cannot combine --listed-incremental with --newer")));

-
+  if (incremental_level != -1 && !listed_incremental_option)
+    WARN ((0, 0,
+          _("--level is meaningless without --listed-incremental")));
+  

   if (volume_label_option)
     {
       if (archive_format == GNU_FORMAT || archive_format == OLDGNU_FORMAT)
   if (volume_label_option)
     {
       if (archive_format == GNU_FORMAT || archive_format == OLDGNU_FORMAT)


@@ -2174,6 +2366,13 @@ decode_options (int argc, char **argv)
   else if (utc_option)
     verbose_option = 2;
 
   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.  */
 
   /* Forbid using -c with no input files whatsoever.  Check that `-f -',
      explicit or implied, is used correctly.  */
 


@@ -2183,6 +2382,10 @@ decode_options (int argc, char **argv)
       if (!args.input_files && !files_from_option)
        USAGE_ERROR ((0, 0,
                      _("Cowardly refusing to create an empty archive")));
       if (!args.input_files && !files_from_option)
        USAGE_ERROR ((0, 0,
                      _("Cowardly refusing to create an empty archive")));

+      if (args.compress_autodetect && archive_names
+         && strcmp (archive_name_array[0], "-"))
+       set_comression_program_by_suffix (archive_name_array[0],
+                                         use_compress_program_option);

       break;
 
     case EXTRACT_SUBCOMMAND:
       break;
 
     case EXTRACT_SUBCOMMAND:


@@ -2235,6 +2438,8 @@ decode_options (int argc, char **argv)
        backup_option = false;
     }
 
        backup_option = false;
     }
 

+  checkpoint_finish_compile ();
+  

   if (verbose_option)
     report_textual_dates (&args);
 }
   if (verbose_option)
     report_textual_dates (&args);
 }


@@ -2261,9 +2466,6 @@ main (int argc, char **argv)
   /* Make sure we have first three descriptors available */
   stdopen ();
 
   /* Make sure we have first three descriptors available */
   stdopen ();
 

-  /* Close all inherited open descriptors, except for the first three */
-  closeopen ();
-

   /* Pre-allocate a few structures.  */
 
   allocated_archive_names = 10;
   /* Pre-allocate a few structures.  */
 
   allocated_archive_names = 10;


@@ -2273,14 +2475,18 @@ main (int argc, char **argv)
 
   obstack_init (&argv_stk);
 
 
   obstack_init (&argv_stk);
 

-#ifdef SIGCHLD
+  /* Ensure default behavior for some signals */
+  signal (SIGPIPE, SIG_DFL);

   /* System V fork+wait does not work if SIGCHLD is ignored.  */
   signal (SIGCHLD, SIG_DFL);
   /* System V fork+wait does not work if SIGCHLD is ignored.  */
   signal (SIGCHLD, SIG_DFL);

-#endif

 
 

+  /* Try to disable the ability to unlink a directory.  */
+  priv_set_remove_linkdir ();
+  

   /* Decode options.  */
 
   decode_options (argc, argv);
   /* Decode options.  */
 
   decode_options (argc, argv);

+

   name_init ();
 
   /* Main command execution.  */
   name_init ();
 
   /* Main command execution.  */


@@ -2343,12 +2549,12 @@ main (int argc, char **argv)
   name_term ();
 
   if (exit_status == TAREXIT_FAILURE)
   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 ();
   else if (ferror (stderr) || fclose (stderr) != 0)
 
   if (stdlis == stdout)
     close_stdout ();
   else if (ferror (stderr) || fclose (stderr) != 0)

-    exit_status = TAREXIT_FAILURE;
+    set_exit_status (TAREXIT_FAILURE);

 
   return exit_status;
 }
 
   return exit_status;
 }


@@ -2369,6 +2575,7 @@ tar_stat_destroy (struct tar_stat_info *st)
   free (st->gname);
   free (st->sparse_map);
   free (st->dumpdir);
   free (st->gname);
   free (st->sparse_map);
   free (st->dumpdir);

+  xheader_destroy (&st->xhdr);

   memset (st, 0, sizeof (*st));
 }
 
   memset (st, 0, sizeof (*st));
 }
 


@@ -2385,3 +2592,13 @@ tar_timespec_cmp (struct timespec a, struct timespec b)
     a.tv_nsec = b.tv_nsec = 0;
   return timespec_cmp (a, b);
 }
     a.tv_nsec = b.tv_nsec = 0;
   return timespec_cmp (a, b);
 }

+
+/* Set tar exit status to VAL, unless it is already indicating
+   a more serious condition. This relies on the fact that the
+   values of TAREXIT_ constants are ranged by severity. */
+void
+set_exit_status (int val)
+{
+  if (val > exit_status)
+    exit_status = val;
+}