/* Buffer management for tar.
- Copyright 1988, 92, 93, 94, 96, 97, 1999 Free Software Foundation, Inc.
+ Copyright 1988, 92, 93, 94, 96, 97, 99, 2000 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
#endif
#include <fnmatch.h>
+#include <human.h>
+#include <quotearg.h>
#include "common.h"
#include "rmt.h"
-#define DEBUG_FORK 0 /* if nonzero, childs are born stopped */
-
#define PREAD 0 /* read file descriptor from pipe() */
#define PWRITE 1 /* write file descriptor from pipe() */
static void backspace_output PARAMS ((void));
static int new_volume PARAMS ((enum access_mode));
-static void write_error PARAMS ((ssize_t));
-static void read_error PARAMS ((void));
+static void archive_write_error PARAMS ((ssize_t)) __attribute__ ((noreturn));
+static void archive_read_error PARAMS ((void));
#if !MSDOS
/* Obnoxious test to see if dimwit is trying to dump the archive. */
\f
/* Functions. */
-#if DEBUG_FORK
-
-static pid_t
-myfork (void)
-{
- pid_t result = fork ();
-
- if (result == 0)
- kill (getpid (), SIGSTOP);
- return result;
-}
-
-# define fork myfork
-
-#endif /* DEBUG FORK */
-
void
print_total_written (void)
{
- fprintf (stderr, _("Total bytes written: "));
- fprintf (stderr, TARLONG_FORMAT, prev_written + bytes_written);
- 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)
+ : "?"));
}
/*--------------------------------------------------------.
static void
xclose (int fd)
{
- if (close (fd) < 0)
- FATAL_ERROR ((0, errno, _("Cannot close file #%d"), fd));
+ if (close (fd) != 0)
+ close_error (_("(pipe)"));
}
-/*-----------------------------------------------------------------------.
-| Duplicate file descriptor FROM into becoming INTO, or else, issue |
-| MESSAGE. INTO is closed first and has to be the next available slot. |
-`-----------------------------------------------------------------------*/
+/* Duplicate file descriptor FROM into becoming INTO.
+ INTO is closed first and has to be the next available slot. */
static void
-xdup2 (int from, int into, const char *message)
+xdup2 (int from, int into)
{
if (from != into)
{
int status = close (into);
- if (status < 0 && errno != EBADF)
- FATAL_ERROR ((0, errno, _("Cannot close descriptor %d"), into));
+ if (status != 0 && errno != EBADF)
+ {
+ int e = errno;
+ FATAL_ERROR ((0, e, _("Cannot close")));
+ }
status = dup (from);
if (status != into)
- FATAL_ERROR ((0, errno, _("Cannot properly duplicate %s"), message));
+ {
+ if (status < 0)
+ {
+ int e = errno;
+ FATAL_ERROR ((0, e, _("Cannot dup")));
+ }
+ abort ();
+ }
xclose (from);
}
}
int child_pipe[2];
pid_t grandchild_pid;
- if (pipe (parent_pipe) < 0)
- FATAL_ERROR ((0, errno, _("Cannot open pipe")));
-
- child_pid = fork ();
- if (child_pid < 0)
- FATAL_ERROR ((0, errno, _("Cannot fork")));
+ xpipe (parent_pipe);
+ child_pid = xfork ();
if (child_pid > 0)
{
program_name = _("tar (child)");
- xdup2 (parent_pipe[PREAD], STDIN_FILENO, _("(child) Pipe to stdin"));
+ xdup2 (parent_pipe[PREAD], STDIN_FILENO);
xclose (parent_pipe[PWRITE]);
/* Check if we need a grandchild tar. This happens only if either:
if (backup_option)
undo_last_backup ();
- FATAL_ERROR ((0, saved_errno, _("Cannot open archive %s"),
- archive_name_array[0]));
+ errno = saved_errno;
+ open_fatal (archive_name_array[0]);
}
- xdup2 (archive, STDOUT_FILENO, _("Archive to stdout"));
+ xdup2 (archive, STDOUT_FILENO);
execlp (use_compress_program_option, use_compress_program_option,
(char *) 0);
- FATAL_ERROR ((0, errno, _("Cannot exec %s"),
- use_compress_program_option));
+ exec_fatal (use_compress_program_option);
}
/* We do need a grandchild tar. */
- if (pipe (child_pipe) < 0)
- FATAL_ERROR ((0, errno, _("Cannot open pipe")));
-
- grandchild_pid = fork ();
- if (grandchild_pid < 0)
- FATAL_ERROR ((0, errno, _("Child cannot fork")));
+ xpipe (child_pipe);
+ grandchild_pid = xfork ();
if (grandchild_pid > 0)
{
/* The child tar is still here! Launch the compressor. */
- xdup2 (child_pipe[PWRITE], STDOUT_FILENO,
- _("((child)) Pipe to stdout"));
+ xdup2 (child_pipe[PWRITE], STDOUT_FILENO);
xclose (child_pipe[PREAD]);
execlp (use_compress_program_option, use_compress_program_option,
(char *) 0);
- FATAL_ERROR ((0, errno, _("Cannot exec %s"),
- use_compress_program_option));
+ exec_fatal (use_compress_program_option);
}
/* The new born grandchild tar is here! */
/* Prepare for reblocking the data from the compressor into the archive. */
- xdup2 (child_pipe[PREAD], STDIN_FILENO, _("(grandchild) Pipe to stdin"));
+ xdup2 (child_pipe[PREAD], STDIN_FILENO);
xclose (child_pipe[PWRITE]);
if (strcmp (archive_name_array[0], "-") == 0)
archive = STDOUT_FILENO;
else
- 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]));
+ {
+ archive = rmtcreat (archive_name_array[0], MODE_RW, rsh_command_option);
+ if (archive < 0)
+ open_fatal (archive_name_array[0]);
+ }
/* Let's read out of the stdin pipe and write an archive. */
}
if (status < 0)
- FATAL_ERROR ((0, errno, _("Cannot read from compression program")));
+ read_fatal (use_compress_program_option);
/* Copy the record. */
memset (record_start->buffer + length, 0, record_size - length);
status = write_archive_buffer ();
if (status != record_size)
- write_error (status);
+ archive_write_error (status);
}
/* There is nothing else to read, break out. */
status = write_archive_buffer ();
if (status != record_size)
- write_error (status);
+ archive_write_error (status);
}
#if 0
int child_pipe[2];
pid_t grandchild_pid;
- if (pipe (parent_pipe) < 0)
- FATAL_ERROR ((0, errno, _("Cannot open pipe")));
-
- child_pid = fork ();
- if (child_pid < 0)
- FATAL_ERROR ((0, errno, _("Cannot fork")));
+ xpipe (parent_pipe);
+ child_pid = xfork ();
if (child_pid > 0)
{
program_name = _("tar (child)");
- xdup2 (parent_pipe[PWRITE], STDOUT_FILENO, _("(child) Pipe to stdout"));
+ xdup2 (parent_pipe[PWRITE], STDOUT_FILENO);
xclose (parent_pipe[PREAD]);
/* Check if we need a grandchild tar. This happens only if either:
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_FILENO, _("Archive to stdin"));
+ open_fatal (archive_name_array[0]);
+ xdup2 (archive, STDIN_FILENO);
execlp (use_compress_program_option, use_compress_program_option,
"-d", (char *) 0);
- FATAL_ERROR ((0, errno, _("Cannot exec %s"),
- use_compress_program_option));
+ exec_fatal (use_compress_program_option);
}
/* We do need a grandchild tar. */
- if (pipe (child_pipe) < 0)
- FATAL_ERROR ((0, errno, _("Cannot open pipe")));
-
- grandchild_pid = fork ();
- if (grandchild_pid < 0)
- FATAL_ERROR ((0, errno, _("Child cannot fork")));
+ xpipe (child_pipe);
+ grandchild_pid = xfork ();
if (grandchild_pid > 0)
{
/* The child tar is still here! Launch the uncompressor. */
- xdup2 (child_pipe[PREAD], STDIN_FILENO, _("((child)) Pipe to stdin"));
+ xdup2 (child_pipe[PREAD], STDIN_FILENO);
xclose (child_pipe[PWRITE]);
execlp (use_compress_program_option, use_compress_program_option,
"-d", (char *) 0);
- FATAL_ERROR ((0, errno, _("Cannot exec %s"),
- use_compress_program_option));
+ exec_fatal (use_compress_program_option);
}
/* The new born grandchild tar is here! */
/* Prepare for unblocking the data from the archive into the uncompressor. */
- xdup2 (child_pipe[PWRITE], STDOUT_FILENO, _("(grandchild) Pipe to stdout"));
+ xdup2 (child_pipe[PWRITE], STDOUT_FILENO);
xclose (child_pipe[PREAD]);
if (strcmp (archive_name_array[0], "-") == 0)
archive = rmtopen (archive_name_array[0], O_RDONLY | O_BINARY,
MODE_RW, rsh_command_option);
if (archive < 0)
- FATAL_ERROR ((0, errno, _("Cannot open archive %s"),
- archive_name_array[0]));
+ open_fatal (archive_name_array[0]);
/* Let's read the archive and pipe it into stdout. */
status = rmtread (archive, record_start->buffer, record_size);
if (status < 0)
{
- read_error ();
+ archive_read_error ();
goto error_loop;
}
if (status == 0)
count = maximum < BLOCKSIZE ? maximum : BLOCKSIZE;
status = full_write (STDOUT_FILENO, cursor, count);
if (status < 0)
- FATAL_ERROR ((0, errno, _("Cannot write to compression program")));
+ write_error (use_compress_program_option);
if (status != count)
{
`------------------------------------------------------------------------*/
void
-open_archive (enum access_mode access)
+open_archive (enum access_mode wanted_access)
{
int backed_up_flag = 0;
if (multi_volume_option)
{
+ if (verify_option)
+ FATAL_ERROR ((0, 0, _("Cannot verify multi-volume archives")));
record_start = valloc (record_size + (2 * BLOCKSIZE));
if (record_start)
record_start += 2;
else
record_start = valloc (record_size);
if (!record_start)
- FATAL_ERROR ((0, 0, _("Could not allocate memory for blocking factor %d"),
+ FATAL_ERROR ((0, 0, _("Cannot allocate memory for blocking factor %d"),
blocking_factor));
current_block = record_start;
record_end = record_start + blocking_factor;
/* When updating the archive, we start with reading. */
- access_mode = access == ACCESS_UPDATE ? ACCESS_READ : access;
-
- if (multi_volume_option && verify_option)
- FATAL_ERROR ((0, 0, _("Cannot verify multi-volume archives")));
+ access_mode = wanted_access == ACCESS_UPDATE ? ACCESS_READ : wanted_access;
if (use_compress_program_option)
{
if (verify_option)
FATAL_ERROR ((0, 0, _("Cannot verify compressed archives")));
- switch (access)
+ switch (wanted_access)
{
case ACCESS_READ:
child_open_for_uncompress ();
break;
}
- if (access == ACCESS_WRITE && strcmp (archive_name_array[0], "-") == 0)
+ if (wanted_access == ACCESS_WRITE
+ && strcmp (archive_name_array[0], "-") == 0)
stdlis = stderr;
}
else if (strcmp (archive_name_array[0], "-") == 0)
if (verify_option)
FATAL_ERROR ((0, 0, _("Cannot verify stdin/stdout archive")));
- switch (access)
+ switch (wanted_access)
{
case ACCESS_READ:
archive = STDIN_FILENO;
archive = rmtopen (archive_name_array[0], O_RDWR | O_CREAT | O_BINARY,
MODE_RW, rsh_command_option);
else
- switch (access)
+ switch (wanted_access)
{
case ACCESS_READ:
archive = rmtopen (archive_name_array[0], O_RDONLY | O_BINARY,
if (backed_up_flag)
undo_last_backup ();
- FATAL_ERROR ((0, saved_errno, "%s", archive_name_array[0]));
+ errno = saved_errno;
+ open_fatal (archive_name_array[0]);
}
#if !MSDOS
setmode (archive, O_BINARY);
#endif
- switch (access)
+ switch (wanted_access)
{
case ACCESS_READ:
case ACCESS_UPDATE:
union block *label = find_next_block ();
if (!label)
- FATAL_ERROR ((0, 0, _("Archive not labeled to match `%s'"),
- volume_label_option));
+ FATAL_ERROR ((0, 0, _("Archive not labeled to match %s"),
+ quote (volume_label_option)));
if (!check_label_pattern (label))
- FATAL_ERROR ((0, 0, _("Volume `%s' does not match `%s'"),
- label->header.name, volume_label_option));
+ FATAL_ERROR ((0, 0, _("Volume %s does not match %s"),
+ quote_n (0, label->header.name),
+ quote_n (1, volume_label_option)));
}
break;
assign_string (¤t_file_name, record_start->header.name);
record_start->header.typeflag = GNUTYPE_VOLHDR;
- TIME_TO_CHARS (time (0), record_start->header.mtime);
+ TIME_TO_CHARS (start_time, record_start->header.mtime);
finish_header (record_start);
#if 0
current_block++;
if (tape_length_option && tape_length_option <= bytes_written)
{
- errno = ENOSPC; /* FIXME: errno should be read-only */
+ errno = ENOSPC;
status = 0;
}
else if (dev_null_output)
else
status = write_archive_buffer ();
if (status != record_size && !multi_volume_option)
- write_error (status);
+ archive_write_error (status);
if (status > 0)
bytes_written += status;
/* ENXIO is for the UNIX PC. */
if (status < 0 && errno != ENOSPC && errno != EIO && errno != ENXIO)
- write_error (status);
+ archive_write_error (status);
/* If error indicates a short write, we just move to the next tape. */
if (volume_label_option)
{
memset (record_start, 0, BLOCKSIZE);
- sprintf (record_start->header.name, "%s Volume %d", volume_label_option, volno);
- TIME_TO_CHARS (time (0), record_start->header.mtime);
+ sprintf (record_start->header.name, "%s Volume %d",
+ volume_label_option, volno);
+ TIME_TO_CHARS (start_time, record_start->header.mtime);
record_start->header.typeflag = GNUTYPE_VOLHDR;
finish_header (record_start);
}
status = write_archive_buffer ();
if (status != record_size)
- write_error (status);
+ archive_write_error (status);
bytes_written += status;
`---------------------------------------------------------------------*/
static void
-write_error (ssize_t status)
+archive_write_error (ssize_t status)
{
- int saved_errno = errno;
-
/* It might be useful to know how much was written before the error
occurred. */
if (totals_option)
- print_total_written ();
+ {
+ int e = errno;
+ print_total_written ();
+ errno = e;
+ }
- if (status < 0)
- FATAL_ERROR ((0, saved_errno, _("Cannot write to %s"),
- *archive_name_cursor));
- else
- FATAL_ERROR ((0, 0, _("Only wrote %lu of %lu bytes to %s"),
- (unsigned long) status, (unsigned long) record_size,
- *archive_name_cursor));
+ write_fatal_details (*archive_name_cursor, status, record_size);
}
/*-------------------------------------------------------------------.
`-------------------------------------------------------------------*/
static void
-read_error (void)
+archive_read_error (void)
{
- WARN ((0, errno, _("Read error on %s"), *archive_name_cursor));
+ read_error (*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)
{
+ archive = STDOUT_FILENO;
status = write_archive_buffer ();
+ archive = STDIN_FILENO;
if (status != record_size)
- write_error (status);
+ archive_write_error (status);
}
if (multi_volume_option)
{
}
}
-error_loop:
+ error_loop:
status = rmtread (archive, record_start->buffer, record_size);
if (status == record_size)
return;
status = rmtread (archive, record_start->buffer, record_size);
if (status < 0)
{
- read_error ();
+ archive_read_error ();
goto vol_error;
}
if (status != record_size)
{
if (!check_label_pattern (cursor))
{
- WARN ((0, 0, _("Volume `%s' does not match `%s'"),
- cursor->header.name, volume_label_option));
+ WARN ((0, 0, _("Volume %s does not match %s"),
+ quote_n (0, cursor->header.name),
+ quote_n (1, volume_label_option)));
volno--;
global_volno--;
goto try_volume;
}
}
if (verbose_option)
- fprintf (stdlis, _("Reading %s\n"), cursor->header.name);
+ fprintf (stdlis, _("Reading %s\n"), quote (cursor->header.name));
cursor++;
}
else if (volume_label_option)
|| strcmp (cursor->header.name, real_s_name))
{
WARN ((0, 0, _("%s is not continued on this volume"),
- real_s_name));
+ quote (real_s_name)));
volno--;
global_volno--;
goto try_volume;
}
- s1 = UINTMAX_FROM_CHARS (cursor->header.size);
- s2 = UINTMAX_FROM_CHARS (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];
char s2buf[UINTMAX_STRSIZE_BOUND];
WARN ((0, 0, _("%s is the wrong size (%s != %s + %s)"),
- cursor->header.name,
+ quote (cursor->header.name),
STRINGIFY_BIGINT (save_totsize, totsizebuf),
STRINGIFY_BIGINT (s1, s1buf),
STRINGIFY_BIGINT (s2, s2buf)));
goto try_volume;
}
if (real_s_totsize - real_s_sizeleft
- != OFF_FROM_CHARS (cursor->oldgnu_header.offset))
+ != OFF_FROM_HEADER (cursor->oldgnu_header.offset))
{
WARN ((0, 0, _("This volume is out of sequence")));
volno--;
}
else if (status < 0)
{
- read_error ();
+ archive_read_error ();
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)));
+ if (status)
+ while ((status = rmtread (archive, more, left)) < 0)
+ archive_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;
}
/*-----------------------------------------------.
if (file_to_switch_to >= 0)
{
- int status = rmtclose (archive);
-
- if (status < 0)
- WARN ((0, errno, _("WARNING: Cannot close %s (%d, %d)"),
- *archive_name_cursor, archive, status));
+ if (rmtclose (archive) != 0)
+ close_warn (*archive_name_cursor);
archive = file_to_switch_to;
}
/* Lseek failed. Try a different method. */
WARN ((0, 0,
- _("Could not backspace archive file; it may be unreadable without -i")));
+ _("Cannot backspace archive file; it may be unreadable without -i")));
/* Replace the first part of the record with NULs. */
int status = pos < 0 ? -1 : ftruncate (archive, pos);
#endif
if (status != 0)
- WARN ((0, errno, _("WARNING: Cannot truncate %s"),
- *archive_name_cursor));
+ truncate_warn (*archive_name_cursor);
}
if (verify_option)
verify_volume ();
- {
- int status = rmtclose (archive);
-
- if (status < 0)
- WARN ((0, errno, _("WARNING: Cannot close %s (%d, %d)"),
- *archive_name_cursor, archive, status));
- }
+ if (rmtclose (archive) != 0)
+ close_warn (*archive_name_cursor);
#if !MSDOS
while (waitpid (child_pid, &wait_status, 0) == -1)
if (errno != EINTR)
{
- ERROR ((0, errno, _("While waiting for child")));
+ waitpid_error (use_compress_program_option);
break;
}
if (file)
{
fscanf (file, "%d", &global_volno);
- if (fclose (file) == EOF)
- ERROR ((0, errno, "%s", volno_file_option));
+ if (ferror (file))
+ read_error (volno_file_option);
+ if (fclose (file) != 0)
+ close_error (volno_file_option);
}
else if (errno != ENOENT)
- ERROR ((0, errno, "%s", volno_file_option));
+ open_error (volno_file_option);
}
/*-------------------------------------------------------.
if (file)
{
fprintf (file, "%d\n", global_volno);
- if (fclose (file) == EOF)
- ERROR ((0, errno, "%s", volno_file_option));
+ if (ferror (file))
+ write_error (volno_file_option);
+ if (fclose (file) != 0)
+ close_error (volno_file_option);
}
else
- ERROR ((0, errno, "%s", volno_file_option));
+ open_error (volno_file_option);
}
/*-----------------------------------------------------------------------.
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_FILENO ? fopen (TTY_NAME, "r") : stdin;
if (verify_option)
verify_volume ();
- if (status = rmtclose (archive), status < 0)
- WARN ((0, errno, _("WARNING: Cannot close %s (%d, %d)"),
- *archive_name_cursor, archive, status));
+ if (rmtclose (archive) != 0)
+ close_warn (*archive_name_cursor);
global_volno++;
volno++;
fputc ('\007', stderr);
fprintf (stderr,
_("Prepare volume #%d for %s and hit return: "),
- global_volno, *archive_name_cursor);
+ global_volno, quote (*archive_name_cursor));
fflush (stderr);
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);
+ fatal_exit ();
}
if (input_buffer[0] == '\n'
|| input_buffer[0] == 'y'
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);
+ fatal_exit ();
case 'n':
/* Get new file name. */
spawnl (P_WAIT, getenv ("COMSPEC"), "-", 0);
#else /* not MSDOS */
{
- pid_t child = fork ();
- switch (child)
+ pid_t child;
+ const char *shell = getenv ("SHELL");
+ if (! shell)
+ shell = "/bin/sh";
+ child = xfork ();
+ if (child == 0)
+ {
+ execlp (shell, "-sh", "-i", 0);
+ exec_fatal (shell);
+ }
+ else
{
- 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;
+ int wait_status;
+ while (waitpid (child, &wait_status, 0) == -1)
+ if (errno != EINTR)
+ {
+ waitpid_error (shell);
+ break;
+ }
}
}
#endif /* not MSDOS */
if (archive < 0)
{
- WARN ((0, errno, _("Cannot open %s"), *archive_name_cursor));
+ open_warn (*archive_name_cursor);
if (!verify_option && access == ACCESS_WRITE && backup_option)
undo_last_backup ();
goto tryagain;
projects / chaz / tar / blobdiff