X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fsystem.c;h=612951bf98d72556dc7a581389feff13f07a73be;hb=d75890c1b8bfbab65c32eff6a264766579208ba1;hp=63f9849cf9a027f956e811a23398face0e7f6ac8;hpb=4ba3b41e2e83cd33b7e4ac401fdc5d75c7b401f1;p=chaz%2Ftar diff --git a/src/system.c b/src/system.c index 63f9849..612951b 100644 --- a/src/system.c +++ b/src/system.c @@ -1,6 +1,6 @@ /* System-dependent calls for tar. - Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the @@ -17,6 +17,8 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #include +#include +#include #include "common.h" #include @@ -349,7 +351,7 @@ sys_child_open_for_compress (void) if (archive < 0) { int saved_errno = errno; - + if (backup_option) undo_last_backup (); errno = saved_errno; @@ -772,7 +774,7 @@ sys_exec_info_script (const char **archive_name, int volume_number) char *argv[4]; char uintbuf[UINTMAX_STRSIZE_BOUND]; int p[2]; - + xpipe (p); pipe_handler = signal (SIGPIPE, SIG_IGN); @@ -787,7 +789,7 @@ sys_exec_info_script (const char **archive_name, int volume_number) char *buf; size_t size = 0; FILE *fp; - + xclose (p[PWRITE]); fp = fdopen (p[PREAD], "r"); rc = getline (&buf, &size, fp); @@ -795,14 +797,14 @@ sys_exec_info_script (const char **archive_name, int volume_number) if (rc > 0 && buf[rc-1] == '\n') buf[--rc] = 0; - + while (waitpid (pid, &status, 0) == -1) if (errno != EINTR) { waitpid_error (info_script_option); return -1; } - + if (WIFEXITED (status)) { if (WEXITSTATUS (status) == 0 && rc > 0) @@ -811,7 +813,7 @@ sys_exec_info_script (const char **archive_name, int volume_number) free (buf); return WEXITSTATUS (status); } - + free (buf); return -1; }