X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Ftar.c;h=60cd306d7ffdbb132dd17135276d0e6a191d3360;hb=e7db56c0ef5db2000c79fc87c96d669c51c6b2e9;hp=ff3ebc44371602ca69a4e7ce81decbe1a573507d;hpb=e370518b431746f9d427be2487a5065112a45df6;p=chaz%2Ftar

diff --git a/src/tar.c b/src/tar.c
index ff3ebc4..60cd306 100644
--- a/src/tar.c
+++ b/src/tar.c
@@ -187,6 +187,7 @@ enum
   CHECK_LINKS_OPTION,
   DELETE_OPTION,
   EXCLUDE_OPTION,
+  EXCLUDE_CACHES_OPTION,
   FORCE_LOCAL_OPTION,
   GROUP_OPTION,
   IGNORE_CASE_OPTION,
@@ -342,10 +343,10 @@ static struct argp_option options[] = {
   {"numeric-owner", NUMERIC_OWNER_OPTION, 0, 0,
    N_("always use numbers for user/group names"), 31 },
   {"preserve-permissions", 'p', 0, 0,
-   N_("extract permissions information"), 31 },
+   N_("extract information about file permissions (default for superuser)"), 31 },
   {"same-permissions", 0, 0, OPTION_ALIAS, NULL, 31 },
   {"no-same-permissions", NO_SAME_PERMISSIONS_OPTION, 0, 0,
-   N_("do not extract permissions information"), 31 },
+   N_("apply the user's umask when extracting permissions from the archive (default for ordinary users)"), 31 },
   {"preserve-order", 's', 0, 0,
    N_("sort names to extract to match archive"), 31 },
   {"same-order", 0, 0, OPTION_ALIAS, NULL, 31 },
@@ -408,13 +409,17 @@ static struct argp_option options[] = {
    N_("create archive of the given format."), 61 },
 
   {NULL, 0, NULL, 0, N_("FORMAT is one of the following:"), 62 },
-  {"  v7", 0, NULL, OPTION_DOC, N_("old V7 tar format"), 63},
-  {"  oldgnu", 0, NULL, OPTION_DOC, N_("GNU format as per tar <= 1.12"), 63},
-  {"  gnu", 0, NULL, OPTION_DOC, N_("GNU tar 1.13.x format"), 63},
-  {"  ustar", 0, NULL, OPTION_DOC, N_("POSIX 1003.1-1988 (ustar) format"), 63 },
-  {"  pax", 0, NULL, OPTION_DOC, N_("POSIX 1003.1-2001 (pax) format"), 63 },
-  {"  posix", 0, NULL, OPTION_DOC, N_("Same as pax"), 63 },
-
+  {"  v7", 0, NULL, OPTION_DOC|OPTION_NO_TRANS, N_("old V7 tar format"), 63},
+  {"  oldgnu", 0, NULL, OPTION_DOC|OPTION_NO_TRANS,
+   N_("GNU format as per tar <= 1.12"), 63},
+  {"  gnu", 0, NULL, OPTION_DOC|OPTION_NO_TRANS,
+   N_("GNU tar 1.13.x format"), 63},
+  {"  ustar", 0, NULL, OPTION_DOC|OPTION_NO_TRANS,
+   N_("POSIX 1003.1-1988 (ustar) format"), 63 },
+  {"  pax", 0, NULL, OPTION_DOC|OPTION_NO_TRANS,
+   N_("POSIX 1003.1-2001 (pax) format"), 63 },
+  {"  posix", 0, NULL, OPTION_DOC|OPTION_NO_TRANS, N_("Same as pax"), 63 },
+  
   {"old-archive", OLD_ARCHIVE_OPTION, 0, 0, /* FIXME */
    N_("same as --format=v7"), 68 },
   {"portability", 0, 0, OPTION_ALIAS, NULL, 68 },
@@ -449,6 +454,8 @@ static struct argp_option options[] = {
    N_("exclude files, given as a PATTERN"), 71 },
   {"exclude-from", 'X', N_("FILE"), 0,
    N_("exclude patterns listed in FILE"), 71 },
+  {"exclude-caches", EXCLUDE_CACHES_OPTION, 0, 0,
+   N_("exclude directories containing a cache tag"), 71 },
   {"ignore-case", IGNORE_CASE_OPTION, 0, 0,
    N_("exclusion ignores case"), 71 },
   {"anchored", ANCHORED_OPTION, 0, 0,
@@ -610,9 +617,9 @@ parse_opt(int key, char *arg, struct argp_state *state)
   
   switch (key)
     {
-      case 1:
+      case ARGP_KEY_ARG:
 	/* File name or non-parsed option, because of ARGP_IN_ORDER */
-	name_add (optarg);
+	name_add (arg);
 	args->input_files++;
 	break;
 
@@ -933,6 +940,10 @@ parse_opt(int key, char *arg, struct argp_state *state)
       add_exclude (excluded, arg, args->exclude_options | recursion_option);
       break;
       
+    case EXCLUDE_CACHES_OPTION:
+      exclude_caches_option = true;
+      break;
+
     case FORCE_LOCAL_OPTION:
       force_local_option = true;
       break;
@@ -1406,7 +1417,7 @@ decode_options (int argc, char **argv)
       else
 	{
 	  /* UNIX98 compatibility */
-	  same_owner_option = 1;
+	  same_owner_option = -1;
 	}
     }
 
@@ -1453,6 +1464,18 @@ decode_options (int argc, char **argv)
 			  _("--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
@@ -1598,6 +1621,7 @@ main (int argc, char **argv)
 {
   set_start_time ();
   program_name = argv[0];
+
   setlocale (LC_ALL, "");
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);