X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Ftar.c;h=c29b4fabb415085f346f1f1dbce44c52c7940c4c;hb=cd7bdd4076ca154575bbef85eb2157e59befcfe2;hp=c97682076fce244dcd987b4da4656f502c0b2b4a;hpb=696338043e52f440853e1143c52b81b41cd59723;p=chaz%2Ftar
diff --git a/src/tar.c b/src/tar.c
index c976820..c29b4fa 100644
--- a/src/tar.c
+++ b/src/tar.c
@@ -1,8 +1,7 @@
/* A tar (tape archiver) program.
- Copyright (C) 1988, 1992, 1993, 1994, 1995, 1996, 1997, 1999, 2000,
- 2001, 2003, 2004, 2005, 2006, 2007, 2012
- Free Software Foundation, Inc.
+ Copyright 1988, 1992-1997, 1999-2001, 2003-2007, 2012-2013 Free
+ Software Foundation, Inc.
Written by John Gilmore, starting 1985-08-25.
@@ -17,8 +16,7 @@
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. */
+ with this program. If not, see . */
#include
@@ -68,6 +66,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. */
@@ -256,7 +260,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,
@@ -289,6 +294,7 @@ enum
MODE_OPTION,
MTIME_OPTION,
NEWER_MTIME_OPTION,
+ NO_ACLS_OPTION,
NO_ANCHORED_OPTION,
NO_AUTO_COMPRESS_OPTION,
NO_CHECK_DEVICE_OPTION,
@@ -302,6 +308,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,
@@ -327,6 +334,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,
@@ -547,6 +555,14 @@ 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,
+ N_("Disable the POSIX ACLs support"), GRID+1 },
#undef GRID
#define GRID 60
@@ -1275,7 +1291,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;
}
}
@@ -1365,8 +1381,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
@@ -2001,7 +2017,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;
@@ -2169,6 +2185,24 @@ 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");
xattrs_option = 1;
@@ -2564,7 +2598,17 @@ decode_options (int argc, char **argv)
USAGE_ERROR ((0, 0, _("--pax-option can be used only on POSIX archives")));
/* star creates non-POSIX typed archives with xattr support, so allow the
- extra headers when reading */
+ extra headers whenn reading */
+ if ((acls_option > 0)
+ && archive_format != POSIX_FORMAT
+ && !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)
@@ -2829,6 +2873,9 @@ 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);
free (st->dumpdir);
xheader_destroy (&st->xhdr);