Attachment 395254 Details for Bug 561855 – up2date version of the xattrs patch in Fedora

[patch] up2date version of the xattrs patch in Fedora

tar-1.19-xattrs.patch (text/plain), 48.08 KB, created by Kamil Dudka on 2010-02-20 13:04:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kamil Dudka

Created: 2010-02-20 13:04:45 UTC

Size: 48.08 KB

patch

obsolete

>diff --git a/configure.ac b/configure.ac
>index 762f8e4..c442489 100644
>--- a/configure.ac
>+++ b/configure.ac
>@@ -40,7 +40,7 @@ AC_CHECK_HEADERS_ONCE(fcntl.h linux/fd.h memory.h net/errno.h \
>   sys/param.h sys/device.h sys/filio.h sys/gentape.h \
>   sys/inet.h sys/io/trioctl.h \
>   sys/mtio.h sys/time.h sys/tprintf.h sys/tape.h \
>-  unistd.h locale.h)
>+  unistd.h locale.h attr/xattr.h sys/acl.h)
> 
> AC_CHECK_HEADERS([sys/buf.h], [], [],
> [#if HAVE_SYS_PARAM_H
>@@ -88,6 +88,12 @@ gl_INIT
> tar_PAXUTILS
> 
> AC_CHECK_FUNCS(fsync getdtablesize lstat mkfifo readlink symlink setlocale utimes)
>+AC_CHECK_FUNCS(getxattr  fgetxattr  lgetxattr \
>+               setxattr  fsetxattr  lsetxattr \
>+               listxattr flistxattr llistxattr,
>+               AC_DEFINE(HAVE_XATTRS,,[Define if we have a working extended attributes]),)
>+AC_CHECK_LIB(acl, acl_get_fd)
>+
> AC_CHECK_DECLS([getgrgid],,, [#include <grp.h>])
> AC_CHECK_DECLS([getpwuid],,, [#include <pwd.h>])
> AC_CHECK_DECLS([time],,, [#include <time.h>])
>@@ -203,6 +209,7 @@ AC_DEFINE_UNQUOTED(DEFAULT_QUOTING_STYLE, $DEFAULT_QUOTING_STYLE,
> # Iconv
> AM_ICONV
> AC_CHECK_HEADERS(iconv.h)
>+AC_CHECK_HEADERS(attr/xattr.h)
> AC_CHECK_TYPE(iconv_t,:,
>               AC_DEFINE(iconv_t, int,
>                         [Conversion descriptor type]),
>@@ -212,6 +219,17 @@ AC_CHECK_TYPE(iconv_t,:,
> #endif
> ])
> 
>+AC_ARG_ENABLE(selinux,
>+  AC_HELP_STRING([--enable-selinux],
>+    [enable SELinux support (disabled by default)]),
>+  [selinux_enabled=$enableval],
>+  [selinux_enabled=no])
>+
>+if test "x$selinux_enabled" = xyes; then
>+  AC_CHECK_LIB(selinux, getfilecon)
>+  AC_CHECK_HEADERS(selinux/selinux.h)
>+fi
>+
> # Gettext.
> AM_GNU_GETTEXT([external], [need-formatstring-macros])
> AM_GNU_GETTEXT_VERSION([0.16])
>diff --git a/doc/tar.texi b/doc/tar.texi
>index 7d8952b..e9c5693 100644
>--- a/doc/tar.texi
>+++ b/doc/tar.texi
>@@ -2345,6 +2345,10 @@ Normally when creating an archive, @command{tar} strips an initial
> @samp{/} from member names.  This option disables that behavior.
> @xref{absolute}.
> 
>+@opsummary{acl}
>+@item --acls
>+Causes @command{tar} to store ACL's.  @xref{Attributes}.
>+
> @opsummary{after-date}
> @item --after-date
> 
>@@ -2844,6 +2848,10 @@ contents have changed (as opposed to just @option{--newer}, which will
> also back up files for which any status information has
> changed).  @xref{after}.
> 
>+@opsummary{no-acl}
>+@item --no-acls
>+Causes @command{tar} not to store and not to extract ACL's.  @xref{Attributes}.
>+
> @opsummary{no-anchored}
> @item --no-anchored
> An exclude pattern can match any subsequence of the name's components.
>@@ -2919,11 +2927,21 @@ When extracting an archive, subtract the user's umask from files from
> the permissions specified in the archive.  This is the default behavior
> for ordinary users.
> 
>+@opsummary{no-selinux}
>+@item --no-selinux
>+Causes @command{tar} not to store and not to extract SELinux security context.
>+@xref{Attributes}.
>+
> @opsummary{no-unquote}
> @item --no-unquote
> Treat all input file or member names literally, do not interpret
> escape sequences.  @xref{input name quoting}.
> 
>+@opsummary{no-xattrs}
>+@item --no-xattrs
>+Causes @command{tar} not to store and not to extract xattrs. This option also
>+enables @option{--no-selinux} and @option{--no-acls}.  @xref{Attributes}.
>+
> @opsummary{no-wildcards}
> @item --no-wildcards
> Do not use wildcards.
>@@ -3151,6 +3169,11 @@ locations.  Usually @command{tar} determines automatically whether
> the archive can be seeked or not.  This option is intended for use
> in cases when such recognition fails.
> 
>+@opsummary{selinux}
>+@item --selinux
>+Causes @command{tar} to store SElinux security context.  @xref{Attributes}.
>+
>+
> @opsummary{show-defaults}
> @item --show-defaults
> 
>@@ -3349,6 +3372,11 @@ Used in conjunction with @option{--multi-volume}.  @command{tar} will
> keep track of which volume of a multi-volume archive it is working in
> @var{file}.  @xref{volno-file}.
> 
>+@opsummary{xattrs}
>+@item --xattrs
>+Causes @command{tar} to store xattrs. This option also enables
>+@option{--selinux} and @option{--acls}.  @xref{Attributes}.
>+
> @opsummary{wildcards}
> @item --wildcards
> Use wildcards when matching member names with patterns.
>@@ -8350,6 +8378,8 @@ implementation able to read @samp{ustar} archives will be able to read
> most @samp{posix} archives as well, with the only exception that any
> additional information (such as long file names etc.) will in such
> case be extracted as plain text files along with the files it refers to.
>+This is the only format that can store ACLs, SELinux context and extended
>+attributes.
> 
> This archive format will be the default format for future versions
> of @GNUTAR{}.
>@@ -8902,6 +8932,51 @@ Same as both @option{--same-permissions} and @option{--same-order}.
> 
> This option is deprecated, and will be removed in @GNUTAR{} version 1.23.
> 
>+@opindex acls
>+@item --acls
>+This option causes @command{tar} to store the current ACL in the archive.
>+
>+The @option{--acls} option has no equivalent short option name.
>+
>+@opindex selinux
>+@item --selinux
>+This option causes @command{tar} to store the current SELinux security context
>+information in the archive.
>+
>+The @option{--selinux} option has no equivalent short option name.
>+
>+@opindex xattrs
>+@item --xattrs
>+This option causes @command{tar} to store the current extended attributes in
>+the archive. This option also enables @option{--acls} and @option{--selinux} if
>+they haven't been set already.
>+
>+The @option{--xattrs} option has no equivalent short option name.
>+
>+@opindex no-acls
>+@item --no-acls
>+This option causes @command{tar} not to store the current ACL in the archive
>+and not to extract any ACL information in an archive.
>+
>+The @option{--no-acls} option has no equivalent short option name.
>+
>+@opindex no-selinux
>+@item --no-selinux
>+This option causes @command{tar} not to store the current SELinux security
>+context information in the archive and not to extract any SELinux information in
>+an archive.
>+
>+The @option{--no-selinux} option has no equivalent short option name.
>+
>+@opindex no-xattrs
>+@item --no-xattrs
>+This option causes @command{tar} not to store the current extended attributes in
>+the archive and not to extract any extended attributes in an archive. This
>+option also enables @option{--no-acls} and @option{--no-selinux} if
>+they haven't been set already.
>+
>+The @option{--no-xattrs} option has no equivalent short option name.
>+
> @end table
> 
> @node Portability
>diff --git a/src/Makefile.am b/src/Makefile.am
>index c22a568..8755333 100644
>--- a/src/Makefile.am
>+++ b/src/Makefile.am
>@@ -20,7 +20,7 @@
> 
> bin_PROGRAMS = tar
> 
>-noinst_HEADERS = arith.h common.h tar.h
>+noinst_HEADERS = arith.h common.h tar.h xattrs.h
> tar_SOURCES = \
>  buffer.c\
>  checkpoint.c\
>@@ -39,10 +39,11 @@ tar_SOURCES = \
>  tar.c\
>  transform.c\
>  update.c\
>- utf8.c
>+ utf8.c\
>+ xattrs.c
> 
> INCLUDES = -I$(top_srcdir)/lib -I../ -I../lib
> 
> LDADD = ../lib/libtar.a $(LIBINTL) $(LIBICONV)
> 
>-tar_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME)
>+tar_LDADD = $(LIBS) $(LDADD) $(LIB_CLOCK_GETTIME)
>diff --git a/src/common.h b/src/common.h
>index 9897b46..5318279 100644
>--- a/src/common.h
>+++ b/src/common.h
>@@ -248,6 +248,15 @@ GLOBAL int same_owner_option;
> /* If positive, preserve permissions when extracting.  */
> GLOBAL int same_permissions_option;
> 
>+/* If positive, save the SELinux context.  */
>+GLOBAL int selinux_context_option;
>+
>+/* If positive, save the ACLs.  */
>+GLOBAL int acls_option;
>+
>+/* If positive, save the user and root xattrs.  */
>+GLOBAL int xattrs_option;
>+
> /* When set, strip the given number of file name components from the file name
>    before extracting */
> GLOBAL size_t strip_name_components;
>@@ -673,6 +682,9 @@ extern char *output_start;
> 
> void update_archive (void);
> 
>+/* Module attrs.c.  */
>+#include "xattrs.h"
>+
> /* Module xheader.c.  */
> 
> void xheader_init (struct xheader *xhdr);
>@@ -694,6 +706,12 @@ bool xheader_string_end (struct xheader *xhdr, char const *keyword);
> bool xheader_keyword_deleted_p (const char *kw);
> char *xheader_format_name (struct tar_stat_info *st, const char *fmt,
> 			   size_t n);
>+void xheader_xattr_init(struct tar_stat_info *st);
>+void xheader_xattr_free(struct xattr_array *vals, size_t sz);
>+void xheader_xattr_copy(const struct tar_stat_info *st,
>+                        struct xattr_array **vals, size_t *sz);
>+void xheader_xattr_add(struct tar_stat_info *st,
>+                       const char *key, const char *val, size_t len);
> 
> /* Module system.c */
> 
>diff --git a/src/create.c b/src/create.c
>index a925160..29a6fd8 100644
>--- a/src/create.c
>+++ b/src/create.c
>@@ -24,6 +24,7 @@
> #include <quotearg.h>
> 
> #include "common.h"
>+
> #include <hash.h>
> 
> struct link
>@@ -944,6 +945,30 @@ start_header (struct tar_stat_info *st)
>       GNAME_TO_CHARS (st->gname, header->header.gname);
>     }
> 
>+  if (archive_format == POSIX_FORMAT)
>+    {
>+      if (acls_option > 0)
>+        {
>+          if (st->acls_a_ptr)
>+            xheader_store ("SCHILY.acl.access", st, NULL);
>+          if (st->acls_d_ptr)
>+            xheader_store ("SCHILY.acl.default", st, NULL);
>+        }
>+      if ((selinux_context_option > 0) && st->cntx_name)
>+        xheader_store ("RHT.security.selinux", st, NULL);
>+      if (xattrs_option > 0)
>+        {
>+          size_t scan_xattr = 0;
>+          struct xattr_array *xattr_map = st->xattr_map;
>+
>+          while (scan_xattr < st->xattr_map_size)
>+            {
>+              xheader_store (xattr_map[scan_xattr].xkey, st, &scan_xattr);
>+              ++scan_xattr;
>+            }
>+        }
>+    }
>+
>   return header;
> }
> 
>@@ -1578,6 +1603,10 @@ dump_file0 (struct tar_stat_info *st, const char *p,
> 	    }
> 	}
> 
>+      xattrs_acls_get(st, p, fd, !is_dir);
>+      xattrs_selinux_get(st, p, fd);
>+      xattrs_xattrs_get(st, p, fd);
>+
>       if (is_dir)
> 	{
> 	  const char *tag_file_name;
>@@ -1709,6 +1738,9 @@ dump_file0 (struct tar_stat_info *st, const char *p,
>       if (NAME_FIELD_SIZE - (archive_format == OLDGNU_FORMAT) < size)
> 	write_long_link (st);
> 
>+      xattrs_selinux_get(st, p, -1);
>+      xattrs_xattrs_get(st, p, -1);
>+
>       block_ordinal = current_block_ordinal ();
>       st->stat.st_size = 0;	/* force 0 size on symlink */
>       header = start_header (st);
>diff --git a/src/extract.c b/src/extract.c
>index 6d70398..ac33df2 100644
>--- a/src/extract.c
>+++ b/src/extract.c
>@@ -69,6 +69,13 @@ struct delayed_set_stat
>     mode_t invert_permissions;
>     enum permstatus permstatus;
>     bool after_links;
>+    char *cntx_name;
>+    char *acls_a_ptr;
>+    size_t acls_a_len;
>+    char *acls_d_ptr;
>+    size_t acls_d_len;
>+    size_t xattr_map_size;   /* Size of the xattr map */
>+    struct xattr_array *xattr_map;
>     char file_name[1];
>   };
> 
>@@ -96,6 +103,18 @@ struct delayed_link
>        hard-linked together.  */
>     struct string_list *sources;
> 
>+    /* SELinux context */
>+    char *cntx_name;
>+
>+    /* ACLs */
>+    char *acls_a_ptr;
>+    size_t acls_a_len;
>+    char *acls_d_ptr;
>+    size_t acls_d_len;
>+
>+    size_t xattr_map_size;   /* Size of the xattr map */
>+    struct xattr_array *xattr_map;
>+
>     /* The desired target of the desired link.  */
>     char target[1];
>   };
>@@ -276,6 +295,10 @@ set_stat (char const *file_name,
> 	 give files away.  */
>     }
> 
>+  xattrs_acls_set(st, file_name, typeflag);
>+  xattrs_selinux_set(st, file_name, typeflag);
>+  xattrs_xattrs_set(st, file_name, typeflag);
>+
>   if (0 < same_owner_option && permstatus != INTERDIR_PERMSTATUS)
>     {
>       /* When lchown exists, it should be used to change the attributes of
>@@ -352,6 +375,29 @@ delay_set_stat (char const *file_name, struct tar_stat_info const *st,
>   data->invert_permissions = invert_permissions;
>   data->permstatus = permstatus;
>   data->after_links = 0;
>+  data->cntx_name = NULL;
>+  assign_string (&data->cntx_name, st->cntx_name);
>+  if (st->acls_a_ptr)
>+    {
>+      data->acls_a_ptr = xmemdup(st->acls_a_ptr, st->acls_a_len + 1);
>+      data->acls_a_len = st->acls_a_len;
>+    }
>+  else
>+    {
>+      data->acls_a_ptr = NULL;
>+      data->acls_a_len = 0;
>+    }
>+  if (st->acls_d_ptr)
>+    {
>+      data->acls_d_ptr = xmemdup(st->acls_d_ptr, st->acls_d_len + 1);
>+      data->acls_d_len = st->acls_d_len;
>+    }
>+  else
>+    {
>+      data->acls_d_ptr = NULL;
>+      data->acls_d_len = 0;
>+    }
>+  xheader_xattr_copy (st, &data->xattr_map, &data->xattr_map_size);
>   strcpy (data->file_name, file_name);
>   delayed_set_stat_head = data;
> }
>@@ -546,6 +592,31 @@ maybe_recoverable (char *file_name, int *interdir_made)
>     }
> }
> 
>+/* Restore stat extended attributes (xattr) for FILE_NAME, using information
>+   given in *ST.  Restore before extraction because they may affect layout.
>+   If not restoring permissions, invert the
>+   INVERT_PERMISSIONS bits from the file's current permissions.
>+   TYPEFLAG specifies the type of the file.
>+   FILE_CREATED indicates set_xattr has created the file */
>+static int
>+set_xattr (char const *file_name, struct tar_stat_info const *st,
>+	   mode_t invert_permissions, char typeflag, int *file_created)
>+{
>+  int status = 0;
>+  int interdir_made = 0;
>+
>+  if ((xattrs_option >= 0) && st->xattr_map_size) {
>+    mode_t mode = current_stat_info.stat.st_mode & MODE_RWX & ~ current_umask;
>+
>+    do
>+      status = mknod (file_name, mode ^ invert_permissions, 0);
>+    while (status && maybe_recoverable ((char *)file_name, &interdir_made));
>+    xattrs_xattrs_set(st, file_name, typeflag);
>+    *file_created = 1;
>+  }
>+  return(status);
>+}
>+
> /* Fix the statuses of all directories whose statuses need fixing, and
>    which are not ancestors of FILE_NAME.  If AFTER_LINKS is
>    nonzero, do this for all such directories; otherwise, stop at the
>@@ -599,11 +670,22 @@ apply_nonancestor_delayed_set_stat (char const *file_name, bool after_links)
> 	  sb.stat.st_gid = data->gid;
> 	  sb.atime = data->atime;
> 	  sb.mtime = data->mtime;
>+          sb.cntx_name = data->cntx_name;
>+          sb.acls_a_ptr = data->acls_a_ptr;
>+          sb.acls_a_len = data->acls_a_len;
>+          sb.acls_d_ptr = data->acls_d_ptr;
>+          sb.acls_d_len = data->acls_d_len;
>+          sb.xattr_map = data->xattr_map;
>+          sb.xattr_map_size = data->xattr_map_size;
> 	  set_stat (data->file_name, &sb, cur_info,
> 		    data->invert_permissions, data->permstatus, DIRTYPE);
> 	}
> 
>       delayed_set_stat_head = data->next;
>+      xheader_xattr_free (data->xattr_map, data->xattr_map_size);
>+      free (data->cntx_name);
>+      free (data->acls_a_ptr);
>+      free (data->acls_d_ptr);
>       free (data);
>     }
> }
>@@ -696,7 +778,7 @@ extract_dir (char *file_name, int typeflag)
> 
> 
> static int
>-open_output_file (char *file_name, int typeflag, mode_t mode)
>+open_output_file (char *file_name, int typeflag, mode_t mode, int file_created)
> {
>   int fd;
>   int openflag = (O_WRONLY | O_BINARY | O_CREAT
>@@ -704,6 +786,10 @@ open_output_file (char *file_name, int typeflag, mode_t mode)
> 		     ? O_TRUNC
> 		     : O_EXCL));
> 
>+  /* File might be created in set_xattr. So clear O_EXCL to avoid open() failure */
>+  if (file_created)
>+    openflag = openflag & ~O_EXCL;
>+
> #if O_CTG
>   /* Contiguous files (on the Masscomp) have to specify the size in
>      the open call that creates them.  */
>@@ -760,8 +846,18 @@ extract_file (char *file_name, int typeflag)
>     }
>   else
>     {
>+      int file_created = 0;
>+      if (set_xattr (file_name, &current_stat_info, invert_permissions,
>+		     typeflag, &file_created))
>+        {
>+          skip_member ();
>+          open_error (file_name);
>+          return 1;
>+        }
>+
>       do
>-	fd = open_output_file (file_name, typeflag, mode ^ invert_permissions);
>+	fd = open_output_file (file_name, typeflag, mode ^ invert_permissions,
>+			       file_created);
>       while (fd < 0 && maybe_recoverable (file_name, &interdir_made));
> 
>       if (fd < 0)
>@@ -882,6 +978,13 @@ create_placeholder_file (char *file_name, bool is_symlink, int *interdir_made)
> 			    + strlen (file_name) + 1);
>       p->sources->next = 0;
>       strcpy (p->sources->string, file_name);
>+      p->cntx_name = NULL;
>+      assign_string (&p->cntx_name, current_stat_info.cntx_name);
>+      p->acls_a_ptr = NULL;
>+      p->acls_a_len = 0;
>+      p->acls_d_ptr = NULL;
>+      p->acls_d_len = 0;
>+      xheader_xattr_copy (&current_stat_info, &p->xattr_map, &p->xattr_map_size);
>       strcpy (p->target, current_stat_info.link_name);
> 
>       h = delayed_set_stat_head;
>@@ -1288,6 +1391,13 @@ apply_delayed_links (void)
> 		  struct tar_stat_info st1;
> 		  st1.stat.st_uid = ds->uid;
> 		  st1.stat.st_gid = ds->gid;
>+                  st1.cntx_name = ds->cntx_name;
>+                  st1.acls_a_ptr = ds->acls_a_ptr;
>+                  st1.acls_a_len = ds->acls_a_len;
>+                  st1.acls_d_ptr = ds->acls_d_ptr;
>+                  st1.acls_d_len = ds->acls_d_len;
>+                  st1.xattr_map = ds->xattr_map;
>+                  st1.xattr_map_size = ds->xattr_map_size;
> 		  set_stat (source, &st1, NULL, 0, 0, SYMTYPE);
> 		  valid_source = source;
> 		}
>@@ -1301,6 +1411,9 @@ apply_delayed_links (void)
> 	  sources = next;
> 	}
> 
>+   xheader_xattr_free (ds->xattr_map, ds->xattr_map_size);
>+   free (ds->cntx_name);
>+
>       {
> 	struct delayed_link *next = ds->next;
> 	free (ds);
>diff --git a/src/list.c b/src/list.c
>index c060701..abb94bf 100644
>--- a/src/list.c
>+++ b/src/list.c
>@@ -568,6 +568,13 @@ decode_header (union block *header, struct tar_stat_info *stat_info,
>   assign_string (&stat_info->gname,
> 		 header->header.gname[0] ? header->header.gname : NULL);
> 
>+  stat_info->acls_a_ptr = NULL;
>+  stat_info->acls_a_len = 0;
>+  stat_info->acls_d_ptr = NULL;
>+  stat_info->acls_d_len = 0;
>+  stat_info->cntx_name = NULL;
>+  xheader_xattr_init(stat_info);
>+
>   if (format == OLDGNU_FORMAT && incremental_option)
>     {
>       stat_info->atime.tv_sec = TIME_FROM_HEADER (header->oldgnu_header.atime);
>diff --git a/src/tar.c b/src/tar.c
>index dbffc2a..510350b 100644
>--- a/src/tar.c
>+++ b/src/tar.c
>@@ -246,7 +246,8 @@ tar_set_quoting_style (char *arg)
> 
> enum
> {
>-  ANCHORED_OPTION = CHAR_MAX + 1,
>+  ACLS_OPTION = CHAR_MAX + 1,
>+  ANCHORED_OPTION,
>   ATIME_PRESERVE_OPTION,
>   BACKUP_OPTION,
>   CHECK_DEVICE_OPTION,
>@@ -276,6 +277,7 @@ enum
>   MODE_OPTION,
>   MTIME_OPTION,
>   NEWER_MTIME_OPTION,
>+  NO_ACLS_OPTION,
>   NO_ANCHORED_OPTION,
>   NO_AUTO_COMPRESS_OPTION,
>   NO_CHECK_DEVICE_OPTION,
>@@ -288,9 +290,11 @@ enum
>   NO_RECURSION_OPTION,
>   NO_SAME_OWNER_OPTION,
>   NO_SAME_PERMISSIONS_OPTION,
>+  NO_SELINUX_CONTEXT_OPTION,
>   NO_UNQUOTE_OPTION,
>   NO_WILDCARDS_MATCH_SLASH_OPTION,
>   NO_WILDCARDS_OPTION,
>+  NO_XATTR_OPTION,
>   NULL_OPTION,
>   NUMERIC_OWNER_OPTION,
>   OCCURRENCE_OPTION,
>@@ -312,6 +316,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,
>@@ -328,7 +333,8 @@ enum
>   VERSION_OPTION,
>   VOLNO_FILE_OPTION,
>   WILDCARDS_MATCH_SLASH_OPTION,
>-  WILDCARDS_OPTION
>+  WILDCARDS_OPTION,
>+  XATTR_OPTION
> };
> 
> const char *argp_program_version = "tar (" PACKAGE_NAME ") " VERSION;
>@@ -465,6 +471,10 @@ static struct argp_option options[] = {
>   {NULL, 0, NULL, 0,
>    N_("Handling of file attributes:"), GRID },
> 
>+  {"acls", ACLS_OPTION, 0, 0,
>+   N_("Save the ACLs to the archive"), GRID+1 },
>+  {"no-acls", NO_ACLS_OPTION, 0, 0,
>+   N_("Don't extract the ACLs from the archive"), GRID+1 },
>   {"owner", OWNER_OPTION, N_("NAME"), 0,
>    N_("force NAME as owner for added files"), GRID+1 },
>   {"group", GROUP_OPTION, N_("NAME"), 0,
>@@ -495,6 +505,14 @@ static struct argp_option options[] = {
>   {"preserve-order", 's', 0, 0,
>    N_("sort names to extract to match archive"), GRID+1 },
>   {"same-order", 0, 0, OPTION_ALIAS, NULL, GRID+1 },
>+  {"selinux", SELINUX_CONTEXT_OPTION, 0, 0,
>+   N_("Save the SELinux context to the archive"), GRID+1 },
>+  {"no-selinux", NO_SELINUX_CONTEXT_OPTION, 0, 0,
>+   N_("Don't extract the SELinux context from the archive"), GRID+1 },
>+  {"xattrs", XATTR_OPTION, 0, 0,
>+   N_("Save the user/root xattrs to the archive"), GRID+1 },
>+  {"no-xattrs", NO_XATTR_OPTION, 0, 0,
>+   N_("Don't extract the user/root xattrs from the archive"), GRID+1 },
>   {"preserve", PRESERVE_OPTION, 0, 0,
>    N_("same as both -p and -s"), GRID+1 },
>   {"delay-directory-restore", DELAY_DIRECTORY_RESTORE_OPTION, 0, 0,
>@@ -1932,6 +1950,37 @@ parse_opt (int key, char *arg, struct argp_state *state)
>       same_permissions_option = -1;
>       break;
> 
>+    case ACLS_OPTION:
>+      set_archive_format ("posix");
>+      acls_option = 1;
>+      break;
>+
>+    case NO_ACLS_OPTION:
>+      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");
>+      if (!acls_option) acls_option = 1;
>+      if (!selinux_context_option) selinux_context_option = 1;
>+      xattrs_option = 1;
>+      break;
>+
>+    case NO_XATTR_OPTION:
>+      if (!acls_option) acls_option = -1;
>+      if (!selinux_context_option) selinux_context_option = -1;
>+      xattrs_option = -1;
>+      break;
>+
>     case RECURSION_OPTION:
>       recursion_option = FNM_LEADING_DIR;
>       break;
>@@ -2330,6 +2379,29 @@ decode_options (int argc, char **argv)
> 	  || subcommand_option != LIST_SUBCOMMAND))
>     USAGE_ERROR ((0, 0, _("--pax-option can be used only on POSIX archives")));
> 
>+  /* star create's non-POSIX typed archives with xattr support, so allow the
>+     extra headers */
>+  if ((acls_option > 0)
>+      && archive_format != POSIX_FORMAT
>+      && (subcommand_option != EXTRACT_SUBCOMMAND
>+	  || subcommand_option != DIFF_SUBCOMMAND
>+	  || subcommand_option != LIST_SUBCOMMAND))
>+    USAGE_ERROR ((0, 0, _("--acls can be used only on POSIX archives")));
>+
>+  if ((selinux_context_option > 0)
>+      && archive_format != POSIX_FORMAT
>+      && (subcommand_option != EXTRACT_SUBCOMMAND
>+	  || subcommand_option != DIFF_SUBCOMMAND
>+	  || subcommand_option != LIST_SUBCOMMAND))
>+    USAGE_ERROR ((0, 0, _("--selinux can be used only on POSIX archives")));
>+
>+  if ((xattrs_option > 0)
>+      && archive_format != POSIX_FORMAT
>+      && (subcommand_option != EXTRACT_SUBCOMMAND
>+	  || subcommand_option != DIFF_SUBCOMMAND
>+	  || subcommand_option != LIST_SUBCOMMAND))
>+    USAGE_ERROR ((0, 0, _("--xattrs can be used only on POSIX archives")));
>+
>   /* If ready to unlink hierarchies, so we are for simpler files.  */
>   if (recursive_unlink_option)
>     old_files_option = UNLINK_FIRST_OLD_FILES;
>@@ -2544,11 +2616,15 @@ tar_stat_init (struct tar_stat_info *st)
> void
> tar_stat_destroy (struct tar_stat_info *st)
> {
>+  xheader_xattr_free (st->xattr_map, st->xattr_map_size);
>   free (st->orig_file_name);
>   free (st->file_name);
>   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);
>   free (st->dumpdir);
>   xheader_destroy (&st->xhdr);
>diff --git a/src/tar.h b/src/tar.h
>index 7f72f3e..49ee1ee 100644
>--- a/src/tar.h
>+++ b/src/tar.h
>@@ -276,6 +276,14 @@ struct xheader
>   uintmax_t string_length;
> };
> 
>+/* Information about xattrs for a file.  */
>+struct xattr_array
>+  {
>+    char *xkey;
>+    char *xval_ptr;
>+    size_t xval_len;
>+  };
>+
> struct tar_stat_info
> {
>   char *orig_file_name;     /* name of file read from the archive header */
>@@ -287,6 +295,15 @@ struct tar_stat_info
> 
>   char          *uname;     /* user name of owner */
>   char          *gname;     /* group name of owner */
>+
>+  char *cntx_name;          /* SELinux context for the current archive entry. */
>+
>+  char *acls_a_ptr;         /* Access ACLs for the current archive entry. */
>+  size_t acls_a_len;        /* Access ACLs for the current archive entry. */
>+
>+  char *acls_d_ptr;         /* Default ACLs for the current archive entry. */
>+  size_t acls_d_len;        /* Default ACLs for the current archive entry. */
>+
>   struct stat   stat;       /* regular filesystem stat */
> 
>   /* STAT doesn't always have access, data modification, and status
>@@ -309,6 +326,9 @@ struct tar_stat_info
>   size_t sparse_map_size;   /* Size of the sparse map */
>   struct sp_array *sparse_map;
> 
>+  size_t xattr_map_size;   /* Size of the xattr map */
>+  struct xattr_array *xattr_map;
>+
>   /* Extended headers */
>   struct xheader xhdr;
>   
>diff --git a/src/xattrs.c b/src/xattrs.c
>new file mode 100644
>index 0000000..fea18c3
>--- /dev/null
>+++ b/src/xattrs.c
>@@ -0,0 +1,488 @@
>+/* Create a tar archive.
>+
>+   Copyright (C) 2006 Free Software Foundation, Inc.
>+
>+   Written by James Antill, on 2006-07-27.
>+
>+   This program is free software; you can redistribute it and/or modify it
>+   under the terms of the GNU General Public License as published by the
>+   Free Software Foundation; either version 2, or (at your option) any later
>+   version.
>+
>+   This program is distributed in the hope that it will be useful, but
>+   WITHOUT ANY WARRANTY; without even the implied warranty of
>+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
>+   Public License for more details.
>+
>+   You should have received a copy of the GNU General Public License along
>+   with this program; if not, write to the Free Software Foundation, Inc.,
>+   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
>+
>+#include <system.h>
>+
>+#include <quotearg.h>
>+
>+#include "common.h"
>+
>+
>+#ifndef HAVE_SELINUX_SELINUX_H
>+# undef HAVE_LIBSELINUX
>+#endif
>+
>+#ifndef HAVE_ATTR_XATTR_H
>+# undef HAVE_XATTRS
>+#endif
>+
>+#ifndef HAVE_SYS_ACL_H
>+# undef HAVE_LIBACL
>+#endif
>+
>+#ifdef HAVE_SELINUX_SELINUX_H
>+# include <selinux/selinux.h>
>+#endif
>+
>+#ifdef HAVE_ATTR_XATTR_H
>+# include <attr/xattr.h>
>+#endif
>+
>+#ifdef HAVE_SYS_ACL_H
>+# include <sys/acl.h>
>+#endif
>+
>+
>+#if 0 /* unused by xattr's atm. */
>+static void xattrs__fd_get(struct tar_stat_info *st,
>+                           char const *file_name, int fd, const char *attr,
>+                           char **ret_ptr, size_t *ret_len)
>+{
>+#ifdef HAVE_XATTRS
>+  static ssize_t asz = 1024;
>+  ssize_t ret = 0;
>+  static char *val = NULL;
>+
>+  if (!val) val = xmalloc (asz);
>+
>+  while (((ret = fgetxattr (fd, attr, val, asz)) == -1) &&
>+         (errno == ERANGE))
>+    {
>+      asz <<= 1;
>+      val = xrealloc (val, asz);
>+    }
>+
>+  if (ret != -1)
>+    {
>+      *ret_ptr = xmemdup (val, ret + 1);
>+      *ret_len = ret;
>+    }
>+  else if (errno != ENOATTR)
>+    call_arg_warn ("fgetxattr", file_name);
>+#endif
>+}
>+#endif
>+
>+static void xattrs__acls_get_a(struct tar_stat_info *st,
>+                               char const *file_name, int fd,
>+                               char **ret_ptr, size_t *ret_len)
>+{ /* "system.posix_acl_access" */
>+#ifdef HAVE_LIBACL
>+  char *val = NULL;
>+  ssize_t len;
>+  acl_t acl;
>+
>+  if (fd != -1)
>+  {
>+    if ((acl = acl_get_fd (fd)) == (acl_t)NULL)
>+    {
>+      if (errno != ENOTSUP)
>+        call_arg_warn ("acl_get_fd", file_name);
>+      return;
>+    }
>+  }
>+  else if ((acl = acl_get_file (file_name, ACL_TYPE_ACCESS)) == (acl_t)NULL)
>+  {
>+    if (errno != ENOTSUP)
>+      call_arg_warn ("acl_get_file", file_name);
>+    return;
>+  }
>+
>+
>+  val = acl_to_text(acl, &len);
>+  acl_free (acl);
>+
>+  if (val == NULL)
>+  {
>+    call_arg_warn ("acl_to_text", file_name);
>+    return;
>+  }
>+
>+  *ret_ptr = xstrdup (val);
>+  *ret_len = len;
>+
>+  acl_free (val);
>+#endif
>+}
>+
>+static void xattrs__acls_get_d(struct tar_stat_info *st,
>+                               char const *file_name,
>+                               char **ret_ptr, size_t *ret_len)
>+{ /* "system.posix_acl_default" */
>+#ifdef HAVE_LIBACL
>+  char *val = NULL;
>+  ssize_t len;
>+  acl_t acl;
>+
>+  if ((acl = acl_get_file (file_name, ACL_TYPE_DEFAULT)) == (acl_t)NULL)
>+  {
>+    if (errno != ENOTSUP)
>+      call_arg_warn ("acl_get_file", file_name);
>+    return;
>+  }
>+
>+  val = acl_to_text(acl, &len);
>+  acl_free (acl);
>+
>+  if (val == NULL)
>+  {
>+    call_arg_warn ("acl_to_text", file_name);
>+    return;
>+  }
>+
>+  *ret_ptr = xstrdup (val);
>+  *ret_len = len;
>+
>+  acl_free (val);
>+#endif
>+}
>+
>+void xattrs_acls_get(struct tar_stat_info *st, char const *file_name, int fd,
>+                     int xisfile)
>+{
>+  if (acls_option > 0)
>+    {
>+#ifndef HAVE_LIBACL
>+      static int done = 0;
>+      if (!done)
>+          WARN ((0, 0, _("ACL support requested, but not available")));
>+      done = 1;
>+#endif
>+      xattrs__acls_get_a (st, file_name, fd,
>+                          &st->acls_a_ptr, &st->acls_a_len);
>+      if (!xisfile)
>+        xattrs__acls_get_d (st, file_name,
>+                            &st->acls_d_ptr, &st->acls_d_len);
>+    }
>+}
>+
>+void xattrs_selinux_get(struct tar_stat_info *st, char const *file_name, int fd)
>+{
>+  if (selinux_context_option > 0)
>+  {
>+#ifndef HAVE_LIBSELINUX
>+      static int done = 0;
>+      if (!done)
>+          WARN ((0, 0, _("SELinux support requested, but not available")));
>+      done = 1;
>+#else
>+    if (fd == -1)
>+    {
>+      if ((lgetfilecon (file_name, &st->cntx_name) == -1) && (errno != ENOTSUP) && (errno != ENODATA))
>+        call_arg_warn ("lgetfilecon", file_name);
>+    }
>+    else if ((fgetfilecon (fd, &st->cntx_name) == -1) && (errno != ENOTSUP) && (errno != ENODATA))
>+      call_arg_warn ("fgetfilecon", file_name);
>+#endif
>+  }
>+}
>+
>+void xattrs_xattrs_get(struct tar_stat_info *st, char const *file_name, int fd)
>+{
>+  if (xattrs_option > 0)
>+    { /* get all xattrs ... this include security.* and system.* if
>+         available. We filter them here, but we have to filter them
>+         in xattrs_xattrs_set() anyway.
>+      */
>+      static ssize_t xsz = 1024;
>+      static char *xatrs = NULL;
>+      ssize_t xret = -1;
>+
>+#ifndef HAVE_XATTRS
>+      static int done = 0;
>+      if ((xattrs_option > 0) && !done)
>+          WARN ((0, 0, _("Xattr support requested, but not available")));
>+      done = 1;
>+#else
>+
>+      if (!xatrs) xatrs = xmalloc (xsz);
>+
>+      while (((fd == -1) ?
>+              ((xret = llistxattr (file_name, xatrs, xsz)) == -1) :
>+              ((xret = flistxattr (fd, xatrs, xsz)) == -1)) &&
>+             (errno == ERANGE))
>+        {
>+          xsz <<= 1;
>+          xatrs = xrealloc (xatrs, xsz);
>+        }
>+
>+      if (xret == -1)
>+        call_arg_warn ((fd == -1) ? "llistxattrs" : "flistxattrs", file_name);
>+      else
>+        {
>+          const char *attr = xatrs;
>+          static ssize_t asz = 1024;
>+          static char *val = NULL;
>+
>+          if (!val) val = xmalloc (asz);
>+
>+          while (xret > 0)
>+            {
>+              size_t len = strlen (attr);
>+              ssize_t aret = 0;
>+
>+              /* Archive all xattrs during creation, decide at extraction time
>+               * which ones are of interest/use for the target filesystem. */
>+              while (((fd == -1) ?
>+                      ((aret = lgetxattr (file_name, attr, val, asz)) == -1) :
>+                      ((aret = fgetxattr (fd, attr, val, asz)) == -1)) &&
>+                     (errno == ERANGE))
>+                {
>+                  asz <<= 1;
>+                  val = xrealloc (val, asz);
>+                }
>+
>+              if (aret != -1)
>+                xheader_xattr_add (st, attr, val, aret);
>+              else if (errno != ENOATTR)
>+                call_arg_warn ((fd==-1) ? "lgetxattr" : "fgetxattr", file_name);
>+
>+              attr += len + 1;
>+              xret -= len + 1;
>+            }
>+        }
>+#endif
>+    }
>+}
>+
>+static void xattrs__fd_set(struct tar_stat_info const *st,
>+                           char const *file_name, char typeflag,
>+                           const char *attr,
>+                           const char *ptr, size_t len)
>+{
>+#ifdef HAVE_XATTRS
>+  if (ptr)
>+    {
>+      const char *sysname = "setxattr";
>+      int ret = -1;
>+
>+      if (typeflag != SYMTYPE)
>+        ret = setxattr (file_name, attr, ptr, len, 0);
>+      else
>+        {
>+          sysname = "lsetxattr";
>+          ret = lsetxattr (file_name, attr, ptr, len, 0);
>+        }
>+
>+      /* do not print warnings when SELinux is disabled */
>+      if ((ret == -1) && (errno != EPERM) && (errno != ENOTSUP))
>+        call_arg_error(sysname, file_name);
>+    }
>+#endif
>+}
>+
>+/* convert unix permissions into an ACL ... needed due to "default" ACLs */
>+#ifdef HAVE_LIBACL
>+static acl_t perms2acl(int perms)
>+{
>+  char val[] = "user::---,group::---,other::---";
>+  /*            0123456789 123456789 123456789 123456789 */
>+
>+   /* user */
>+  if (perms & 0400) val[ 6] = 'r';
>+  if (perms & 0200) val[ 7] = 'w';
>+  if (perms & 0100) val[ 8] = 'x';
>+
>+  /* group */
>+  if (perms & 0040) val[17] = 'r';
>+  if (perms & 0020) val[18] = 'w';
>+  if (perms & 0010) val[19] = 'x';
>+
>+  /* other */
>+  if (perms & 0004) val[28] = 'r';
>+  if (perms & 0002) val[29] = 'w';
>+  if (perms & 0001) val[30] = 'x';
>+
>+  return (acl_from_text (val));
>+}
>+#endif
>+
>+static char *skip_to_ext_fields(char *ptr)
>+{
>+  ptr += strcspn(ptr, ":,\n"); /* skip tag name. Ie. user/group/default/mask */
>+
>+  if (*ptr != ':')
>+    return (ptr); /* error? no user/group field */
>+  ++ptr;
>+
>+  ptr += strcspn(ptr, ":,\n"); /* skip user/group name */
>+
>+  if (*ptr != ':')
>+    return (ptr); /* error? no perms field */
>+  ++ptr;
>+
>+  ptr += strcspn(ptr, ":,\n"); /* skip perms */
>+
>+  if (*ptr != ':')
>+    return (ptr); /* no extra fields */
>+
>+  return (ptr);
>+}
>+
>+/* The POSIX draft allows extra fields after the three main ones. Star
>+   uses this to add a fourth field for user/group which is the numeric ID.
>+   We just skip all extra fields atm. */
>+static const char *fixup_extra_acl_fields(const char *ptr)
>+{
>+  char *src = (char *)ptr;
>+  char *dst = (char *)ptr;
>+
>+  while (*src)
>+  {
>+    const char *old = src;
>+    size_t len = 0;
>+
>+    src = skip_to_ext_fields(src);
>+    len = src - old;
>+    if (old != dst) memmove(dst, old, len);
>+    dst += len;
>+
>+    if (*src == ':') /* We have extra fields, skip them all */
>+      src += strcspn(src, "\n,");
>+
>+    if ((*src == '\n') || (*src == ','))
>+      *dst++ = *src++; /* also done when dst == src, but that's ok */
>+  }
>+  if (src != dst)
>+    *dst = 0;
>+
>+  return ptr;
>+}
>+
>+static void xattrs__acls_set(struct tar_stat_info const *st,
>+                             char const *file_name, int type,
>+                             const char *ptr, size_t len)
>+{ /* "system.posix_acl_access" */
>+#ifdef HAVE_LIBACL
>+  acl_t acl;
>+
>+  if (ptr)
>+    {
>+      /* assert (strlen (ptr) == len); */
>+      ptr = fixup_extra_acl_fields(ptr);
>+
>+      acl = acl_from_text (ptr);
>+      acls_option = 1;
>+    }
>+  else if (acls_option > 0)
>+    acl = perms2acl (st->stat.st_mode);
>+  else
>+    return; /* don't call acl functions unless we first hit an ACL, or
>+               --acls was passed explicitly */
>+
>+  if (acl == (acl_t)NULL)
>+    {
>+      call_arg_warn ("acl_from_text", file_name);
>+      return;
>+    }
>+
>+  if (acl_set_file (file_name, type, acl) == -1)
>+    {
>+      if (errno != ENOTSUP)
>+        call_arg_warn ("acl_set_file", file_name);
>+    }
>+  acl_free (acl);
>+#endif
>+}
>+
>+void xattrs_acls_set(struct tar_stat_info const *st,
>+                     char const *file_name, char typeflag)
>+{
>+  if ((acls_option >= 0) && (typeflag != SYMTYPE))
>+    {
>+#ifndef HAVE_LIBACL
>+      static int done = 0;
>+      if (!done)
>+        WARN ((0, 0, _("ACL support requested, but not available")));
>+      done = 1;
>+#else
>+      xattrs__acls_set (st, file_name, ACL_TYPE_ACCESS,
>+                        st->acls_a_ptr, st->acls_a_len);
>+      if ((typeflag == DIRTYPE) || (typeflag == GNUTYPE_DUMPDIR))
>+        xattrs__acls_set (st, file_name, ACL_TYPE_DEFAULT,
>+                          st->acls_d_ptr, st->acls_d_len);
>+#endif
>+    }
>+}
>+
>+void xattrs_selinux_set(struct tar_stat_info const *st,
>+                        char const *file_name, char typeflag)
>+{
>+  if ((selinux_context_option >= 0) && st->cntx_name)
>+    {
>+      const char *sysname = "setfilecon";
>+      int ret = -1;
>+
>+#ifndef HAVE_LIBSELINUX
>+      static int done = 0;
>+      if (!done)
>+          WARN ((0, 0, _("SELinux support requested, but not available")));
>+      done = 1;
>+#else
>+      if (typeflag != SYMTYPE)
>+        ret = setfilecon (file_name, st->cntx_name);
>+      else
>+        {
>+          sysname = "lsetfilecon";
>+          ret = lsetfilecon (file_name, st->cntx_name);
>+        }
>+
>+      if ((ret == -1) && (errno == EPERM))
>+        call_arg_warn(sysname, file_name);
>+      else if ((ret == -1) && (errno != EOPNOTSUPP))
>+        call_arg_error(sysname, file_name);
>+#endif
>+    }
>+}
>+
>+void xattrs_xattrs_set(struct tar_stat_info const *st,
>+                       char const *file_name, char typeflag)
>+{
>+  if ((xattrs_option >= 0) && st->xattr_map_size)
>+    {
>+      size_t scan = 0;
>+
>+#ifndef HAVE_XATTRS
>+      static int done = 0;
>+      if (!done)
>+          WARN ((0, 0, _("Xattr support requested, but not available")));
>+      done = 1;
>+#else
>+      while (scan < st->xattr_map_size)
>+        {
>+          char *keyword = st->xattr_map[scan].xkey;
>+
>+          /* assert (!memcpy (keyword, "SCHILY.xattr.", strlen("SCHILY.xattr."))); */
>+          keyword += strlen("SCHILY.xattr.");
>+
>+          if (strncmp (keyword, "user.", strlen("user.")) &&
>+              strncmp (keyword, "lustre.", strlen("lustre.")) &&
>+              strncmp (keyword, "trusted.", strlen("trusted.")))
>+            continue; /* don't try and set anything but normal xattrs */
>+
>+          xattrs__fd_set (st, file_name, typeflag, keyword,
>+                          st->xattr_map[scan].xval_ptr,
>+                          st->xattr_map[scan].xval_len);
>+
>+          ++scan;
>+        }
>+#endif
>+    }
>+}
>diff --git a/src/xattrs.h b/src/xattrs.h
>new file mode 100644
>index 0000000..ebbd5c6
>--- /dev/null
>+++ b/src/xattrs.h
>@@ -0,0 +1,14 @@
>+
>+extern void xattrs_acls_get(struct tar_stat_info *st,
>+                            char const *file_name, int fd, int xisfile);
>+extern void xattrs_selinux_get(struct tar_stat_info *st,
>+                               char const *file_name, int fd);
>+extern void xattrs_xattrs_get(struct tar_stat_info *st,
>+                              char const *file_name, int fd);
>+
>+extern void xattrs_acls_set(struct tar_stat_info const *st,
>+                            char const *file_name, char typeflag);
>+extern void xattrs_selinux_set(struct tar_stat_info const *st,
>+                               char const *file_name, char typeflag);
>+extern void xattrs_xattrs_set(struct tar_stat_info const *st,
>+                              char const *file_name, char typeflag);
>diff --git a/src/xheader.c b/src/xheader.c
>index 919ecd3..8e18421 100644
>--- a/src/xheader.c
>+++ b/src/xheader.c
>@@ -417,6 +417,74 @@ xheader_write_global (struct xheader *xhdr)
>   free (name);
> }
> 
>+void xheader_xattr_init(struct tar_stat_info *st)
>+{
>+  st->xattr_map = NULL;
>+  st->xattr_map_size = 0;
>+}
>+
>+void xheader_xattr_free(struct xattr_array *xattr_map, size_t xattr_map_size)
>+{
>+  size_t scan = 0;
>+
>+  while (scan < xattr_map_size)
>+    {
>+      free (xattr_map[scan].xkey);
>+      free (xattr_map[scan].xval_ptr);
>+
>+      ++scan;
>+    }
>+  free (xattr_map);
>+}
>+
>+static void xheader_xattr__add(struct xattr_array **xattr_map,
>+                               size_t *xattr_map_size,
>+                               const char *key, const char *val, size_t len)
>+{
>+  size_t pos = (*xattr_map_size)++;
>+
>+  *xattr_map = xrealloc (*xattr_map,
>+                         *xattr_map_size * sizeof(struct xattr_array));
>+  (*xattr_map)[pos].xkey = xstrdup (key);
>+  (*xattr_map)[pos].xval_ptr = xmemdup (val, len + 1);
>+  (*xattr_map)[pos].xval_len = len;
>+}
>+
>+void xheader_xattr_add(struct tar_stat_info *st,
>+                       const char *key, const char *val, size_t len)
>+{
>+  size_t klen = strlen (key);
>+  char *xkey = xmalloc (strlen("SCHILY.xattr.") + klen + 1);
>+  char *tmp = xkey;
>+
>+  tmp = stpcpy (tmp, "SCHILY.xattr.");
>+  tmp = stpcpy (tmp, key);
>+
>+  xheader_xattr__add (&st->xattr_map, &st->xattr_map_size, xkey, val, len);
>+
>+  free (xkey);
>+}
>+
>+void xheader_xattr_copy(const struct tar_stat_info *st,
>+                        struct xattr_array **xattr_map, size_t *xattr_map_size)
>+{
>+  size_t scan = 0;
>+
>+  *xattr_map = NULL;
>+  *xattr_map_size = 0;
>+
>+  while (scan < st->xattr_map_size)
>+    {
>+      char  *key = st->xattr_map[scan].xkey;
>+      char  *val = st->xattr_map[scan].xval_ptr;
>+      size_t len = st->xattr_map[scan].xval_len;
>+
>+      xheader_xattr__add(xattr_map, xattr_map_size, key, val, len);
>+
>+      ++scan;
>+    }
>+}
>+
> 
> /* General Interface */
> 
>@@ -427,6 +495,7 @@ struct xhdr_tab
> 		 struct xheader *, void const *data);
>   void (*decoder) (struct tar_stat_info *, char const *, char const *, size_t);
>   bool protect;
>+  bool prefix;
> };
> 
> /* This declaration must be extern, because ISO C99 section 6.9.2
>@@ -443,8 +512,17 @@ locate_handler (char const *keyword)
>   struct xhdr_tab const *p;
> 
>   for (p = xhdr_tab; p->keyword; p++)
>-    if (strcmp (p->keyword, keyword) == 0)
>-      return p;
>+    if (p->prefix)
>+      {
>+        if (strncmp (p->keyword, keyword, strlen(p->keyword)) == 0)
>+          return p;
>+      }
>+  else
>+      {
>+        if (strcmp (p->keyword, keyword) == 0)
>+          return p;
>+      }
>+
>   return NULL;
> }
> 
>@@ -454,7 +532,7 @@ xheader_protected_pattern_p (const char *pattern)
>   struct xhdr_tab const *p;
> 
>   for (p = xhdr_tab; p->keyword; p++)
>-    if (p->protect && fnmatch (pattern, p->keyword, 0) == 0)
>+    if (!p->prefix && p->protect && fnmatch (pattern, p->keyword, 0) == 0)
>       return true;
>   return false;
> }
>@@ -465,7 +543,7 @@ xheader_protected_keyword_p (const char *keyword)
>   struct xhdr_tab const *p;
> 
>   for (p = xhdr_tab; p->keyword; p++)
>-    if (p->protect && strcmp (p->keyword, keyword) == 0)
>+    if (!p->prefix && p->protect && strcmp (p->keyword, keyword) == 0)
>       return true;
>   return false;
> }
>@@ -1417,6 +1495,71 @@ volume_filename_decoder (struct tar_stat_info *st,
> }
> 
> static void
>+xattr_selinux_coder (struct tar_stat_info const *st, char const *keyword,
>+                     struct xheader *xhdr, void const *data)
>+{
>+  code_string (st->cntx_name, keyword, xhdr);
>+}
>+
>+static void
>+xattr_selinux_decoder (struct tar_stat_info *st,
>+                       char const *keyword, char const *arg, size_t size)
>+{
>+  decode_string (&st->cntx_name, arg);
>+}
>+
>+static void
>+xattr_acls_a_coder (struct tar_stat_info const *st , char const *keyword,
>+                    struct xheader *xhdr, void const *data)
>+{
>+  xheader_print_n (xhdr, keyword, st->acls_a_ptr, st->acls_a_len);
>+}
>+
>+static void
>+xattr_acls_a_decoder (struct tar_stat_info *st,
>+                      char const *keyword, char const *arg, size_t size)
>+{
>+  st->acls_a_ptr = xmemdup (arg, size + 1);
>+  st->acls_a_len = size;
>+}
>+
>+static void
>+xattr_acls_d_coder (struct tar_stat_info const *st , char const *keyword,
>+                    struct xheader *xhdr, void const *data)
>+{
>+  xheader_print_n (xhdr, keyword, st->acls_d_ptr, st->acls_d_len);
>+}
>+
>+static void
>+xattr_acls_d_decoder (struct tar_stat_info *st,
>+                      char const *keyword, char const *arg, size_t size)
>+{
>+  st->acls_d_ptr = xmemdup (arg, size + 1);
>+  st->acls_d_len = size;
>+}
>+
>+static void
>+xattr_coder (struct tar_stat_info const *st , char const *keyword,
>+             struct xheader *xhdr, void const *data)
>+{
>+  struct xattr_array *xattr_map = st->xattr_map;
>+  const size_t *off = data;
>+  xheader_print_n (xhdr, keyword,
>+                   xattr_map[*off].xval_ptr, xattr_map[*off].xval_len);
>+}
>+
>+static void
>+xattr_decoder (struct tar_stat_info *st,
>+               char const *keyword, char const *arg, size_t size)
>+{
>+  char *xstr = NULL;
>+
>+  xstr = xmemdup(arg, size + 1);
>+  xheader_xattr_add(st, keyword + strlen("SCHILY.xattr."), xstr, size);
>+  free(xstr);
>+}
>+
>+static void
> sparse_major_coder (struct tar_stat_info const *st, char const *keyword,
> 		    struct xheader *xhdr, void const *data)
> {
>@@ -1453,18 +1596,18 @@ sparse_minor_decoder (struct tar_stat_info *st,
> }
> 
> struct xhdr_tab const xhdr_tab[] = {
>-  { "atime",	atime_coder,	atime_decoder,	  false },
>-  { "comment",	dummy_coder,	dummy_decoder,	  false },
>-  { "charset",	dummy_coder,	dummy_decoder,	  false },
>-  { "ctime",	ctime_coder,	ctime_decoder,	  false },
>-  { "gid",	gid_coder,	gid_decoder,	  false },
>-  { "gname",	gname_coder,	gname_decoder,	  false },
>-  { "linkpath", linkpath_coder, linkpath_decoder, false },
>-  { "mtime",	mtime_coder,	mtime_decoder,	  false },
>-  { "path",	path_coder,	path_decoder,	  false },
>-  { "size",	size_coder,	size_decoder,	  false },
>-  { "uid",	uid_coder,	uid_decoder,	  false },
>-  { "uname",	uname_coder,	uname_decoder,	  false },
>+  { "atime",   atime_coder,    atime_decoder,    false, false },
>+  { "comment", dummy_coder,    dummy_decoder,    false, false },
>+  { "charset", dummy_coder,    dummy_decoder,    false, false },
>+  { "ctime",   ctime_coder,    ctime_decoder,    false, false },
>+  { "gid",     gid_coder,      gid_decoder,      false, false },
>+  { "gname",   gname_coder,    gname_decoder,    false, false },
>+  { "linkpath", linkpath_coder, linkpath_decoder, false, false },
>+  { "mtime",   mtime_coder,    mtime_decoder,    false, false },
>+  { "path",    path_coder,     path_decoder,     false, false },
>+  { "size",    size_coder,     size_decoder,     false, false },
>+  { "uid",     uid_coder,      uid_decoder,      false, false },
>+  { "uname",   uname_coder,    uname_decoder,    false, false },
> 
>   /* Sparse file handling */
>   { "GNU.sparse.name",       path_coder, path_decoder,
>@@ -1479,25 +1622,25 @@ struct xhdr_tab const xhdr_tab[] = {
>     true },
> 
>   /* tar 1.14 - 1.15.90 keywords. */
>-  { "GNU.sparse.size",       sparse_size_coder, sparse_size_decoder, true },
>+  { "GNU.sparse.size",       sparse_size_coder, sparse_size_decoder, true, false },
>   /* tar 1.14 - 1.15.1 keywords. Multiple instances of these appeared in 'x'
>      headers, and each of them was meaningful. It confilcted with POSIX specs,
>      which requires that "when extended header records conflict, the last one
>      given in the header shall take precedence." */
>   { "GNU.sparse.offset",     sparse_offset_coder, sparse_offset_decoder,
>-    true },
>+    true, false },
>   { "GNU.sparse.numbytes",   sparse_numbytes_coder, sparse_numbytes_decoder,
>-    true },
>+    true, false },
>   /* tar 1.15.90 keyword, introduced to remove the above-mentioned conflict. */
>   { "GNU.sparse.map",        NULL /* Unused, see pax_dump_header() */,
>-    sparse_map_decoder, false },
>+    sparse_map_decoder, false, false },
> 
>   { "GNU.dumpdir",           dumpdir_coder, dumpdir_decoder,
>-    true },
>+    true, false },
> 
>   /* Keeps the tape/volume label. May be present only in the global headers.
>      Equivalent to GNUTYPE_VOLHDR.  */
>-  { "GNU.volume.label", volume_label_coder, volume_label_decoder, true },
>+  { "GNU.volume.label", volume_label_coder, volume_label_decoder, true, false },
> 
>   /* These may be present in a first global header of the archive.
>      They provide the same functionality as GNUTYPE_MULTIVOL header.
>@@ -1506,9 +1649,39 @@ struct xhdr_tab const xhdr_tab[] = {
>      GNU.volume.offset keeps the offset of the start of this volume,
>      otherwise kept in oldgnu_header.offset.  */
>   { "GNU.volume.filename", volume_label_coder, volume_filename_decoder,
>-    true },
>-  { "GNU.volume.size", volume_size_coder, volume_size_decoder, true },
>-  { "GNU.volume.offset", volume_offset_coder, volume_offset_decoder, true },
>+    true, false },
>+  { "GNU.volume.size", volume_size_coder, volume_size_decoder, true, false },
>+  { "GNU.volume.offset", volume_offset_coder, volume_offset_decoder,
>+    true, false },
>+
>+  /* We get the SELinux value from filecon, so add a namespace for SELinux
>+     instead of storing it in SCHILY.xattr.* (which would be RAW). */
>+  { "RHT.security.selinux",
>+    xattr_selinux_coder, xattr_selinux_decoder, false, false },
>+
>+  /* ACLs, use the star format... */
>+  { "SCHILY.acl.access",
>+    xattr_acls_a_coder, xattr_acls_a_decoder, false, false },
>+
>+  { "SCHILY.acl.default",
>+    xattr_acls_d_coder, xattr_acls_d_decoder, false, false },
>+
>+  /* FIXME: These are compat. for FC-6 ... we shipped a tar using the generic
>+     header names by accident. */
>+  { "SCHILY.xattr.security.selinux",
>+    xattr_selinux_coder, xattr_selinux_decoder, false, false },
>+  { "SCHILY.xattr.system.posix_acl_access",
>+    xattr_acls_a_coder, xattr_acls_a_decoder, false, false },
>+  { "SCHILY.xattr.system.posix_acl_default",
>+    xattr_acls_d_coder, xattr_acls_d_decoder, false, false },
>+
>+  /* xattrs use the star format.  note we only save some variants... */
>+  { "SCHILY.xattr.user",    xattr_coder, xattr_decoder, false, true },
>+  { "SCHILY.xattr.trusted", xattr_coder, xattr_decoder, false, true },
>+  { "SCHILY.xattr.lustre",  xattr_coder, xattr_decoder, false, true },
>+
>+  /* ignore everything else in the xattr namespaces... */
>+  { "SCHILY.xattr",         dummy_coder, dummy_decoder, false, true },
> 
>   { NULL, NULL, NULL, false }
> };

Actions: View | Diff

Attachments on bug 561855: 388800 | 388801 | 389010 | 389012 | 389013 | 394722 | 395254