X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fcreate.c;h=3a0f2dce9267bfd7b25999a5e6539a5b3b989d17;hb=HEAD;hp=e14e13d00e36f8d60a54cef8d03645581ab381f6;hpb=daa269958ad8d50ef8154ccb65e58acaf7a6dd99;p=debian%2Ftar diff --git a/src/create.c b/src/create.c index e14e13d0..3a0f2dce 100644 --- a/src/create.c +++ b/src/create.c @@ -1,7 +1,7 @@ /* Create a tar archive. Copyright 1985, 1992-1994, 1996-1997, 1999-2001, 2003-2007, - 2009-2010, 2012-2013 Free Software Foundation, Inc. + 2009-2010, 2012-2014, 2016 Free Software Foundation, Inc. This file is part of GNU tar. @@ -22,6 +22,7 @@ #include +#include #include #include "common.h" @@ -543,7 +544,7 @@ write_gnu_long_link (struct tar_stat_info *st, const char *p, char type) union block *header; char *tmpname; - header = start_private_header ("././@LongLink", size, start_time.tv_sec); + header = start_private_header ("././@LongLink", size, 0); uid_to_uname (0, &tmpname); UNAME_TO_CHARS (tmpname, header->header.uname); free (tmpname); @@ -706,7 +707,7 @@ write_extended (bool global, struct tar_stat_info *st, union block *old_header) { type = XHDTYPE; p = xheader_xhdr_name (st); - t = st->stat.st_mtime; + t = set_mtime_option ? mtime_option.tv_sec : st->stat.st_mtime; } xheader_write (type, p, t, &st->xhdr); free (p); @@ -740,17 +741,17 @@ union block * start_header (struct tar_stat_info *st) { union block *header; - + char const *uname = NULL; + char const *gname = NULL; + header = write_header_name (st); if (!header) return NULL; /* Override some stat fields, if requested to do so. */ + owner_map_translate (st->stat.st_uid, &st->stat.st_uid, &uname); + group_map_translate (st->stat.st_gid, &st->stat.st_gid, &gname); - if (owner_option != (uid_t) -1) - st->stat.st_uid = owner_option; - if (group_option != (gid_t) -1) - st->stat.st_gid = group_option; if (mode_option) st->stat.st_mode = ((st->stat.st_mode & ~MODE_ALL) @@ -822,7 +823,24 @@ start_header (struct tar_stat_info *st) } { - struct timespec mtime = set_mtime_option ? mtime_option : st->mtime; + struct timespec mtime; + + switch (set_mtime_option) + { + case USE_FILE_MTIME: + mtime = st->mtime; + break; + + case FORCE_MTIME: + mtime = mtime_option; + break; + + case CLAMP_MTIME: + mtime = timespec_cmp (st->mtime, mtime_option) > 0 + ? mtime_option : st->mtime; + break; + } + if (archive_format == POSIX_FORMAT) { if (MAX_OCTAL_VAL (header->header.mtime) < mtime.tv_sec @@ -909,13 +927,13 @@ start_header (struct tar_stat_info *st) } else { - if (owner_name_option) - st->uname = xstrdup (owner_name_option); + if (uname) + st->uname = xstrdup (uname); else uid_to_uname (st->stat.st_uid, &st->uname); - if (group_name_option) - st->gname = xstrdup (group_name_option); + if (gname) + st->gname = xstrdup (gname); else gid_to_gname (st->stat.st_gid, &st->gname); @@ -1113,6 +1131,8 @@ dump_dir0 (struct tar_stat_info *st, char const *directory) if (!blk) return; + info_attach_exclist (st); + if (incremental_option && archive_format != POSIX_FORMAT) blk->header.typeflag = GNUTYPE_DUMPDIR; else /* if (standard_option) */ @@ -1210,7 +1230,7 @@ dump_dir0 (struct tar_stat_info *st, char const *directory) name_buf = xrealloc (name_buf, name_size + 1); } strcpy (name_buf + name_len, entry); - if (!excluded_name (name_buf)) + if (!excluded_name (name_buf, st)) dump_file (st, entry, name_buf); } @@ -1288,7 +1308,7 @@ get_directory_entries (struct tar_stat_info *st) while (! (st->dirstream = fdopendir (st->fd))) if (! open_failure_recover (st)) return 0; - return streamsavedir (st->dirstream); + return streamsavedir (st->dirstream, savedir_sort_order); } /* Dump the directory ST. Return true if successful, false (emitting @@ -1339,12 +1359,12 @@ create_archive (void) collect_and_sort_names (); while ((p = name_from_list ()) != NULL) - if (!excluded_name (p->name)) + if (!excluded_name (p->name, NULL)) dump_file (0, p->name, p->name); blank_name_list (); while ((p = name_from_list ()) != NULL) - if (!excluded_name (p->name)) + if (!excluded_name (p->name, NULL)) { struct tar_stat_info st; size_t plen = strlen (p->name); @@ -1358,7 +1378,7 @@ create_archive (void) if (! ISSLASH (buffer[plen - 1])) buffer[plen++] = DIRECTORY_SEPARATOR; tar_stat_init (&st); - q = directory_contents (gnu_list_name->directory); + q = directory_contents (p->directory); if (q) while (*q) { @@ -1401,7 +1421,7 @@ create_archive (void) { const char *name; while ((name = name_next (1)) != NULL) - if (!excluded_name (name)) + if (!excluded_name (name, NULL)) dump_file (0, name, name); } @@ -1470,8 +1490,8 @@ dump_hard_link (struct tar_stat_info *st) /* We found a link. */ char const *link_name = safer_name_suffix (duplicate->name, true, absolute_names_option); - - duplicate->nlink--; + if (duplicate->nlink) + duplicate->nlink--; block_ordinal = current_block_ordinal (); assign_string (&st->link_name, link_name); @@ -1835,22 +1855,17 @@ dump_file0 (struct tar_stat_info *st, char const *name, char const *p) #ifdef HAVE_READLINK else if (S_ISLNK (st->stat.st_mode)) { - char *buffer; - int size; - size_t linklen = st->stat.st_size; - if (linklen != st->stat.st_size || linklen + 1 == 0) - xalloc_die (); - buffer = (char *) alloca (linklen + 1); - size = readlinkat (parentfd, name, buffer, linklen + 1); - if (size < 0) + st->link_name = areadlinkat_with_size (parentfd, name, st->stat.st_size); + if (!st->link_name) { + if (errno == ENOMEM) + xalloc_die (); file_removed_diag (p, top_level, readlink_diag); return; } - buffer[size] = '\0'; - assign_string (&st->link_name, buffer); transform_name (&st->link_name, XFORM_SYMLINK); - if (NAME_FIELD_SIZE - (archive_format == OLDGNU_FORMAT) < size) + if (NAME_FIELD_SIZE - (archive_format == OLDGNU_FORMAT) + < strlen (st->link_name)) write_long_link (st); xattrs_selinux_get (parentfd, name, st, 0);