mirrors/tar
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tiny changes.

Browse Source 
* src/misc.c: Fix comments, rename wd.cwd to wd.abspath (Nathan Stratton
Treadway);
* src/tar.c (options): Reword description of the --starting-file and
--preserve-order options.
(decode_options): Both --starting-file and --preserve-order have meaning
only when used together with an archive reading command. (Pavel Raiskup).
This commit is contained in:
Sergey Poznyakoff
2013-10-03 22:41:04 +03:00
parent d28eee6b4f
commit 74ce228f6d
2 changed files with 39 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/misc.c
View File

@@ -279,21 +279,23 @@ normalize_filename (int cdidx, const char *name)
if (IS_RELATIVE_FILE_NAME (name))
{
/* Set COPY to the absolute file name if possible.
/* Set COPY to the absolute path for this name.
FIXME: There should be no need to get the absolute file name.
getcwd is slow, it might fail, and it does not necessarily
return a canonical name even when it succeeds. Perhaps we
can use dev+ino pairs instead of names? */
const char *cwd = tar_getcdpath (cdidx);
tar_getcdpath does not return a true "canonical" path, so
this following approach may lead to situations where the same
file or directory is processed twice under different absolute
paths without that duplication being detected. Perhaps we
should use dev+ino pairs instead of names? */
const char *cdpath = tar_getcdpath (cdidx);
size_t copylen;
bool need_separator;
copylen = strlen (cwd);
copylen = strlen (cdpath);
need_separator = ! (DOUBLE_SLASH_IS_DISTINCT_ROOT
&& copylen == 2 && ISSLASH (cwd[1]));
&& copylen == 2 && ISSLASH (cdpath[1]));
copy = xmalloc (copylen + need_separator + strlen (name) + 1);
strcpy (copy, cwd);
strcpy (copy, cdpath);
copy[copylen] = DIRECTORY_SEPARATOR;
strcpy (copy + copylen + need_separator, name);
}
@@ -832,8 +834,10 @@ struct wd
{
/* The directory's name. */
char const *name;
/* Current working directory; initialized by tar_getcwd */
char *cwd;
/* "absolute" path representing this directory; in the contrast to
the real absolute pathname, it can contain /../ components (see
normalize_filename_x for the reason of it). */
char *abspath;
/* If nonzero, the file descriptor of the directory, or AT_FDCWD if
the working directory. If zero, the directory needs to be opened
to be used. */
@@ -888,7 +892,7 @@ chdir_arg (char const *dir)
if (! wd_count)
{
wd[wd_count].name = ".";
wd[wd_count].cwd = xgetcwd ();
wd[wd_count].abspath = xgetcwd ();
wd[wd_count].fd = AT_FDCWD;
wd_count++;
}
@@ -906,13 +910,16 @@ chdir_arg (char const *dir)
}
wd[wd_count].name = dir;
/* if the given name is an absolute path, then use that path
to represent this working directory; otherwise, construct
a path based on the previous -C option's absolute path */
if (IS_ABSOLUTE_FILE_NAME (wd[wd_count].name))
wd[wd_count].cwd = xstrdup (wd[wd_count].name);
wd[wd_count].abspath = xstrdup (wd[wd_count].name);
else
{
namebuf_t nbuf = namebuf_create (wd[wd_count - 1].cwd);
namebuf_t nbuf = namebuf_create (wd[wd_count - 1].abspath);
namebuf_add_dir (nbuf, wd[wd_count].name);
wd[wd_count].cwd = namebuf_finish (nbuf);
wd[wd_count].abspath = namebuf_finish (nbuf);
}
wd[wd_count].fd = 0;
return wd_count++;
@@ -993,6 +1000,13 @@ tar_dirname (void)
return wd[chdir_current].name;
}
/* Return the absolute path that represents the working
directory referenced by IDX.
If wd is empty, then there were no -C options given, and
chdir_args() has never been called, so we simply return the
process's actual cwd. (Note that in this case IDX is ignored,
since it should always be 0.) */
const char *
tar_getcdpath (int idx)
{
@@ -1003,7 +1017,7 @@ tar_getcdpath (int idx)
cwd = xgetcwd ();
return cwd;
}
return wd[idx].cwd;
return wd[idx].abspath;
}
void

12
src/tar.c
View File

@@ -537,7 +537,8 @@ static struct argp_option options[] = {
{"no-same-permissions", NO_SAME_PERMISSIONS_OPTION, 0, 0,
N_("apply the user's umask when extracting permissions from the archive (default for ordinary users)"), GRID+1 },
{"preserve-order", 's', 0, 0,
N_("sort names to extract to match archive"), GRID+1 },
N_("member arguments are listed in the same order as the "
"files in the archive"), GRID+1 },
{"same-order", 0, 0, OPTION_ALIAS, NULL, GRID+1 },
{"preserve", PRESERVE_OPTION, 0, 0,
N_("same as both -p and -s"), GRID+1 },
@@ -731,7 +732,7 @@ static struct argp_option options[] = {
{"hard-dereference", HARD_DEREFERENCE_OPTION, 0, 0,
N_("follow hard links; archive and dump the files they refer to"), GRID+1 },
{"starting-file", 'K', N_("MEMBER-NAME"), 0,
N_("begin at member MEMBER-NAME in the archive"), GRID+1 },
N_("begin at member MEMBER-NAME when reading the archive"), GRID+1 },
{"newer", 'N', N_("DATE-OR-FILE"), 0,
N_("only store files newer than DATE-OR-FILE"), GRID+1 },
{"after-date", 0, 0, OPTION_ALIAS, NULL, GRID+1 },
@@ -2486,6 +2487,13 @@ decode_options (int argc, char **argv)
&& !IS_SUBCOMMAND_CLASS (SUBCL_READ))
USAGE_ERROR ((0, 0, _("--xattrs can be used only on POSIX archives")));
if ((starting_file_option || same_order_option)
&& !IS_SUBCOMMAND_CLASS (SUBCL_READ))
USAGE_ERROR ((0, 0,
_("--%s option cannot be used with %s"),
starting_file_option ? "starting-file" : "same-order",
subcommand_string (subcommand_option)));
/* If ready to unlink hierarchies, so we are for simpler files. */
if (recursive_unlink_option)
old_files_option = UNLINK_FIRST_OLD_FILES;