X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2Ftar.c;h=1daaf5754ce3f604adafa6940452a461a5d75c12;hb=b085ca30976ec26256344bd3532205d440e69309;hp=e0e731b1ec4d334f19af05d51062b25a209e0013;hpb=eada0a9b35a9324daaf0efa8443646e28d5f9bb5;p=chaz%2Ftar

diff --git a/src/tar.c b/src/tar.c
index e0e731b..1daaf57 100644
--- a/src/tar.c
+++ b/src/tar.c
@@ -158,6 +158,17 @@ archive_format_string (enum archive_format fmt)
   return "unknown?";
 }
 
+#define FORMAT_MASK(n) (1<<(n))
+
+static void
+assert_format(unsigned fmt_mask)
+{
+  if ((FORMAT_MASK(archive_format) & fmt_mask) == 0)
+    USAGE_ERROR ((0, 0,
+		  _("GNU features wanted on incompatible archive format")));
+}
+
+
 
 /* Options.  */
 
@@ -191,6 +202,7 @@ enum
   NO_WILDCARDS_MATCH_SLASH_OPTION,
   NULL_OPTION,
   NUMERIC_OWNER_OPTION,
+  OCCURRENCE_OPTION,
   OVERWRITE_OPTION,
   OWNER_OPTION,
   POSIX_OPTION,
@@ -278,6 +290,7 @@ static struct option long_options[] =
   {"no-same-owner", no_argument, &same_owner_option, -1},
   {"no-same-permissions", no_argument, &same_permissions_option, -1},
   {"numeric-owner", no_argument, 0, NUMERIC_OWNER_OPTION},
+  {"occurrence", optional_argument, 0, OCCURRENCE_OPTION},
   {"old-archive", no_argument, 0, 'o'},
   {"one-file-system", no_argument, 0, 'l'},
   {"overwrite", no_argument, 0, OVERWRITE_OPTION},
@@ -374,7 +387,14 @@ Operation modifiers:\n\
   -G, --incremental          handle old GNU-format incremental backup\n\
   -g, --listed-incremental=FILE\n\
                              handle new GNU-format incremental backup\n\
-      --ignore-failed-read   do not exit with nonzero on unreadable files\n"),
+      --ignore-failed-read   do not exit with nonzero on unreadable files\n\
+      --occurrence[=NUM]     process only the NUMth occurrence of each file in\n\
+                             the archive. This option is valid only in\n\
+                             conjunction with one of the subcommands --delete,\n\
+                             --diff, --extract or --list and when a list of\n\
+                             files is given either on the command line or\n\
+                             via -T option.\n\
+                             NUM defaults to 1.\n"),
 	     stdout);
       fputs (_("\
 \n\
@@ -1019,6 +1039,20 @@ decode_options (int argc, char **argv)
 	numeric_owner_option = true;
 	break;
 
+      case OCCURRENCE_OPTION:
+	if (!optarg)
+	  occurrence_option = 1;
+	else
+	  {
+	    uintmax_t u;
+	    if (xstrtoumax (optarg, 0, 10, &u, "") == LONGINT_OK)
+	      occurrence_option = u;
+	    else
+	      FATAL_ERROR ((0, 0, "%s: %s", quotearg_colon (optarg),
+			    _("Invalid number")));
+	  }
+	break;
+	
       case OVERWRITE_OPTION:
 	old_files_option = OVERWRITE_OLD_FILES;
 	break;
@@ -1219,8 +1253,8 @@ decode_options (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("tar (%s) %s\n", PACKAGE_NAME, PACKAGE_VERSION);
-      printf (_("Copyright (C) %d Free Software Foundation, Inc.\n"), 2003);
+      printf ("tar (%s) %s\n%s\n", PACKAGE_NAME, PACKAGE_VERSION,
+	      "Copyright (C) 2003 Free Software Foundation, Inc.");
       puts (_("\
 This program comes with NO WARRANTY, to the extent permitted by law.\n\
 You may redistribute it under the terms of the GNU General Public License;\n\
@@ -1248,6 +1282,29 @@ see the file named COPYING for details."));
     USAGE_ERROR ((0, 0,
 		  _("GNU features wanted on incompatible archive format")));
 
+  if (volume_label_option && subcommand_option == CREATE_SUBCOMMAND)
+    assert_format (FORMAT_MASK (OLDGNU_FORMAT)
+		   | FORMAT_MASK (GNU_FORMAT));
+
+  if (incremental_option
+      || multi_volume_option
+      || sparse_option)
+    assert_format (FORMAT_MASK (OLDGNU_FORMAT)
+		   | FORMAT_MASK (GNU_FORMAT));
+  
+  if (occurrence_option)
+    {
+      if (!input_files && !files_from_option)
+	USAGE_ERROR ((0, 0,
+		      _("--occurrence is meaningless without 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 (archive_names == 0)
     {
       /* If no archive file name given, try TAPE from the environment, or
@@ -1283,7 +1340,9 @@ see the file named COPYING for details."));
 	    : 0));
       if (volume_label_max_len < strlen (volume_label_option))
 	USAGE_ERROR ((0, 0,
-		      _("%s: Volume label is too long (limit is %lu bytes)"),
+		      ngettext ("%s: Volume label is too long (limit is %lu byte)",
+				"%s: Volume label is too long (limit is %lu bytes)",
+				volume_label_max_len),
 		      quotearg_colon (volume_label_option),
 		      (unsigned long) volume_label_max_len));
     }
@@ -1345,6 +1404,7 @@ see the file named COPYING for details."));
 	       textual_date_option, treated_as));
     }
 }
+
 
 /* Tar proper.  */