with this program; if not, write to the Free Software Foundation, Inc.,
59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+/* Enable GNU extensions in fnmatch.h. */
+#ifndef _GNU_SOURCE
+# define _GNU_SOURCE 1
+#endif
+
#include "system.h"
#include <signal.h>
# include <sys/inode.h>
#endif
-#ifndef FNM_LEADING_DIR
-# include <fnmatch.h>
-#endif
+#include <fnmatch.h>
#include "common.h"
#include "rmt.h"
\f
/* Variables. */
-static tarlong total_written; /* bytes written on all volumes */
+static tarlong prev_written; /* bytes written on previous volumes */
static tarlong bytes_written; /* bytes written on this volume */
/* FIXME: The following four variables should ideally be static to this
#endif /* DEBUG FORK */
-void
-init_total_written (void)
-{
- clear_tarlong (total_written);
- clear_tarlong (bytes_written);
-}
-
void
print_total_written (void)
{
fprintf (stderr, _("Total bytes written: "));
- print_tarlong (total_written, stderr);
+ fprintf (stderr, TARLONG_FORMAT, prev_written + bytes_written);
fprintf (stderr, "\n");
}
{
struct stat stbuf;
- if (stat (name, &stbuf) < 0)
- return 1;
-
- if (S_ISREG (stbuf.st_mode))
- return 1;
-
- return 0;
+ if (stat (name, &stbuf) == 0)
+ return S_ISREG (stbuf.st_mode);
+ else
+ return errno == ENOENT;
}
static ssize_t
program_name = _("tar (child)");
- xdup2 (parent_pipe[PREAD], STDIN_FILENO, _("(child) Pipe to stdin"));
xclose (parent_pipe[PWRITE]);
+ xdup2 (parent_pipe[PREAD], STDIN_FILENO, _("(child) Pipe to stdin"));
/* Check if we need a grandchild tar. This happens only if either:
a) we are writing stdout: to force reblocking;
/* We don't need a grandchild tar. Open the archive and launch the
compressor. */
- archive = creat (archive_name_array[0], 0666);
+ archive = creat (archive_name_array[0], MODE_RW);
if (archive < 0)
{
int saved_errno = errno;
if (strcmp (archive_name_array[0], "-") == 0)
archive = STDOUT_FILENO;
else
- archive = rmtcreat (archive_name_array[0], 0666, rsh_command_option);
+ archive = rmtcreat (archive_name_array[0], MODE_RW, rsh_command_option);
if (archive < 0)
FATAL_ERROR ((0, errno, _("Cannot open archive %s"),
archive_name_array[0]));
if (size < BLOCKSIZE)
size = BLOCKSIZE;
- status = full_read (STDIN_FILENO, cursor, size);
+ status = safe_read (STDIN_FILENO, cursor, size);
if (status <= 0)
break;
}
/* We don't need a grandchild tar. Open the archive and lauch the
uncompressor. */
- archive = open (archive_name_array[0], O_RDONLY | O_BINARY, 0666);
+ archive = open (archive_name_array[0], O_RDONLY | O_BINARY, MODE_RW);
if (archive < 0)
FATAL_ERROR ((0, errno, _("Cannot open archive %s"),
archive_name_array[0]));
archive = STDIN_FILENO;
else
archive = rmtopen (archive_name_array[0], O_RDONLY | O_BINARY,
- 0666, rsh_command_option);
+ MODE_RW, rsh_command_option);
if (archive < 0)
FATAL_ERROR ((0, errno, _("Cannot open archive %s"),
archive_name_array[0]));
}
else if (verify_option)
archive = rmtopen (archive_name_array[0], O_RDWR | O_CREAT | O_BINARY,
- 0666, rsh_command_option);
+ MODE_RW, rsh_command_option);
else
switch (access)
{
case ACCESS_READ:
- archive = rmtopen (archive_name_array[0], O_RDONLY | O_BINARY, 0666,
- rsh_command_option);
+ archive = rmtopen (archive_name_array[0], O_RDONLY | O_BINARY,
+ MODE_RW, rsh_command_option);
break;
case ACCESS_WRITE:
maybe_backup_file (archive_name_array[0], 1);
backed_up_flag = 1;
}
- archive = rmtcreat (archive_name_array[0], 0666, rsh_command_option);
+ archive = rmtcreat (archive_name_array[0], MODE_RW,
+ rsh_command_option);
break;
case ACCESS_UPDATE:
archive = rmtopen (archive_name_array[0], O_RDWR | O_CREAT | O_BINARY,
- 0666, rsh_command_option);
+ MODE_RW, rsh_command_option);
break;
}
if (backed_up_flag)
undo_last_backup ();
- FATAL_ERROR ((0, saved_errno, _("Cannot open %s"),
- archive_name_array[0]));
+ FATAL_ERROR ((0, saved_errno, "%s", archive_name_array[0]));
}
#if !MSDOS
dev_null_output =
(strcmp (archive_name_array[0], dev_null) == 0
|| (! _isrmt (archive)
- && stat (dev_null, &dev_null_stat) == 0
&& S_ISCHR (archive_stat.st_mode)
+ && stat (dev_null, &dev_null_stat) == 0
+ && S_ISCHR (dev_null_stat.st_mode)
&& archive_stat.st_rdev == dev_null_stat.st_rdev));
}
assign_string (¤t_file_name, record_start->header.name);
record_start->header.typeflag = GNUTYPE_VOLHDR;
- TIME_TO_OCT (time (0), record_start->header.mtime);
+ TIME_TO_CHARS (time (0), record_start->header.mtime);
finish_header (record_start);
#if 0
current_block++;
if (checkpoint_option && !(++checkpoint % 10))
WARN ((0, 0, _("Write checkpoint %d"), checkpoint));
- if (!zerop_tarlong (tape_length_option)
- && !lessp_tarlong (bytes_written, tape_length_option))
+ if (tape_length_option && tape_length_option <= bytes_written)
{
errno = ENOSPC; /* FIXME: errno should be read-only */
status = 0;
status = write_archive_buffer ();
if (status != record_size && !multi_volume_option)
write_error (status);
- else if (totals_option)
- add_to_tarlong (total_written, record_size);
if (status > 0)
- add_to_tarlong (bytes_written, status);
+ bytes_written += status;
if (status == record_size)
{
return;
}
- cursor = save_name;
-#if MSDOS
- if (cursor[1] == ':')
- cursor += 2;
-#endif
+ cursor = save_name + FILESYSTEM_PREFIX_LEN (save_name);
while (*cursor == '/')
cursor++;
if (!new_volume (ACCESS_WRITE))
return;
- clear_tarlong (bytes_written);
+ if (totals_option)
+ prev_written += bytes_written;
+ bytes_written = 0;
if (volume_label_option && real_s_name[0])
{
{
memset ((void *) record_start, 0, BLOCKSIZE);
sprintf (record_start->header.name, "%s Volume %d", volume_label_option, volno);
- TIME_TO_OCT (time (0), record_start->header.mtime);
+ TIME_TO_CHARS (time (0), record_start->header.mtime);
record_start->header.typeflag = GNUTYPE_VOLHDR;
finish_header (record_start);
}
strcpy (record_start->header.name, real_s_name);
record_start->header.typeflag = GNUTYPE_MULTIVOL;
- OFF_TO_OCT (real_s_sizeleft, record_start->header.size);
- OFF_TO_OCT (real_s_totsize - real_s_sizeleft,
- record_start->oldgnu_header.offset);
+ OFF_TO_CHARS (real_s_sizeleft, record_start->header.size);
+ OFF_TO_CHARS (real_s_totsize - real_s_sizeleft,
+ record_start->oldgnu_header.offset);
tmp = verbose_option;
verbose_option = 0;
finish_header (record_start);
status = write_archive_buffer ();
if (status != record_size)
write_error (status);
- else if (totals_option)
- add_to_tarlong (total_written, record_size);
- add_to_tarlong (bytes_written, record_size);
+ bytes_written += status;
+
if (copy_back)
{
record_start += copy_back;
real_s_name[0] = '\0';
else
{
- char *cursor = save_name;
+ char *cursor = save_name + FILESYSTEM_PREFIX_LEN (save_name);
-#if MSDOS
- if (cursor[1] == ':')
- cursor += 2;
-#endif
while (*cursor == '/')
cursor++;
write_error (status);
}
if (multi_volume_option)
- if (save_name)
- {
- char *cursor = save_name;
+ {
+ if (save_name)
+ {
+ char *cursor = save_name + FILESYSTEM_PREFIX_LEN (save_name);
-#if MSDOS
- if (cursor[1] == ':')
- cursor += 2;
-#endif
- while (*cursor == '/')
- cursor++;
+ while (*cursor == '/')
+ cursor++;
- strcpy (real_s_name, cursor);
- real_s_sizeleft = save_sizeleft;
- real_s_totsize = save_totsize;
- }
- else
- {
- real_s_name[0] = '\0';
- real_s_totsize = 0;
- real_s_sizeleft = 0;
- }
+ strcpy (real_s_name, cursor);
+ real_s_sizeleft = save_sizeleft;
+ real_s_totsize = save_totsize;
+ }
+ else
+ {
+ real_s_name[0] = '\0';
+ real_s_totsize = 0;
+ real_s_sizeleft = 0;
+ }
+ }
error_loop:
status = rmtread (archive, record_start->buffer, record_size);
global_volno--;
goto try_volume;
}
- s1 = UINTMAX_FROM_OCT (cursor->header.size);
- s2 = UINTMAX_FROM_OCT (cursor->oldgnu_header.offset);
+ s1 = UINTMAX_FROM_CHARS (cursor->header.size);
+ s2 = UINTMAX_FROM_CHARS (cursor->oldgnu_header.offset);
if (real_s_totsize != s1 + s2 || s1 + s2 < s2)
{
char totsizebuf[UINTMAX_STRSIZE_BOUND];
goto try_volume;
}
if (real_s_totsize - real_s_sizeleft
- != OFF_FROM_OCT (cursor->oldgnu_header.offset))
+ != OFF_FROM_CHARS (cursor->oldgnu_header.offset))
{
WARN ((0, 0, _("This volume is out of sequence")));
volno--;
#endif
{
- off_t position = rmtlseek (archive, (off_t) 0, 1);
+ off_t position = rmtlseek (archive, (off_t) 0, SEEK_CUR);
/* Seek back to the beginning of this record and start writing there. */
position -= record_size;
- if (rmtlseek (archive, position, 0) != position)
+ if (rmtlseek (archive, position, SEEK_SET) != position)
{
/* Lseek failed. Try a different method. */
if (access_mode == ACCESS_READ
&& ! _isrmt (archive)
- && S_ISFIFO (archive_stat.st_mode)
- && ! ending_file_option)
+ && S_ISFIFO (archive_stat.st_mode))
while (rmtread (archive, record_start->buffer, record_size) > 0)
continue;
#endif
#if MSDOS
int status = write (archive, "", 0);
#else
- off_t pos = lseek (archive, (off_t) 0, 1);
- int status = pos == -1 ? -1 : ftruncate (archive, pos);
+ off_t pos = lseek (archive, (off_t) 0, SEEK_CUR);
+ int status = pos < 0 ? -1 : ftruncate (archive, pos);
#endif
if (status != 0)
WARN ((0, errno, _("WARNING: Cannot truncate %s"),
continue;
if (child != -1)
- if (WIFSIGNALED (wait_status)
+ {
+ if (WIFSIGNALED (wait_status)
#if 0
- && !WIFSTOPPED (wait_status)
+ && !WIFSTOPPED (wait_status)
#endif
- )
- {
- /* SIGPIPE is OK, everything else is a problem. */
+ )
+ {
+ /* SIGPIPE is OK, everything else is a problem. */
- if (WTERMSIG (wait_status) != SIGPIPE)
- ERROR ((0, 0, _("Child died with signal %d%s"),
- WTERMSIG (wait_status),
- WCOREDUMP (wait_status) ? _(" (core dumped)") : ""));
- }
- else
- {
- /* Child voluntarily terminated -- but why? /bin/sh returns
- SIGPIPE + 128 if its child, then do nothing. */
+ if (WTERMSIG (wait_status) != SIGPIPE)
+ ERROR ((0, 0, _("Child died with signal %d%s"),
+ WTERMSIG (wait_status),
+ WCOREDUMP (wait_status) ? _(" (core dumped)") : ""));
+ }
+ else
+ {
+ /* Child voluntarily terminated -- but why? /bin/sh returns
+ SIGPIPE + 128 if its child, then do nothing. */
- if (WEXITSTATUS (wait_status) != (SIGPIPE + 128)
- && WEXITSTATUS (wait_status))
- ERROR ((0, 0, _("Child returned status %d"),
- WEXITSTATUS (wait_status)));
- }
+ if (WEXITSTATUS (wait_status) != (SIGPIPE + 128)
+ && WEXITSTATUS (wait_status))
+ ERROR ((0, 0, _("Child returned status %d"),
+ WEXITSTATUS (wait_status)));
+ }
+ }
}
#endif /* !MSDOS */
looped = 1;
}
-tryagain:
+ tryagain:
if (looped)
{
/* We have to prompt from now on. */
&& subcommand_option != DIFF_SUBCOMMAND)
WARN ((0, 0, _("WARNING: Archive is incomplete")));
+ apply_delayed_set_stat ();
exit (TAREXIT_FAILURE);
}
if (input_buffer[0] == '\n'
&& subcommand_option != DIFF_SUBCOMMAND)
WARN ((0, 0, _("WARNING: Archive is incomplete")));
+ apply_delayed_set_stat ();
exit (TAREXIT_FAILURE);
case 'n':
}
if (verify_option)
- archive = rmtopen (*archive_name_cursor, O_RDWR | O_CREAT, 0666,
+ archive = rmtopen (*archive_name_cursor, O_RDWR | O_CREAT, MODE_RW,
rsh_command_option);
else
switch (access)
{
case ACCESS_READ:
- archive = rmtopen (*archive_name_cursor, O_RDONLY, 0666,
+ archive = rmtopen (*archive_name_cursor, O_RDONLY, MODE_RW,
rsh_command_option);
break;
case ACCESS_WRITE:
if (backup_option)
maybe_backup_file (*archive_name_cursor, 1);
- archive = rmtcreat (*archive_name_cursor, 0666, rsh_command_option);
+ archive = rmtcreat (*archive_name_cursor, MODE_RW,
+ rsh_command_option);
break;
case ACCESS_UPDATE:
- archive = rmtopen (*archive_name_cursor, O_RDWR | O_CREAT, 0666,
+ archive = rmtopen (*archive_name_cursor, O_RDWR | O_CREAT, MODE_RW,
rsh_command_option);
break;
}
projects / chaz / tar / blobdiff