Improve listed incremental dumps.

[chaz/tar] / src / tar.c

diff --git a/src/tar.c b/src/tar.c
index 90f65922e81c0d01b3fbce2397f3d00d6200945e..8d23a4faa656f270dee2a3b70838003a035e81ad 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, 2007 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,7 +22,6 @@
 #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>


@@ -51,6 +50,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.  */
 


@@ -250,8 +250,11 @@ 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,
   EXCLUDE_CACHES_OPTION,
   EXCLUDE_CACHES_UNDER_OPTION,
   DELETE_OPTION,
   EXCLUDE_CACHES_OPTION,
   EXCLUDE_CACHES_UNDER_OPTION,


@@ -260,6 +263,7 @@ enum
   EXCLUDE_TAG_OPTION,
   EXCLUDE_TAG_UNDER_OPTION,
   EXCLUDE_TAG_ALL_OPTION,
   EXCLUDE_TAG_OPTION,
   EXCLUDE_TAG_UNDER_OPTION,
   EXCLUDE_TAG_ALL_OPTION,

+  EXCLUDE_VCS_OPTION,

   FORCE_LOCAL_OPTION,
   GROUP_OPTION,
   HANG_OPTION,
   FORCE_LOCAL_OPTION,
   GROUP_OPTION,
   HANG_OPTION,


@@ -268,13 +272,19 @@ enum
   IGNORE_FAILED_READ_OPTION,
   INDEX_FILE_OPTION,
   KEEP_NEWER_FILES_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_OVERWRITE_DIR_OPTION,
   NO_QUOTE_CHARS_OPTION,
   NO_RECURSION_OPTION,


@@ -316,10 +326,10 @@ enum
   TRANSFORM_OPTION,
   UNQUOTE_OPTION,
   USAGE_OPTION,
   TRANSFORM_OPTION,
   UNQUOTE_OPTION,
   USAGE_OPTION,

-  USE_COMPRESS_PROGRAM_OPTION,

   UTC_OPTION,
   VERSION_OPTION,
   VOLNO_FILE_OPTION,
   UTC_OPTION,
   VERSION_OPTION,
   VOLNO_FILE_OPTION,

+  WARNING_OPTION, 

   WILDCARDS_MATCH_SLASH_OPTION,
   WILDCARDS_OPTION
 };
   WILDCARDS_MATCH_SLASH_OPTION,
   WILDCARDS_OPTION
 };


@@ -345,7 +355,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?]


@@ -353,7 +363,6 @@ 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-block gzip compression */
 
    y  per-file gzip compression
    Y  per-block gzip compression */


@@ -398,6 +407,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,


@@ -408,6 +419,12 @@ 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-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


@@ -469,9 +486,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,


@@ -574,20 +591,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 },
 


@@ -599,6 +632,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,


@@ -617,11 +652,13 @@ 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"
    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,
    N_("exclude directories containing FILE"), 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 },

   {"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,


@@ -632,6 +669,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,


@@ -645,7 +684,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,


@@ -653,9 +692,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 },


@@ -677,15 +717,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,


@@ -718,7 +763,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 },
 


@@ -726,7 +771,7 @@ 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 },
 
   {NULL, 0, NULL, 0,
    N_("Other options:"), GRID },
 


@@ -783,8 +828,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 \


@@ -796,6 +844,47 @@ struct tar_args        /* Variables used during option parsing */
   | (args)->matching_flags \
   | recursion_option)
 
   | (args)->matching_flags \
   | recursion_option)
 

