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. */
#include "system.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() */
return 0;
}
+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 written ? written : status;
+}
+
/*-------------------------------------------------------.
| Set ARCHIVE for writing, then compressing an archive. |
`-------------------------------------------------------*/
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")));
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 !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)
+ && stat (dev_null, &dev_null_stat) == 0
+ && S_ISCHR (archive_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 */
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)
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)
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;
#if MSDOS
- if (cursor[1] == ':')
- cursor += 2;
+ 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);
#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. */
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 ();
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 */
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;
{
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 (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