/* Buffer management for tar.
- Copyright (C) 1988, 92, 93, 94, 96, 97, 1999 Free Software Foundation, Inc.
+ Copyright 1988, 92, 93, 94, 96, 97, 1999 Free Software Foundation, Inc.
Written by John Gilmore, on 1985-08-25.
This program is free software; you can redistribute it and/or modify it
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.,
- 59 Place - Suite 330, Boston, MA 02111-1307, USA. */
+ 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 <time.h>
+#ifndef time
time_t time ();
+#endif
#if MSDOS
# include <process.h>
# include <sys/inode.h>
#endif
-#ifndef FNM_LEADING_DIR
-# include <fnmatch.h>
-#endif
+#include <fnmatch.h>
+#include <human.h>
#include "common.h"
#include "rmt.h"
#define DEBUG_FORK 0 /* if nonzero, childs are born stopped */
-#define STDIN 0 /* standard input file descriptor */
-#define STDOUT 1 /* standard output file descriptor */
-
#define PREAD 0 /* read file descriptor from pipe() */
#define PWRITE 1 /* write file descriptor from pipe() */
\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
char *save_name; /* name of the file we are currently writing */
off_t save_totsize; /* total size of file we are writing, only
- valid if save_name is non NULL */
+ valid if save_name is nonzero */
off_t save_sizeleft; /* where we are in the file we are writing,
only valid if save_name is nonzero */
-int write_archive_to_stdout = 0;
+int write_archive_to_stdout;
/* Used by flush_read and flush_write to store the real info about saved
names. */
-static char *real_s_name = NULL;
+static char *real_s_name;
static off_t real_s_totsize;
static off_t real_s_sizeleft;
\f
static pid_t
myfork (void)
{
- pid_t result = fork();
+ pid_t result = fork ();
if (result == 0)
kill (getpid (), SIGSTOP);
#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, "\n");
+ tarlong written = prev_written + bytes_written;
+ char bytes[sizeof (tarlong) * CHAR_BIT];
+ char abbr[LONGEST_HUMAN_READABLE + 1];
+ char rate[LONGEST_HUMAN_READABLE + 1];
+ double seconds;
+
+#if HAVE_CLOCK_GETTIME
+ struct timespec now;
+ if (clock_gettime (CLOCK_REALTIME, &now) == 0)
+ seconds = ((now.tv_sec - start_timespec.tv_sec)
+ + (now.tv_nsec - start_timespec.tv_nsec) / 1e9);
+ else
+#endif
+ seconds = time (0) - start_time;
+
+ sprintf (bytes, TARLONG_FORMAT, written);
+
+ /* Amanda 2.4.1p1 looks for "Total bytes written: [0-9][0-9]*". */
+ fprintf (stderr, _("Total bytes written: %s (%sB, %sB/s)\n"), bytes,
+ human_readable ((uintmax_t) written, abbr, 1, -1024),
+ (0 < seconds && written / seconds < (uintmax_t) -1
+ ? human_readable ((uintmax_t) (written / seconds), rate, 1, -1024)
+ : "?"));
}
/*--------------------------------------------------------.
/*-------------------------------------------------------------------------.
| Return the location of the next available input or output block. |
-| Return NULL for EOF. Once we have returned NULL, we just keep returning |
+| Return zero for EOF. Once we have returned zero, we just keep returning |
| it, to avoid accidentally going on to the next file on the tape. |
`-------------------------------------------------------------------------*/
if (current_block == record_end)
{
if (hit_eof)
- return NULL;
+ return 0;
flush_archive ();
if (current_block == record_end)
{
hit_eof = 1;
- return NULL;
+ return 0;
}
}
return current_block;
}
/*------------------------------------------------------------------.
-| Close file having descriptor FD, and abort if close unsucessful. |
+| Close file having descriptor FD, and abort if close unsuccessful. |
`------------------------------------------------------------------*/
static void
{
struct stat stbuf;
- if (stat (name, &stbuf) < 0)
- return 1;
+ if (stat (name, &stbuf) == 0)
+ return S_ISREG (stbuf.st_mode);
+ else
+ return errno == ENOENT;
+}
- if (S_ISREG (stbuf.st_mode))
- return 1;
+static ssize_t
+write_archive_buffer (void)
+{
+ ssize_t status;
+ ssize_t written = 0;
+
+ while (0 <= (status = rmtwrite (archive, record_start->buffer + written,
+ record_size - written)))
+ {
+ written += status;
+ if (written == record_size
+ || _isrmt (archive) || ! S_ISFIFO (archive_stat.st_mode))
+ break;
+ }
- return 0;
+ return written ? written : status;
}
/*-------------------------------------------------------.
program_name = _("tar (child)");
- xdup2 (parent_pipe[PREAD], STDIN, _("(child) Pipe to stdin"));
+ xdup2 (parent_pipe[PREAD], STDIN_FILENO, _("(child) Pipe to stdin"));
xclose (parent_pipe[PWRITE]);
/* Check if we need a grandchild tar. This happens only if either:
/* 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;
FATAL_ERROR ((0, saved_errno, _("Cannot open archive %s"),
archive_name_array[0]));
}
- xdup2 (archive, STDOUT, _("Archive to stdout"));
+ xdup2 (archive, STDOUT_FILENO, _("Archive to stdout"));
execlp (use_compress_program_option, use_compress_program_option,
(char *) 0);
FATAL_ERROR ((0, errno, _("Cannot exec %s"),
{
/* The child tar is still here! Launch the compressor. */
- xdup2 (child_pipe[PWRITE], STDOUT, _("((child)) Pipe to stdout"));
+ xdup2 (child_pipe[PWRITE], STDOUT_FILENO,
+ _("((child)) Pipe to stdout"));
xclose (child_pipe[PREAD]);
execlp (use_compress_program_option, use_compress_program_option,
(char *) 0);
/* Prepare for reblocking the data from the compressor into the archive. */
- xdup2 (child_pipe[PREAD], STDIN, _("(grandchild) Pipe to stdin"));
+ xdup2 (child_pipe[PREAD], STDIN_FILENO, _("(grandchild) Pipe to stdin"));
xclose (child_pipe[PWRITE]);
if (strcmp (archive_name_array[0], "-") == 0)
- archive = STDOUT;
+ 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 = read (STDIN, cursor, size);
+ status = safe_read (STDIN_FILENO, cursor, size);
if (status <= 0)
break;
}
if (length > 0)
{
memset (record_start->buffer + length, 0, record_size - length);
- status = rmtwrite (archive, record_start->buffer, record_size);
+ status = write_archive_buffer ();
if (status != record_size)
write_error (status);
}
break;
}
- status = rmtwrite (archive, record_start->buffer, record_size);
+ status = write_archive_buffer ();
if (status != record_size)
write_error (status);
}
program_name = _("tar (child)");
- xdup2 (parent_pipe[PWRITE], STDOUT, _("(child) Pipe to stdout"));
+ xdup2 (parent_pipe[PWRITE], STDOUT_FILENO, _("(child) Pipe to stdout"));
xclose (parent_pipe[PREAD]);
/* Check if we need a grandchild tar. This happens only if either:
/* 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]));
- xdup2 (archive, STDIN, _("Archive to stdin"));
+ xdup2 (archive, STDIN_FILENO, _("Archive to stdin"));
execlp (use_compress_program_option, use_compress_program_option,
"-d", (char *) 0);
FATAL_ERROR ((0, errno, _("Cannot exec %s"),
{
/* The child tar is still here! Launch the uncompressor. */
- xdup2 (child_pipe[PREAD], STDIN, _("((child)) Pipe to stdin"));
+ xdup2 (child_pipe[PREAD], STDIN_FILENO, _("((child)) Pipe to stdin"));
xclose (child_pipe[PWRITE]);
execlp (use_compress_program_option, use_compress_program_option,
"-d", (char *) 0);
/* Prepare for unblocking the data from the archive into the uncompressor. */
- xdup2 (child_pipe[PWRITE], STDOUT, _("(grandchild) Pipe to stdout"));
+ xdup2 (child_pipe[PWRITE], STDOUT_FILENO, _("(grandchild) Pipe to stdout"));
xclose (child_pipe[PREAD]);
if (strcmp (archive_name_array[0], "-") == 0)
- archive = STDIN;
+ 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]));
while (maximum)
{
count = maximum < BLOCKSIZE ? maximum : BLOCKSIZE;
- status = write (STDOUT, cursor, count);
+ status = full_write (STDOUT_FILENO, cursor, count);
if (status < 0)
- FATAL_ERROR ((0, errno, _("\
-Cannot write to compression program")));
+ FATAL_ERROR ((0, errno, _("Cannot write to compression program")));
if (status != count)
{
- ERROR ((0, 0, _("\
-Write to compression program short %lu bytes"),
+ ERROR ((0, 0, _("Write to compression program short %lu bytes"),
(unsigned long) (count - status)));
count = status;
}
if (archive_names == 0)
FATAL_ERROR ((0, 0, _("No archive name given")));
- current_file_name = NULL;
- current_link_name = NULL;
+ current_file_name = 0;
+ current_link_name = 0;
/* FIXME: According to POSIX.1, PATH_MAX may well not be a compile-time
constant, and the value from sysconf (_SC_PATH_MAX) may well not be any
allocation. (Roland McGrath) */
if (!real_s_name)
- real_s_name = (char *) xmalloc (PATH_MAX);
+ real_s_name = xmalloc (PATH_MAX);
/* FIXME: real_s_name is never freed. */
- save_name = NULL;
+ save_name = 0;
if (multi_volume_option)
{
- record_start
- = (union block *) valloc (record_size + (2 * BLOCKSIZE));
+ record_start = valloc (record_size + (2 * BLOCKSIZE));
if (record_start)
record_start += 2;
}
else
- record_start = (union block *) valloc (record_size);
+ record_start = valloc (record_size);
if (!record_start)
FATAL_ERROR ((0, 0, _("Could not allocate memory for blocking factor %d"),
blocking_factor));
switch (access)
{
case ACCESS_READ:
- archive = STDIN;
+ archive = STDIN_FILENO;
break;
case ACCESS_WRITE:
- archive = STDOUT;
+ archive = STDOUT_FILENO;
stdlis = stderr;
break;
case ACCESS_UPDATE:
- archive = STDIN;
+ archive = STDIN_FILENO;
stdlis = stderr;
write_archive_to_stdout = 1;
break;
}
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 (archive < 0)
+ if (archive < 0
+ || (! _isrmt (archive) && fstat (archive, &archive_stat) < 0))
{
int saved_errno = errno;
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
- fstat (archive, &archive_stat);
-
/* Detect if outputting to "/dev/null". */
{
+ static char const dev_null[] = "/dev/null";
struct stat dev_null_stat;
- stat ("/dev/null", &dev_null_stat);
- dev_null_output = (S_ISCHR (archive_stat.st_mode)
- && archive_stat.st_rdev == dev_null_stat.st_rdev);
+ dev_null_output =
+ (strcmp (archive_name_array[0], dev_null) == 0
+ || (! _isrmt (archive)
+ && 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));
}
if (!_isrmt (archive) && S_ISREG (archive_stat.st_mode))
ar_dev = archive_stat.st_dev;
ar_ino = archive_stat.st_ino;
}
+ else
+ ar_dev = 0;
#endif /* not MSDOS */
union block *label = find_next_block ();
if (!label)
- FATAL_ERROR ((0, 0, _("Archive not labelled to match `%s'"),
+ FATAL_ERROR ((0, 0, _("Archive not labeled to match `%s'"),
volume_label_option));
if (!check_label_pattern (label))
FATAL_ERROR ((0, 0, _("Volume `%s' does not match `%s'"),
case ACCESS_WRITE:
if (volume_label_option)
{
- memset ((void *) record_start, 0, BLOCKSIZE);
+ memset (record_start, 0, BLOCKSIZE);
if (multi_volume_option)
sprintf (record_start->header.name, "%s Volume 1",
volume_label_option);
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 (start_time, 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;
else if (dev_null_output)
status = record_size;
else
- status = rmtwrite (archive, record_start->buffer, record_size);
+ 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])
{
if (volume_label_option)
{
- memset ((void *) record_start, 0, BLOCKSIZE);
+ memset (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 (start_time, record_start->header.mtime);
record_start->header.typeflag = GNUTYPE_VOLHDR;
finish_header (record_start);
}
if (volume_label_option)
record_start++;
- memset ((void *) record_start, 0, BLOCKSIZE);
+ memset (record_start, 0, BLOCKSIZE);
/* FIXME: Michael P Urban writes: [a long name file] is being written
when a new volume rolls around [...] Looks like the wrong value is
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);
record_start--;
}
- status = rmtwrite (archive, record_start->buffer, record_size);
+ 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;
- memcpy ((void *) current_block,
- (void *) (record_start + blocking_factor - copy_back),
- (size_t) (copy_back * BLOCKSIZE));
+ memcpy (current_block,
+ record_start + blocking_factor - copy_back,
+ copy_back * BLOCKSIZE);
current_block += copy_back;
if (real_s_sizeleft >= copy_back * BLOCKSIZE)
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++;
int saved_errno = errno;
/* It might be useful to know how much was written before the error
- occured. Beware that mere printing maybe change errno value. */
+ occurred. */
if (totals_option)
print_total_written ();
static void
read_error (void)
{
- WARN ((0, errno, _("Read error on %s"), *archive_name_cursor));
+ ERROR ((0, errno, _("Read error on %s"), *archive_name_cursor));
if (record_start_block == 0)
FATAL_ERROR ((0, 0, _("At beginning of tape, quitting now")));
if (write_archive_to_stdout && record_start_block != 0)
{
- status = rmtwrite (1, record_start->buffer, record_size);
+ status = write_archive_buffer ();
if (status != record_size)
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:
+ error_loop:
status = rmtread (archive, record_start->buffer, record_size);
if (status == record_size)
return;
global_volno--;
goto try_volume;
}
- s1 = UINTMAX_FROM_OCT (cursor->header.size);
- s2 = UINTMAX_FROM_OCT (cursor->oldgnu_header.offset);
+ s1 = UINTMAX_FROM_HEADER (cursor->header.size);
+ s2 = UINTMAX_FROM_HEADER (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_HEADER (cursor->oldgnu_header.offset))
{
WARN ((0, 0, _("This volume is out of sequence")));
volno--;
goto error_loop; /* try again */
}
-short_read:
+ short_read:
more = record_start->buffer + status;
left = record_size - status;
-again:
- if (left % BLOCKSIZE == 0)
+ while (left % BLOCKSIZE != 0)
{
- /* FIXME: for size=0, multi-volume support. On the first record, warn
- about the problem. */
-
- if (!read_full_records_option && verbose_option
- && record_start_block == 0 && status > 0)
- WARN ((0, 0, _("Record size = %lu blocks"),
- (unsigned long) (status / BLOCKSIZE)));
+ while ((status = rmtread (archive, more, left)) < 0)
+ read_error ();
- record_end = record_start + (record_size - left) / BLOCKSIZE;
+ if (status == 0)
+ {
+ ERROR ((0, 0, _("%d garbage bytes ignored at end of archive"),
+ (int) ((record_size - left) % BLOCKSIZE)));
+ break;
+ }
- return;
- }
- if (read_full_records_option)
- {
+ if (! read_full_records_option)
+ FATAL_ERROR ((0, 0, _("Unaligned block (%lu bytes) in archive"),
+ (unsigned long) (record_size - left)));
+
/* User warned us about this. Fix up. */
- if (left > 0)
- {
- error2loop:
- status = rmtread (archive, more, left);
- if (status < 0)
- {
- read_error ();
- goto error2loop; /* try again */
- }
- if (status == 0)
- FATAL_ERROR ((0, 0, _("Archive %s EOF not on block boundary"),
- *archive_name_cursor));
- left -= status;
- more += status;
- goto again;
- }
+ left -= status;
+ more += status;
}
- else
- FATAL_ERROR ((0, 0, _("Only read %lu bytes from archive %s"),
- (unsigned long) status, *archive_name_cursor));
+
+ /* FIXME: for size=0, multi-volume support. On the first record, warn
+ about the problem. */
+
+ if (!read_full_records_option && verbose_option
+ && record_start_block == 0 && status > 0)
+ WARN ((0, 0, _("Record size = %lu blocks"),
+ (unsigned long) ((record_size - left) / BLOCKSIZE)));
+
+ record_end = record_start + (record_size - left) / BLOCKSIZE;
}
/*-----------------------------------------------.
#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. */
- WARN ((0, 0, _("\
-Could not backspace archive file; it may be unreadable without -i")));
+ WARN ((0, 0,
+ _("Could not backspace archive file; it may be unreadable without -i")));
/* Replace the first part of the record with NULs. */
if (record_start->buffer != output_start)
memset (record_start->buffer, 0,
- (size_t) (output_start - record_start->buffer));
+ output_start - record_start->buffer);
}
}
}
might become clever enough to just stop working, once there is no more
work to do, we might have to revise this area in such time. */
- if (access_mode == ACCESS_READ && S_ISFIFO (archive_stat.st_mode) &&
- !ending_file_option)
+ if (access_mode == ACCESS_READ
+ && ! _isrmt (archive)
+ && S_ISFIFO (archive_stat.st_mode))
while (rmtread (archive, record_start->buffer, record_size) > 0)
continue;
#endif
- if (subcommand_option == DELETE_SUBCOMMAND)
+ if (! _isrmt (archive) && subcommand_option == DELETE_SUBCOMMAND)
{
- off_t pos;
-
- pos = rmtlseek (archive, (off_t) 0, 1);
#if MSDOS
- rmtwrite (archive, "", 0);
+ int status = write (archive, "", 0);
#else
- 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"),
+ *archive_name_cursor));
}
if (verify_option)
verify_volume ();
if (child_pid)
{
- WAIT_T wait_status;
- pid_t child;
-
- /* Loop waiting for the right child to die, or for no more kids. */
+ int wait_status;
- while ((child = wait (&wait_status), child != child_pid)
- && child != -1)
- continue;
-
- if (child != -1)
- if (WIFSIGNALED (wait_status)
-#if 0
- && !WIFSTOPPED (wait_status)
-#endif
- )
+ while (waitpid (child_pid, &wait_status, 0) == -1)
+ if (errno != EINTR)
{
- /* 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)") : ""));
+ ERROR ((0, errno, _("While waiting for child")));
+ break;
}
- 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 (WIFSIGNALED (wait_status))
+ {
+ /* SIGPIPE is OK, everything else is a problem. */
+
+ if (WTERMSIG (wait_status) != SIGPIPE)
+ ERROR ((0, 0, _("Child died with signal %d"),
+ WTERMSIG (wait_status)));
+ }
+ else
+ {
+ /* Child voluntarily terminated -- but why? /bin/sh returns
+ SIGPIPE + 128 if its child, then do nothing. */
+
+ if (WEXITSTATUS (wait_status)
+ && WEXITSTATUS (wait_status) != (SIGPIPE + 128))
+ ERROR ((0, 0, _("Child returned status %d"),
+ WEXITSTATUS (wait_status)));
+ }
}
#endif /* !MSDOS */
static int
new_volume (enum access_mode access)
{
- static FILE *read_file = NULL;
- static int looped = 0;
+ static FILE *read_file;
+ static int looped;
int status;
if (!read_file && !info_script_option)
/* FIXME: if fopen is used, it will never be closed. */
- read_file = archive == STDIN ? fopen (TTY_NAME, "r") : stdin;
+ read_file = archive == STDIN_FILENO ? fopen (TTY_NAME, "r") : stdin;
if (now_verifying)
return 0;
looped = 1;
}
-tryagain:
+ tryagain:
if (looped)
{
/* We have to prompt from now on. */
{
char input_buffer[80];
+ fputc ('\007', stderr);
fprintf (stderr,
- _("\007Prepare volume #%d for %s and hit return: "),
+ _("Prepare volume #%d for %s and hit return: "),
global_volno, *archive_name_cursor);
fflush (stderr);
- if (fgets (input_buffer, sizeof (input_buffer), read_file) == 0)
+ if (fgets (input_buffer, sizeof input_buffer, read_file) == 0)
{
- fprintf (stderr, _("EOF where user reply was expected"));
+ WARN ((0, 0, _("EOF where user reply was expected")));
if (subcommand_option != EXTRACT_SUBCOMMAND
&& subcommand_option != LIST_SUBCOMMAND
&& subcommand_option != DIFF_SUBCOMMAND)
WARN ((0, 0, _("WARNING: Archive is incomplete")));
+ apply_delayed_set_stat ();
exit (TAREXIT_FAILURE);
}
if (input_buffer[0] == '\n'
case 'q':
/* Quit. */
- fprintf (stdlis, _("No new volume; exiting.\n"));
+ WARN ((0, 0, _("No new volume; exiting.\n")));
if (subcommand_option != EXTRACT_SUBCOMMAND
&& subcommand_option != LIST_SUBCOMMAND
&& subcommand_option != DIFF_SUBCOMMAND)
WARN ((0, 0, _("WARNING: Archive is incomplete")));
+ apply_delayed_set_stat ();
exit (TAREXIT_FAILURE);
case 'n':
#if MSDOS
spawnl (P_WAIT, getenv ("COMSPEC"), "-", 0);
#else /* not MSDOS */
- switch (fork ())
- {
- case -1:
- WARN ((0, errno, _("Cannot fork!")));
- break;
-
- case 0:
- {
- const char *shell = getenv ("SHELL");
-
- if (shell == NULL)
- shell = "/bin/sh";
- execlp (shell, "-sh", "-i", 0);
- FATAL_ERROR ((0, errno, _("Cannot exec a shell %s"),
- shell));
- }
-
- default:
+ {
+ pid_t child = fork ();
+ switch (child)
{
- WAIT_T wait_status;
-
- wait (&wait_status);
+ case -1:
+ WARN ((0, errno, _("Cannot fork!")));
+ break;
+
+ case 0:
+ {
+ const char *shell = getenv ("SHELL");
+
+ if (! shell)
+ shell = "/bin/sh";
+ execlp (shell, "-sh", "-i", 0);
+ FATAL_ERROR ((0, errno, _("Cannot exec a shell %s"),
+ shell));
+ }
+
+ default:
+ {
+ int wait_status;
+ while (waitpid (child, &wait_status, 0) == -1)
+ if (errno != EINTR)
+ {
+ ERROR ((0, errno,
+ _("While waiting for child")));
+ break;
+ }
+ }
+ break;
}
- break;
- }
-
- /* FIXME: I'm not sure if that's all that has to be done
- here. (jk) */
-
+ }
#endif /* not MSDOS */
break;
}
}
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