Fix the compatibility check for the --occurrence option.

[chaz/tar] / src / tar.c

diff --git a/src/tar.c b/src/tar.c
index cbb6c68439c2d06d2c42b34cead3107275f1f9ae..91114332356842aa4c68974eeac1d2f2ce73dacc 100644 (file)
--- a/src/tar.c
+++ b/src/tar.c
@@ -1,8 +1,7 @@
 /* A tar (tape archiver) program.
 
-   Copyright (C) 1988, 1992, 1993, 1994, 1995, 1996, 1997, 1999, 2000,
-   2001, 2003, 2004, 2005, 2006, 2007, 2012
-   Free Software Foundation, Inc.
+   Copyright 1988, 1992-1997, 1999-2001, 2003-2007, 2012-2013 Free
+   Software Foundation, Inc.
 
    Written by John Gilmore, starting 1985-08-25.
 
@@ -17,8 +16,7 @@
    Public License for more details.
 
    You should have received a copy of the GNU General Public License along
-   with this program; if not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+   with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <system.h>
 
@@ -68,6 +66,12 @@
 # define DEFAULT_BLOCKING 20
 #endif
 
+/* Print a message if not all links are dumped */
+static int check_links_option;
+
+/* Number of allocated tape drive names.  */
+static size_t allocated_archive_names;
+
 \f
 /* Miscellaneous.  */
 
@@ -1377,8 +1381,8 @@ expand_pax_option (struct tar_args *targs, const char *arg)
              tmp[len-2] = 0;
              if (get_date_or_file (targs, "--pax-option", tmp, &ts) == 0)
                {
-                 char buf[UINTMAX_STRSIZE_BOUND], *s;
-                 s = umaxtostr (ts.tv_sec, buf);
+                 char buf[TIMESPEC_STRSIZE_BOUND];
+                 char const *s = code_timespec (ts, buf);
                  obstack_grow (&stk, s, strlen (s));
                }
              else
@@ -2342,7 +2346,31 @@ static const char *tar_authors[] = {
   "Jay Fenlason",
   NULL
 };
+\f
+/* Subcommand classes */
+#define SUBCL_READ    0x01   /* subcommand reads from the archive */
+#define SUBCL_WRITE   0x02   /* subcommand writes to the archive */
+#define SUBCL_UPDATE  0x04   /* subcommand updates existing archive */
+#define SUBCL_TEST    0x08   /* subcommand tests archive header or meta-info */
+#define SUBCL_OCCUR   0x10   /* subcommand allows the use of the occurrence
+                               option */
+
+static int subcommand_class[] = {
+  /* UNKNOWN_SUBCOMMAND */     0,
+  /* APPEND_SUBCOMMAND  */     SUBCL_WRITE|SUBCL_UPDATE,
+  /* CAT_SUBCOMMAND     */     SUBCL_WRITE,
+  /* CREATE_SUBCOMMAND  */     SUBCL_WRITE,
+  /* DELETE_SUBCOMMAND  */     SUBCL_WRITE|SUBCL_UPDATE|SUBCL_OCCUR,
+  /* DIFF_SUBCOMMAND    */     SUBCL_READ|SUBCL_OCCUR,
+  /* EXTRACT_SUBCOMMAND */     SUBCL_READ|SUBCL_OCCUR,
+  /* LIST_SUBCOMMAND    */     SUBCL_READ|SUBCL_OCCUR,
+  /* UPDATE_SUBCOMMAND  */     SUBCL_WRITE|SUBCL_UPDATE,
+  /* TEST_LABEL_SUBCOMMAND */  SUBCL_TEST
+};
 
+/* Return t if the subcommand_option is in class(es) f */
+#define IS_SUBCOMMAND_CLASS(f) (subcommand_class[subcommand_option] & (f))
+  
 static void
 decode_options (int argc, char **argv)
 {
@@ -2506,12 +2534,10 @@ decode_options (int argc, char **argv)
       if (!args.input_files)
        USAGE_ERROR ((0, 0,
                      _("--occurrence is meaningless without a file list")));
-      if (subcommand_option != DELETE_SUBCOMMAND
-         && subcommand_option != DIFF_SUBCOMMAND
-         && subcommand_option != EXTRACT_SUBCOMMAND
-         && subcommand_option != LIST_SUBCOMMAND)
-           USAGE_ERROR ((0, 0,
-                         _("--occurrence cannot be used in the requested operation mode")));
+      if (!IS_SUBCOMMAND_CLASS (SUBCL_OCCUR))
+       USAGE_ERROR ((0, 0,
+                     _("--occurrence cannot be used with %s"),
+                     subcommand_string (subcommand_option)));
     }
 
   if (archive_names == 0)
@@ -2570,15 +2596,16 @@ decode_options (int argc, char **argv)
        USAGE_ERROR ((0, 0, _("Cannot verify multi-volume archives")));
       if (use_compress_program_option)
        USAGE_ERROR ((0, 0, _("Cannot verify compressed archives")));
+      if (!IS_SUBCOMMAND_CLASS (SUBCL_WRITE))
+       USAGE_ERROR ((0, 0, _("--verify cannot be used with %s"),
+                     subcommand_string (subcommand_option)));
     }
 
   if (use_compress_program_option)
     {
       if (multi_volume_option)
        USAGE_ERROR ((0, 0, _("Cannot use multi-volume compressed archives")));
-      if (subcommand_option == UPDATE_SUBCOMMAND
-         || subcommand_option == APPEND_SUBCOMMAND
-         || subcommand_option == DELETE_SUBCOMMAND)
+      if (IS_SUBCOMMAND_CLASS (SUBCL_UPDATE))
        USAGE_ERROR ((0, 0, _("Cannot update compressed archives")));
       if (subcommand_option == CAT_SUBCOMMAND)
        USAGE_ERROR ((0, 0, _("Cannot concatenate compressed archives")));
@@ -2590,24 +2617,24 @@ decode_options (int argc, char **argv)
      --gray */
   if (args.pax_option
       && archive_format != POSIX_FORMAT
-      && !READ_LIKE_SUBCOMMAND)
+      && !IS_SUBCOMMAND_CLASS (SUBCL_READ))
     USAGE_ERROR ((0, 0, _("--pax-option can be used only on POSIX archives")));
 
   /* star creates non-POSIX typed archives with xattr support, so allow the
-     extra headers whenn reading */
+     extra headers when reading */
   if ((acls_option > 0)
       && archive_format != POSIX_FORMAT
-      && !READ_LIKE_SUBCOMMAND)
+      && !IS_SUBCOMMAND_CLASS (SUBCL_READ))
     USAGE_ERROR ((0, 0, _("--acls can be used only on POSIX archives")));
 
   if ((selinux_context_option > 0)
       && archive_format != POSIX_FORMAT
-      && !READ_LIKE_SUBCOMMAND)
+      && !IS_SUBCOMMAND_CLASS (SUBCL_READ))
     USAGE_ERROR ((0, 0, _("--selinux can be used only on POSIX archives")));
 
   if ((xattrs_option > 0)
       && archive_format != POSIX_FORMAT
-      && !READ_LIKE_SUBCOMMAND)
+      && !IS_SUBCOMMAND_CLASS (SUBCL_READ))
     USAGE_ERROR ((0, 0, _("--xattrs can be used only on POSIX archives")));
 
   /* If ready to unlink hierarchies, so we are for simpler files.  */