X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fsystem.c;h=612951bf98d72556dc7a581389feff13f07a73be;hb=f2bf9f2ffa06c0a89a799e64672f58a8e7d0efc7;hp=695f952502ad13f08dcaadbc428075430e35f1cd;hpb=ea019af0cc9a7609f128568c3b8b5c528cb6e1f3;p=chaz%2Ftar

diff --git a/src/system.c b/src/system.c
index 695f952..612951b 100644
--- a/src/system.c
+++ b/src/system.c
@@ -1,6 +1,6 @@
 /* System-dependent calls for tar.
 
-   Copyright (C) 2003, 2004 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 <system.h>
+#include <getline.h>
+#include <setenv.h>
 
 #include "common.h"
 #include <rmt.h>
@@ -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;
@@ -766,41 +768,68 @@ sys_wait_command (void)
 }
 
 int
-sys_exec_info_script (const char *archive_name, int volume_number)
+sys_exec_info_script (const char **archive_name, int volume_number)
 {
   pid_t pid;
   char *argv[4];
   char uintbuf[UINTMAX_STRSIZE_BOUND];
+  int p[2];
+
+  xpipe (p);
+  pipe_handler = signal (SIGPIPE, SIG_IGN);
 
   pid = xfork ();
 
   if (pid != 0)
     {
-      int status;
-      
       /* Master */
+
+      int rc;
+      int status;
+      char *buf;
+      size_t size = 0;
+      FILE *fp;
+
+      xclose (p[PWRITE]);
+      fp = fdopen (p[PREAD], "r");
+      rc = getline (&buf, &size, fp);
+      fclose (fp);
+
+      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))
-	return WEXITSTATUS (status);
-      
+	{
+	  if (WEXITSTATUS (status) == 0 && rc > 0)
+	    *archive_name = buf;
+	  else
+	    free (buf);
+	  return WEXITSTATUS (status);
+	}
+
+      free (buf);
       return -1;
     }
 
   /* Child */
   setenv ("TAR_VERSION", PACKAGE_VERSION, 1);
-  setenv ("TAR_ARCHIVE", archive_name, 1);
+  setenv ("TAR_ARCHIVE", *archive_name, 1);
   setenv ("TAR_VOLUME", STRINGIFY_BIGINT (volume_number, uintbuf), 1);
   setenv ("TAR_SUBCOMMAND", subcommand_string (subcommand_option), 1);
   setenv ("TAR_FORMAT",
 	  archive_format_string (current_format == DEFAULT_FORMAT ?
 				 archive_format : current_format), 1);
-  
+
+  xclose (p[PREAD]);
+  xdup2 (p[PWRITE], 3);
+
   argv[0] = "/bin/sh";
   argv[1] = "-c";
   argv[2] = (char*) info_script_option;