Updated

[chaz/tar] / src / tar.c

diff --git a/src/tar.c b/src/tar.c
index c460e5c2e9daca14c73d05b4d7460b2d44bac69e..f6a9e0d4dd4908d9c2610bf00f23c501cf0f8674 100644 (file)
--- a/src/tar.c
+++ b/src/tar.c
@@ -44,6 +44,10 @@
 
 /* Local declarations.  */
 
+#ifndef DEFAULT_ARCHIVE_FORMAT
+# define DEFAULT_ARCHIVE_FORMAT GNU_FORMAT
+#endif
+
 #ifndef DEFAULT_ARCHIVE
 # define DEFAULT_ARCHIVE "tar.out"
 #endif
@@ -112,6 +116,48 @@ confirm (const char *message_action, const char *message_name)
     return reply == 'y' || reply == 'Y';
   }
 }
+
+static struct fmttab {
+  char const *name;
+  enum archive_format fmt;
+} const fmttab[] = {
+  { "v7",      V7_FORMAT },
+  { "oldgnu",  OLDGNU_FORMAT },        
+  { "posix",   POSIX_FORMAT },
+#if 0 /* not fully supported yet */
+  { "star",    STAR_FORMAT },
+#endif
+  { "gnu",     GNU_FORMAT },
+  { NULL,       0 }
+};
+
+static void
+set_archive_format (char const *name)
+{
+  struct fmttab const *p;
+
+  for (p = fmttab; strcmp (p->name, name) != 0; )
+    if (! (++p)->name)
+      USAGE_ERROR ((0, 0, _("%s: Invalid archive format"),
+                   quotearg_colon (name)));
+
+  if (archive_format != DEFAULT_FORMAT && archive_format != p->fmt)
+    USAGE_ERROR ((0, 0, _("Conflicting archive format options")));
+  
+  archive_format = p->fmt;
+}
+
+static const char *
+archive_format_string (enum archive_format fmt)
+{
+  struct fmttab const *p;
+
+  for (p = fmttab; p->name; p++)
+    if (p->fmt == fmt)
+      return p->name;
+  return "unknown?";
+}
+
 \f
 /* Options.  */
 
@@ -131,6 +177,7 @@ enum
   DELETE_OPTION,
   EXCLUDE_OPTION,
   FORCE_LOCAL_OPTION,
+  FORMAT_OPTION,
   GROUP_OPTION,
   IGNORE_CASE_OPTION,
   IGNORE_FAILED_READ_OPTION,
@@ -197,6 +244,7 @@ static struct option long_options[] =
   {"file", required_argument, 0, 'f'},
   {"files-from", required_argument, 0, 'T'},
   {"force-local", no_argument, 0, FORCE_LOCAL_OPTION},
+  {"format", required_argument, 0, FORMAT_OPTION},
   {"get", no_argument, 0, 'x'},
   {"group", required_argument, 0, GROUP_OPTION},
   {"gunzip", no_argument, 0, 'z'},
@@ -368,10 +416,16 @@ Device blocking:\n\
       fputs (_("\
 \n\
 Archive format selection:\n\
+      --format=FMTNAME               create archive of the given format.\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\
+                                     gnu       GNU format\n\
+      --old-archive, --portability   same as --format=v7\n\
+      --posix                        same as --format=posix\n\
   -V, --label=NAME                   create archive with volume name NAME\n\
               PATTERN                at list/extract time, a globbing PATTERN\n\
-      --old-archive, --portability   write a V7 format archive\n\
-      --posix                        write a POSIX format archive\n\
   -j, --bzip2                        filter the archive through bzip2\n\
   -z, --gzip, --ungzip               filter the archive through gzip\n\
   -Z, --compress, --uncompress       filter the archive through compress\n\
@@ -442,12 +496,10 @@ The version control may be set with --backup or VERSION_CONTROL, values are:\n\
             stdout);
       printf (_("\
 \n\
-GNU tar cannot read nor produce `--posix' archives.  If POSIXLY_CORRECT\n\
-is set in the environment, GNU extensions are disallowed with `--posix'.\n\
-Support for POSIX is only partially implemented, don't count on it yet.\n\
 ARCHIVE may be FILE, HOST:FILE or USER@HOST:FILE; DATE may be a textual date\n\
 or a file name starting with `/' or `.', in which case the file's date is used.\n\
-*This* `tar' defaults to `-f%s -b%d'.\n"),
+*This* `tar' defaults to `--format=%s -f%s -b%d'.\n"),
+             archive_format_string (DEFAULT_ARCHIVE_FORMAT),
              DEFAULT_ARCHIVE, DEFAULT_BLOCKING);
       printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
     }
@@ -896,6 +948,10 @@ decode_options (int argc, char **argv)
        force_local_option = 1;
        break;
 
+      case FORMAT_OPTION:
+       set_archive_format (optarg);
+       break;
+       
       case INDEX_FILE_OPTION:
        index_file_name = optarg;
        break;
@@ -979,17 +1035,7 @@ decode_options (int argc, char **argv)
        break;
 
       case POSIX_OPTION:
-#if OLDGNU_COMPATIBILITY
-       if (archive_format == DEFAULT_FORMAT)
-         archive_format = GNU_FORMAT;
-       else if (archive_format != GNU_FORMAT)
-         USAGE_ERROR ((0, 0, _("Conflicting archive format options")));
-#else
-       if (archive_format == DEFAULT_FORMAT)
-         archive_format = POSIX_FORMAT;
-       else if (archive_format != POSIX_FORMAT)
-         USAGE_ERROR ((0, 0, _("Conflicting archive format options")));
-#endif
+       set_archive_format ("posix");
        break;
 
       case PRESERVE_OPTION:
@@ -1109,10 +1155,7 @@ decode_options (int argc, char **argv)
                xrealloc (archive_name_array,
                          sizeof (const char *) * allocated_archive_names);
            }
-         archive_name_array[archive_names++] = buf;
-
-         /* FIXME: How comes this works for many archives when buf is
-            not xstrdup'ed?  */
+         archive_name_array[archive_names++] = strdup (buf);
        }
        break;
 
@@ -1138,10 +1181,7 @@ decode_options (int argc, char **argv)
       if (subcommand_option == CREATE_SUBCOMMAND)
        {
          /* GNU Tar <= 1.13 compatibility */
-         if (archive_format == DEFAULT_FORMAT)
-           archive_format = V7_FORMAT;
-         else if (archive_format != V7_FORMAT)
-           USAGE_ERROR ((0, 0, _("Conflicting archive format options")));
+         set_archive_format ("v7");
        }
       else
        {
@@ -1179,18 +1219,12 @@ see the file named COPYING for details."));
   /* Derive option values and check option consistency.  */
 
   if (archive_format == DEFAULT_FORMAT)
-    {
-#if OLDGNU_COMPATIBILITY
-      archive_format = OLDGNU_FORMAT;
-#else
-      archive_format = GNU_FORMAT;
-#endif
-    }
+    archive_format = DEFAULT_ARCHIVE_FORMAT;
 
   if (archive_format == GNU_FORMAT && getenv ("POSIXLY_CORRECT"))
     archive_format = POSIX_FORMAT;
 
-  if ((volume_label_option
+  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,
@@ -1400,3 +1434,15 @@ main (int argc, char **argv)
     exit_status = TAREXIT_FAILURE;
   exit (exit_status);
 }
+
+void
+destroy_stat (struct tar_stat_info *st)
+{
+  free (st->orig_file_name);
+  free (st->file_name);
+  free (st->link_name);
+  free (st->uname);
+  free (st->gname);
+  memset (st, 0, sizeof (*st));
+}
+