(from_header, tar_checksum): Changed declaration. All callers updated.

[chaz/tar] / src / tar.c

diff --git a/src/tar.c b/src/tar.c
index a3e86923157ec155c25df1ccdb0a3ca9186ed1f1..74a177deea5753d8cb9ff5dd76f07827daf05f28 100644 (file)
--- a/src/tar.c
+++ b/src/tar.c
@@ -409,12 +409,16 @@ 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 },
@@ -1413,7 +1417,7 @@ decode_options (int argc, char **argv)
       else
        {
          /* UNIX98 compatibility */
-         same_owner_option = 1;
+         same_owner_option = -1;
        }
     }
 
@@ -1460,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
@@ -1605,6 +1621,7 @@ main (int argc, char **argv)
 {
   set_start_time ();
   program_name = argv[0];
+
   setlocale (LC_ALL, "");
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);