/* 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
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 <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 "common.h"
#include "rmt.h"
static pid_t
myfork (void)
{
- pid_t result = fork();
+ pid_t result = fork ();
if (result == 0)
kill (getpid (), SIGSTOP);
count = maximum < BLOCKSIZE ? maximum : BLOCKSIZE;
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;
}
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++;
return;
}
- cursor = save_name;
-#if MSDOS
- if (cursor[1] == ':')
- cursor += 2;
-#endif
+ cursor = save_name + FILESYSTEM_PREFIX_LEN (save_name);
while (*cursor == '/')
cursor++;
{
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);
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++;
{
if (save_name)
{
- char *cursor = save_name;
+ char *cursor = save_name + FILESYSTEM_PREFIX_LEN (save_name);
-#if MSDOS
- if (cursor[1] == ':')
- cursor += 2;
-#endif
while (*cursor == '/')
cursor++;
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--;
{
/* 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 (child_pid)
{
- WAIT_T wait_status;
- pid_t child;
+ int wait_status;
- /* Loop waiting for the right child to die, or for no more kids. */
-
- while ((child = wait (&wait_status), child != child_pid)
- && child != -1)
- continue;
+ while (waitpid (child_pid, &wait_status, 0) == -1)
+ if (errno != EINTR)
+ {
+ ERROR ((0, errno, _("While waiting for child")));
+ break;
+ }
- if (child != -1)
+ if (WIFSIGNALED (wait_status))
{
- if (WIFSIGNALED (wait_status)
-#if 0
- && !WIFSTOPPED (wait_status)
-#endif
- )
- {
- /* 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 (WEXITSTATUS (wait_status) != (SIGPIPE + 128)
- && WEXITSTATUS (wait_status))
- ERROR ((0, 0, _("Child returned status %d"),
- WEXITSTATUS (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 */
#if MSDOS
spawnl (P_WAIT, getenv ("COMSPEC"), "-", 0);
#else /* not MSDOS */
- switch (fork ())
- {
- case -1:
- WARN ((0, errno, _("Cannot fork!")));
- break;
-
- case 0:
+ {
+ pid_t child = fork ();
+ switch (child)
{
- 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));
+ 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:
+ {
+ int wait_status;
+ while (waitpid (child, &wait_status, 0) == -1)
+ if (errno != EINTR)
+ {
+ ERROR ((0, errno,
+ _("While waiting for child")));
+ break;
+ }
+ }
+ break;
}
-
- default:
- {
- WAIT_T wait_status;
-
- wait (&wait_status);
- }
- break;
- }
-
- /* FIXME: I'm not sure if that's all that has to be done
- here. (jk) */
-
+ }
#endif /* not MSDOS */
break;
}