X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Ftar.c;h=9350c50e4d6a52a28b9ffefc7bae8d7acd342c90;hb=1665d38fb74067f82e3de2ec11020e84f3a0ad39;hp=f9a3038573e97fc0d9152fbb5ef9f4c9326dd571;hpb=572225dfdcc2f36c50128ae40f90f5efaf1b7a2c;p=chaz%2Ftar

diff --git a/src/tar.c b/src/tar.c
index f9a3038..9350c50 100644
--- a/src/tar.c
+++ b/src/tar.c
@@ -122,7 +122,8 @@ static struct fmttab {
   enum archive_format fmt;
 } const fmttab[] = {
   { "v7",      V7_FORMAT },
-  { "oldgnu",  OLDGNU_FORMAT },	
+  { "oldgnu",  OLDGNU_FORMAT },
+  { "ustar",   USTAR_FORMAT },
   { "posix",   POSIX_FORMAT },
 #if 0 /* not fully supported yet */
   { "star",    STAR_FORMAT },
@@ -442,7 +443,8 @@ Archive format selection:\n\
                                      FMTNAME is one of the following:\n\
                                      v7        old V7 tar format\n\
                                      oldgnu    GNU format as per tar <= 1.12\n\
-                                     posix     POSIX 1003.1-2001 tar format\n\
+                                     ustar     POSIX 1003.1-1988 (ustar) format\n\
+                                     posix     POSIX 1003.1-2001 (pax) format\n\
                                      gnu       GNU format\n\
       --old-archive, --portability   same as --format=v7\n\
       --posix                        same as --format=posix\n\
@@ -479,7 +481,7 @@ Local file selection:\n\
 	     stdout);
 #if !MSDOS
       fputs (_("\
-  -N, --newer=DATE             only store files newer than DATE\n\
+  -N, --newer=DATE-OR-FILE     only store files newer than DATE-OR-FILE\n\
       --newer-mtime=DATE       compare date and time when data changed only\n\
       --after-date=DATE        same as -N\n"),
 	     stdout);
@@ -1274,7 +1276,7 @@ see the file named COPYING for details."));
     archive_format = DEFAULT_ARCHIVE_FORMAT;
 
   if (archive_format == GNU_FORMAT && getenv ("POSIXLY_CORRECT"))
-    archive_format = POSIX_FORMAT;
+    archive_format = POSIX_FORMAT; /*FIXME?*/
 
   if (volume_label_option && subcommand_option == CREATE_SUBCOMMAND)
     assert_format (FORMAT_MASK (OLDGNU_FORMAT)
@@ -1284,7 +1286,8 @@ see the file named COPYING for details."));
       || multi_volume_option
       || sparse_option)
     assert_format (FORMAT_MASK (OLDGNU_FORMAT)
-		   | FORMAT_MASK (GNU_FORMAT));
+		   | FORMAT_MASK (GNU_FORMAT)
+		   | FORMAT_MASK (POSIX_FORMAT));
   
   if (occurrence_option)
     {
@@ -1314,7 +1317,7 @@ see the file named COPYING for details."));
 
   if (archive_names > 1 && !multi_volume_option)
     USAGE_ERROR ((0, 0,
-		  _("Multiple archive files requires `-M' option")));
+		  _("Multiple archive files require `-M' option")));
 
   if (listed_incremental_option
       && newer_mtime_option != TYPE_MINIMUM (time_t))
@@ -1341,6 +1344,22 @@ see the file named COPYING for details."));
 		      (unsigned long) volume_label_max_len));
     }
 
+  if (verify_option)
+    {
+      if (multi_volume_option)
+	USAGE_ERROR ((0, 0, _("Cannot verify multi-volume archives")));
+      if (use_compress_program_option)
+	USAGE_ERROR ((0, 0, _("Cannot verify compressed archives")));
+    }
+
+  if (use_compress_program_option)
+    {
+      if (multi_volume_option)
+	USAGE_ERROR ((0, 0, _("Cannot use multi-volume compressed archives")));
+      if (subcommand_option == UPDATE_SUBCOMMAND)
+	USAGE_ERROR ((0, 0, _("Cannot update compressed archives")));
+    }
+  
   /* If ready to unlink hierarchies, so we are for simpler files.  */
   if (recursive_unlink_option)
     old_files_option = UNLINK_FIRST_OLD_FILES;
@@ -1508,13 +1527,20 @@ main (int argc, char **argv)
 }
 
 void
-destroy_stat (struct tar_stat_info *st)
+tar_stat_init (struct tar_stat_info *st)
+{
+  memset (st, 0, sizeof (*st));
+}
+     
+void
+tar_stat_destroy (struct tar_stat_info *st)
 {
   free (st->orig_file_name);
   free (st->file_name);
   free (st->link_name);
   free (st->uname);
   free (st->gname);
+  free (st->sparse_map);
   memset (st, 0, sizeof (*st));
 }