(start_header): Use `member names' to refer to archive member names, not
`archive names'. Warn about `..' in member names.
(finish_sparse_file, dump_file):
Quote arbitrary strings in diagnostics.
(finish_sparse_file, dump_file):
Don't assume that gettext preserves errno.
(dump_file): Don't use `access' to determine whether a directory is readable;
this isn't reliable if tar is setuid. Use `opendir' instead.
Check for readdir and closedir failures.
Don't dump sockets as if they were fifos; just warn and skip.
#include "common.h"
#ifndef MSDOS
#include "common.h"
#ifndef MSDOS
if (!warned_once)
{
warned_once = 1;
if (!warned_once)
{
warned_once = 1;
- WARN ((0, 0, _("Removing `%.*s' prefix from archive names"),
+ WARN ((0, 0, _("Removing `%.*s' prefix from member names"),
(int) prefix_len, name));
}
name += prefix_len;
(int) prefix_len, name));
}
name += prefix_len;
if (!warned_once)
{
warned_once = 1;
if (!warned_once)
{
warned_once = 1;
- WARN ((0, 0, _("Removing leading `/' from archive names")));
+ WARN ((0, 0, _("Removing leading `/' from member names")));
+
+ {
+ static int warned_once;
+ if (! warned_once && contains_dot_dot (name))
+ {
+ warned_once = 1;
+ WARN ((0, 0, _("Member names contain `..'")));
+ }
+ }
}
if (sizeof header->header.name <= strlen (name))
}
if (sizeof header->header.name <= strlen (name))
ERROR ((0, 0, _("Wrote %s of %s bytes to file %s"),
STRINGIFY_BIGINT (fullsize - *sizeleft, buf1),
ERROR ((0, 0, _("Wrote %s of %s bytes to file %s"),
STRINGIFY_BIGINT (fullsize - *sizeleft, buf1),
- STRINGIFY_BIGINT (fullsize, buf2),
- name));
+ STRINGIFY_BIGINT (fullsize, buf2), quote (name)));
break;
}
if (lseek (file, sparsearray[sparse_index++].offset, SEEK_SET) < 0)
{
char buf[UINTMAX_STRSIZE_BOUND];
break;
}
if (lseek (file, sparsearray[sparse_index++].offset, SEEK_SET) < 0)
{
char buf[UINTMAX_STRSIZE_BOUND];
- ERROR ((0, errno, _("lseek error at byte %s in file %s"),
- STRINGIFY_BIGINT (sparsearray[sparse_index - 1].offset, buf),
- name));
+ int e = errno;
+ ERROR ((0, e, _("lseek error at byte %s in file %s"),
+ STRINGIFY_BIGINT (sparsearray[sparse_index - 1].offset,
+ buf),
+ quote (name)));
if (count < 0)
{
char buf[UINTMAX_STRSIZE_BOUND];
if (count < 0)
{
char buf[UINTMAX_STRSIZE_BOUND];
+ int e = errno;
+ ERROR ((0, e,
_("Read error at byte %s, reading %lu bytes, in file %s"),
STRINGIFY_BIGINT (fullsize - *sizeleft, buf),
_("Read error at byte %s, reading %lu bytes, in file %s"),
STRINGIFY_BIGINT (fullsize - *sizeleft, buf),
- (unsigned long) bufsize, name));
+ (unsigned long) bufsize, quote (name)));
return 1;
}
bufsize -= count;
return 1;
}
bufsize -= count;
if (count < 0)
{
char buf[UINTMAX_STRSIZE_BOUND];
if (count < 0)
{
char buf[UINTMAX_STRSIZE_BOUND];
+ int e = errno;
+ ERROR ((0, e,
_("Read error at byte %s, reading %lu bytes, in file %s"),
STRINGIFY_BIGINT (fullsize - *sizeleft, buf),
_("Read error at byte %s, reading %lu bytes, in file %s"),
STRINGIFY_BIGINT (fullsize - *sizeleft, buf),
- (unsigned long) bufsize, name));
+ (unsigned long) bufsize, quote (name)));
if (count != bufsize)
{
ERROR ((0, 0,
if (count != bufsize)
{
ERROR ((0, 0,
- _("File %s shrunk, padding with zeros"),
- name));
+ _("File %s shrunk, padding with zeros"), quote (name)));
return 1;
}
start = find_next_block ();
return 1;
}
start = find_next_block ();
if (deref_stat (dereference_option, p, ¤t_stat) != 0)
{
if (deref_stat (dereference_option, p, ¤t_stat) != 0)
{
- WARN ((0, errno, _("Cannot add file %s"), p));
- if (!ignore_failed_read_option)
- exit_status = TAREXIT_FAILURE;
+ if (ignore_failed_read_option)
+ stat_error (p);
+ else
+ stat_warn (p);
&& (!after_date_option || current_stat.st_ctime < newer_ctime_option))
{
if (0 < top_level)
&& (!after_date_option || current_stat.st_ctime < newer_ctime_option))
{
if (0 < top_level)
- WARN ((0, 0, _("%s: is unchanged; not dumped"), p));
+ WARN ((0, 0, _("%s is unchanged; not dumped"), quote (p)));
/* FIXME: recheck this return. */
return;
}
/* FIXME: recheck this return. */
return;
}
if (ar_dev && current_stat.st_dev == ar_dev && current_stat.st_ino == ar_ino)
{
if (ar_dev && current_stat.st_dev == ar_dev && current_stat.st_ino == ar_ino)
{
- WARN ((0, 0, _("%s is the archive; not dumped"), p));
+ WARN ((0, 0, _("%s is the archive; not dumped"), quote (p)));
size_t len;
dev_t our_device = current_stat.st_dev;
size_t len;
dev_t our_device = current_stat.st_dev;
- /* If this tar program is installed suid root, like for Amanda, the
- access might look like denied, while it is not really.
-
- FIXME: I have the feeling this test is done too early. Couldn't it
- just be bundled in later actions? I guess that the proper support
- of --ignore-failed-read is the key of the current writing. */
- if (access (p, R_OK) == -1 && geteuid () != 0)
+ directory = opendir (p);
+ if (! directory)
- WARN ((0, errno, _("Cannot add directory %s"), p));
- if (!ignore_failed_read_option)
- exit_status = TAREXIT_FAILURE;
+ if (ignore_failed_read_option)
+ opendir_warn (p);
+ else
+ opendir_error (p);
&& parent_device != current_stat.st_dev)
{
if (verbose_option)
&& parent_device != current_stat.st_dev)
{
if (verbose_option)
- WARN ((0, 0, _("%s: On a different filesystem; not dumped"), p));
+ WARN ((0, 0, _("%s is on a different filesystem; not dumped"),
+ quote (p)));
return;
}
/* Now output all the files in the directory. */
return;
}
/* Now output all the files in the directory. */
- errno = 0;
-
- directory = opendir (p);
- if (!directory)
- {
- ERROR ((0, errno, _("Cannot open directory %s"), p));
- return;
- }
-
/* FIXME: Should speed this up by cd-ing into the dir. */
/* FIXME: Should speed this up by cd-ing into the dir. */
- while (entry = readdir (directory), entry)
+ while (errno = 0, (entry = readdir (directory)))
{
/* Skip `.', `..', and excluded file names. */
{
/* Skip `.', `..', and excluded file names. */
dump_file (namebuf, 0, our_device);
}
dump_file (namebuf, 0, our_device);
}
+ if (errno)
+ {
+ if (ignore_failed_read_option)
+ readdir_warn (p);
+ else
+ readdir_error (p);
+ }
+
+ if (closedir (directory) != 0)
+ closedir_error (p);
free (namebuf);
if (atime_preserve_option)
utime (p, &restore_times);
free (namebuf);
if (atime_preserve_option)
utime (p, &restore_times);
if (remove_files_option)
if (unlink (p) == -1)
if (remove_files_option)
if (unlink (p) == -1)
- ERROR ((0, errno, _("Cannot remove %s"), p));
/* We dumped it. */
return;
/* We dumped it. */
return;
if (f < 0)
{
if (! top_level && errno == ENOENT)
if (f < 0)
{
if (! top_level && errno == ENOENT)
- WARN ((0, 0, _("%s: file removed before we read it"), p));
+ WARN ((0, 0, _("File %s removed before we read it"),
+ quote (p)));
+ else if (ignore_failed_read_option)
+ open_warn (p);
- WARN ((0, errno, _("Cannot add file %s"), p));
- if (!ignore_failed_read_option)
- exit_status = TAREXIT_FAILURE;
if (save_typeflag == GNUTYPE_SPARSE)
{
if (f < 0
if (save_typeflag == GNUTYPE_SPARSE)
{
if (f < 0
- || finish_sparse_file (f, &sizeleft, current_stat.st_size, p))
+ || finish_sparse_file (f, &sizeleft,
+ current_stat.st_size, p))
if (count < 0)
{
char buf[UINTMAX_STRSIZE_BOUND];
if (count < 0)
{
char buf[UINTMAX_STRSIZE_BOUND];
+ int e = errno;
+ ERROR ((0, e,
_("Read error at byte %s, reading %lu bytes, in file %s"),
STRINGIFY_BIGINT (current_stat.st_size - sizeleft,
buf),
_("Read error at byte %s, reading %lu bytes, in file %s"),
STRINGIFY_BIGINT (current_stat.st_size - sizeleft,
buf),
- (unsigned long) bufsize, p));
+ (unsigned long) bufsize, quote (p)));
goto padit;
}
sizeleft -= count;
goto padit;
}
sizeleft -= count;
char buf[UINTMAX_STRSIZE_BOUND];
ERROR ((0, 0,
_("File %s shrunk by %s bytes, padding with zeros"),
char buf[UINTMAX_STRSIZE_BOUND];
ERROR ((0, 0,
_("File %s shrunk by %s bytes, padding with zeros"),
- p, STRINGIFY_BIGINT (sizeleft, buf)));
+ quote (p), STRINGIFY_BIGINT (sizeleft, buf)));
goto padit; /* short read */
}
}
goto padit; /* short read */
}
}
{
struct stat final_stat;
if (fstat (f, &final_stat) != 0)
{
struct stat final_stat;
if (fstat (f, &final_stat) != 0)
- ERROR ((0, errno, "%s: fstat", p));
else if (final_stat.st_ctime != original_ctime)
else if (final_stat.st_ctime != original_ctime)
- ERROR ((0, 0, _("%s: file changed as we read it"), p));
+ ERROR ((0, 0, _("File %s changed as we read it"), quote (p)));
- ERROR ((0, errno, _("%s: close"), p));
if (atime_preserve_option)
utime (p, &restore_times);
}
if (remove_files_option)
{
if (unlink (p) == -1)
if (atime_preserve_option)
utime (p, &restore_times);
}
if (remove_files_option)
{
if (unlink (p) == -1)
- ERROR ((0, errno, _("Cannot remove %s"), p));
size = readlink (p, buffer, PATH_MAX + 1);
if (size < 0)
{
size = readlink (p, buffer, PATH_MAX + 1);
if (size < 0)
{
- WARN ((0, errno, _("Cannot add file %s"), p));
- if (!ignore_failed_read_option)
- exit_status = TAREXIT_FAILURE;
+ if (ignore_failed_read_option)
+ readlink_warn (p);
+ else
+ readlink_error (p);
return;
}
buffer[size] = '\0';
return;
}
buffer[size] = '\0';
if (remove_files_option)
{
if (unlink (p) == -1)
if (remove_files_option)
{
if (unlink (p) == -1)
- ERROR ((0, errno, _("Cannot remove %s"), p));
type = CHRTYPE;
else if (S_ISBLK (current_stat.st_mode))
type = BLKTYPE;
type = CHRTYPE;
else if (S_ISBLK (current_stat.st_mode))
type = BLKTYPE;
- else if (S_ISFIFO (current_stat.st_mode)
- || S_ISSOCK (current_stat.st_mode))
+ else if (S_ISFIFO (current_stat.st_mode))
+ else if (S_ISSOCK (current_stat.st_mode))
+ {
+ WARN ((0, 0, _("%s: socket ignored"), quotearg_colon (p)));
+ return;
+ }
else if (S_ISDOOR (current_stat.st_mode))
{
else if (S_ISDOOR (current_stat.st_mode))
{
- WARN ((0, 0, _("%s: door ignored"), p));
+ WARN ((0, 0, _("%s: door ignored"), quotearg_colon (p)));
if (remove_files_option)
{
if (unlink (p) == -1)
if (remove_files_option)
{
if (unlink (p) == -1)
- ERROR ((0, errno, _("Cannot remove %s"), p));
- ERROR ((0, 0, _("%s: Unknown file type; file ignored"), p));
+ ERROR ((0, 0, _("%s: Unknown file type; file ignored"),
+ quotearg_colon (p)));