X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Ftar.c;h=a2ee37b179eea3e926ec038e42d9e52017bed048;hb=95be2c50b429bfe7201590dd744864ab64c5d87e;hp=1daaf5754ce3f604adafa6940452a461a5d75c12;hpb=eb6bef9909f1b7bded5af64da1a913e360f06359;p=chaz%2Ftar

diff --git a/src/tar.c b/src/tar.c
index 1daaf57..a2ee37b 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 },
@@ -218,7 +219,7 @@ enum
   USE_COMPRESS_PROGRAM_OPTION,
   VOLNO_FILE_OPTION,
   WILDCARDS_OPTION,
-  WILDCARDS_MATCH_SLASH_OPTION,
+  WILDCARDS_MATCH_SLASH_OPTION
 };
 
 /* If nonzero, display usage information and exit.  */
@@ -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,13 +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;
-
-  if (((volume_label_option && subcommand_option == CREATE_SUBCOMMAND)
-       || incremental_option || multi_volume_option || sparse_option)
-      && archive_format != OLDGNU_FORMAT && archive_format != GNU_FORMAT)
-    USAGE_ERROR ((0, 0,
-		  _("GNU features wanted on incompatible archive format")));
+    archive_format = POSIX_FORMAT; /*FIXME?*/
 
   if (volume_label_option && subcommand_option == CREATE_SUBCOMMAND)
     assert_format (FORMAT_MASK (OLDGNU_FORMAT)
@@ -1290,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)
     {
@@ -1510,17 +1507,24 @@ main (int argc, char **argv)
     error (0, 0, _("Error exit delayed from previous errors"));
   if (ferror (stderr) || fclose (stderr) != 0)
     exit_status = TAREXIT_FAILURE;
-  exit (exit_status);
+  return exit_status;
 }
 
 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));
 }