X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Ftar.c;h=1f7289a4ef373b69939b633f4ccfec86f2e459a0;hb=df7b55a8f6354e30e8da62eec7f706df033d0c81;hp=e3f82f123e791803da0af9c6e8807e07c3525893;hpb=d36f5a3cc3280d6c4a58367bf51b527d5c14ac04;p=chaz%2Ftar

diff --git a/src/tar.c b/src/tar.c
index e3f82f1..1f7289a 100644
--- a/src/tar.c
+++ b/src/tar.c
@@ -68,6 +68,12 @@
 # define DEFAULT_BLOCKING 20
 #endif
 
+/* Print a message if not all links are dumped */
+static int check_links_option;
+
+/* Number of allocated tape drive names.  */
+static size_t allocated_archive_names;
+
 
 /* Miscellaneous.  */
 
@@ -304,6 +310,7 @@ enum
   NO_SAME_OWNER_OPTION,
   NO_SAME_PERMISSIONS_OPTION,
   NO_SEEK_OPTION,
+  NO_SELINUX_CONTEXT_OPTION,
   NO_UNQUOTE_OPTION,
   NO_WILDCARDS_MATCH_SLASH_OPTION,
   NO_WILDCARDS_OPTION,
@@ -329,6 +336,7 @@ enum
   RMT_COMMAND_OPTION,
   RSH_COMMAND_OPTION,
   SAME_OWNER_OPTION,
+  SELINUX_CONTEXT_OPTION,
   SHOW_DEFAULTS_OPTION,
   SHOW_OMITTED_DIRS_OPTION,
   SHOW_TRANSFORMED_NAMES_OPTION,
@@ -549,6 +557,10 @@ static struct argp_option options[] = {
    N_("specify the include pattern for xattr keys"), GRID+1 },
   {"xattrs-exclude", XATTR_EXCLUDE, N_("MASK"), 0,
    N_("specify the exclude pattern for xattr keys"), GRID+1 },
+  {"selinux", SELINUX_CONTEXT_OPTION, 0, 0,
+   N_("Enable the SELinux context support"), GRID+1 },
+  {"no-selinux", NO_SELINUX_CONTEXT_OPTION, 0, 0,
+   N_("Disable the SELinux context support"), GRID+1 },
   {"acls", ACLS_OPTION, 0, 0,
    N_("Enable the POSIX ACLs support"), GRID+1 },
   {"no-acls", NO_ACLS_OPTION, 0, 0,
@@ -1281,7 +1293,7 @@ update_argv (const char *filename, struct argp_state *state)
   for (i = state->next, p = start; *p; p += strlen (p) + 1, i++)
     {
       if (term == 0 && p[0] == '-')
-	state->argv[i++] = "--add-file";
+	state->argv[i++] = (char *) "--add-file";
       state->argv[i] = p;
     }
 }
@@ -1371,8 +1383,8 @@ expand_pax_option (struct tar_args *targs, const char *arg)
 	      tmp[len-2] = 0;
 	      if (get_date_or_file (targs, "--pax-option", tmp, &ts) == 0)
 		{
-		  char buf[UINTMAX_STRSIZE_BOUND], *s;
-		  s = umaxtostr (ts.tv_sec, buf);
+		  char buf[TIMESPEC_STRSIZE_BOUND];
+		  char const *s = code_timespec (ts, buf);
 		  obstack_grow (&stk, s, strlen (s));
 		}
 	      else
@@ -2007,7 +2019,7 @@ parse_opt (int key, char *arg, struct argp_state *state)
     case OLD_ARCHIVE_OPTION:
       set_archive_format ("v7");
       break;
-      
+
     case OVERWRITE_DIR_OPTION:
       old_files_option = DEFAULT_OLD_FILES;
       break;
@@ -2184,6 +2196,15 @@ parse_opt (int key, char *arg, struct argp_state *state)
       acls_option = -1;
       break;
 
+    case SELINUX_CONTEXT_OPTION:
+      set_archive_format ("posix");
+      selinux_context_option = 1;
+      break;
+
+    case NO_SELINUX_CONTEXT_OPTION:
+      selinux_context_option = -1;
+      break;
+
     case XATTR_OPTION:
       set_archive_format ("posix");
       xattrs_option = 1;
@@ -2585,6 +2606,11 @@ decode_options (int argc, char **argv)
       && !READ_LIKE_SUBCOMMAND)
     USAGE_ERROR ((0, 0, _("--acls can be used only on POSIX archives")));
 
+  if ((selinux_context_option > 0)
+      && archive_format != POSIX_FORMAT
+      && !READ_LIKE_SUBCOMMAND)
+    USAGE_ERROR ((0, 0, _("--selinux can be used only on POSIX archives")));
+
   if ((xattrs_option > 0)
       && archive_format != POSIX_FORMAT
       && !READ_LIKE_SUBCOMMAND)
@@ -2849,6 +2875,7 @@ tar_stat_destroy (struct tar_stat_info *st)
   free (st->link_name);
   free (st->uname);
   free (st->gname);
+  free (st->cntx_name);
   free (st->acls_a_ptr);
   free (st->acls_d_ptr);
   free (st->sparse_map);