+void
+exclude_vcs_files ()
+{
+  int i;
+  static char *vcs_file[] = {
+    /* 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
+  };
+
+  for (i = 0; vcs_file[i]; i++)
+    add_exclude (excluded, vcs_file[i], 0);
+}
+
+\f

 #ifdef REMOTE_SHELL
 # define DECL_SHOW_DEFAULT_SETTINGS(stream, printer)                      \
 {                                                                         \
 #ifdef REMOTE_SHELL
 # define DECL_SHOW_DEFAULT_SETTINGS(stream, printer)                      \
 {                                                                         \


@@ -968,6 +1057,9 @@ report_textual_dates (struct tar_args *args)
 \f
 static volatile int _argp_hang;
 
 \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 */
   {
     file_list_success,     /* OK, name read successfully */
 enum read_file_list_state  /* Result of reading file name from the list file */
   {
     file_list_success,     /* OK, name read successfully */


@@ -976,16 +1068,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)
        {


@@ -1066,7 +1158,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;


@@ -1080,7 +1173,8 @@ update_argv (const char *filename, struct argp_state *state)
        open_fatal (filename);
     }
 
        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)
        {
     {
       switch (read_state)
        {


@@ -1095,8 +1189,9 @@ update_argv (const char *filename, struct argp_state *state)
          {
            size_t size;
 
          {
            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);
 
            /* Prepare new stack contents */
            size = obstack_object_size (&argv_stk);


@@ -1109,7 +1204,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 */
            obstack_1grow (&argv_stk, 0);
            count = 1;
            /* Read rest of files using new filename terminator */

-           filename_terminator = 0;
+           term = 0;

            break;
          }
 
            break;
          }
 


@@ -1126,7 +1221,7 @@ update_argv (const char *filename, struct argp_state *state)
 
   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++;


@@ -1142,7 +1237,7 @@ update_argv (const char *filename, struct argp_state *state)
 
   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;
     }
        state->argv[i++] = "--add-file";
       state->argv[i] = p;
     }


@@ -1188,6 +1283,14 @@ parse_opt (int key, char *arg, struct argp_state *state)
       set_subcommand_option (CAT_SUBCOMMAND);
       break;
 
       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;


@@ -1258,6 +1361,10 @@ parse_opt (int key, char *arg, struct argp_state *state)
       dereference_option = true;
       break;
 
       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
     case 'i':
       /* Ignore zero blocks (eofs).  This can't be the default,
         because Unix tar writes two blocks of zeros, then pads out


@@ -1266,16 +1373,14 @@ parse_opt (int key, char *arg, struct argp_state *state)
       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;
     case 'k':
       /* Don't replace existing files.  */
       old_files_option = KEEP_OLD_FILES;


@@ -1283,7 +1388,7 @@ parse_opt (int key, char *arg, struct argp_state *state)
 
     case 'K':
       starting_file_option = true;
 
     case 'K':
       starting_file_option = true;

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

       break;
 
     case ONE_FILE_SYSTEM_OPTION:
       break;
 
     case ONE_FILE_SYSTEM_OPTION:


@@ -1307,6 +1412,23 @@ parse_opt (int key, char *arg, struct argp_state *state)
       }
       break;
 
       }
       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;


@@ -1428,6 +1550,7 @@ parse_opt (int key, char *arg, struct argp_state *state)
 
     case 'v':
       verbose_option++;
 
     case 'v':
       verbose_option++;

+      warning_option |= WARN_VERBOSE_WARNINGS;

       break;
 
     case 'V':
       break;
 
     case 'V':


@@ -1480,6 +1603,14 @@ parse_opt (int key, char *arg, struct argp_state *state)
                        " on this platform")));
       break;
 
                        " 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)
        {
     case CHECKPOINT_OPTION:
       if (arg)
        {


@@ -1487,7 +1618,7 @@ parse_opt (int key, char *arg, struct argp_state *state)
 
          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);


@@ -1496,9 +1627,13 @@ 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)
     case BACKUP_OPTION:
       backup_option = true;
       if (arg)


@@ -1539,14 +1674,18 @@ 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_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_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_TAG_ALL_OPTION:
       add_exclusion_tag (arg, exclusion_tag_all, NULL);
       break;

+
+    case EXCLUDE_VCS_OPTION:
+      exclude_vcs_files ();
+      break;

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


@@ -1632,6 +1771,10 @@ parse_opt (int key, char *arg, struct argp_state *state)
       filename_terminator = '\0';
       break;
 
       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;


@@ -1694,6 +1837,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;
       /* 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:
       break;
 
     case RECORD_SIZE_OPTION:


@@ -1777,7 +1922,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;
 


@@ -1821,6 +1966,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':


@@ -1934,23 +2083,23 @@ 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;
 }
 
 static void
 decode_options (int argc, char **argv)
 {
   return NULL;
 }
 
 static void
 decode_options (int argc, char **argv)
 {

-  int index;
+  int idx;

   struct tar_args args;
 
   /* Set some default option values.  */
   struct tar_args args;
 
   /* Set some default option values.  */


@@ -1963,7 +2112,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;


@@ -1979,6 +2129,10 @@ 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;
+  

   /* 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.  */
 


@@ -2041,7 +2195,7 @@ decode_options (int argc, char **argv)
   prepend_default_options (getenv ("TAR_OPTIONS"), &argc, &argv);
 
   if (argp_parse (&argp, argc, argv, ARGP_IN_ORDER|ARGP_NO_HELP,
   prepend_default_options (getenv ("TAR_OPTIONS"), &argc, &argv);
 
   if (argp_parse (&argp, argc, argv, ARGP_IN_ORDER|ARGP_NO_HELP,

-                 &index, &args))
+                 &idx, &args))

     exit (TAREXIT_FAILURE);
 
 
     exit (TAREXIT_FAILURE);
 
 


@@ -2069,9 +2223,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;
     }
 


@@ -2143,7 +2297,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)


@@ -2215,6 +2372,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.  */
 


@@ -2224,6 +2388,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:


@@ -2276,6 +2444,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);
 }


@@ -2302,9 +2472,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;


@@ -2314,14 +2481,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.  */


@@ -2384,7 +2555,7 @@ 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 ();
 
   if (stdlis == stdout)
     close_stdout ();


@@ -2410,6 +2581,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));
 }