X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=daemon%2Ftar.c;h=30085741c7f787e3a6439ff68472eb1d006caf88;hb=e315e0723ec8c2f84809f06d7f2ede4955dd6c67;hp=ecf919db19fba0a3ab5912f04b874f9f03ea7d2a;hpb=0232e722826cfda0f6042da983f9eb871f24e946;p=libguestfs.git

diff --git a/daemon/tar.c b/daemon/tar.c
index ecf919d..3008574 100644
--- a/daemon/tar.c
+++ b/daemon/tar.c
@@ -1,5 +1,5 @@
 /* libguestfs - the guestfsd daemon
- * Copyright (C) 2009 Red Hat Inc. 
+ * Copyright (C) 2009 Red Hat 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
@@ -36,7 +36,7 @@ fwrite_cb (void *fp_ptr, const void *buf, int len)
 
 /* Has one FileIn parameter. */
 int
-do_tar_in (const char *dir)
+do_tar_in (char *dir)
 {
   int err, r, len;
   FILE *fp;
@@ -49,7 +49,7 @@ do_tar_in (const char *dir)
   }
 
   /* "tar -C /sysroot%s -xf -" but we have to quote the dir. */
-  len = 2 * strlen (dir) + 32;
+  len = 2 * strlen (dir) + sysroot_len + 32;
   cmd = malloc (len);
   if (!cmd) {
     err = errno;
@@ -58,7 +58,8 @@ do_tar_in (const char *dir)
     reply_with_perror ("malloc");
     return -1;
   }
-  strcpy (cmd, "tar -C /sysroot");
+  strcpy (cmd, "tar -C ");
+  strcat (cmd, sysroot);
   shell_quote (cmd+15, len-15, dir);
   strcat (cmd, " -xf -");
 
@@ -68,8 +69,10 @@ do_tar_in (const char *dir)
     cancel_receive ();
     errno = err;
     reply_with_perror ("%s", cmd);
+    free (cmd);
     return -1;
   }
+  free (cmd);
 
   r = receive_file (fwrite_cb, &fp);
   if (r == -1) {		/* write error */
@@ -86,7 +89,7 @@ do_tar_in (const char *dir)
     return -1;
   }
 
-  if (pclose (fp) == -1) {
+  if (pclose (fp) != 0) {
     err = errno;
     cancel_receive ();
     errno = err;
@@ -99,7 +102,7 @@ do_tar_in (const char *dir)
 
 /* Has one FileOut parameter. */
 int
-do_tar_out (const char *dir)
+do_tar_out (char *dir)
 {
   int r, len;
   FILE *fp;
@@ -110,21 +113,24 @@ do_tar_out (const char *dir)
   ABS_PATH (dir, -1);
 
   /* "tar -C /sysroot%s -cf - ." but we have to quote the dir. */
-  len = 2 * strlen (dir) + 32;
+  len = 2 * strlen (dir) + sysroot_len + 32;
   cmd = malloc (len);
   if (!cmd) {
     reply_with_perror ("malloc");
     return -1;
   }
-  strcpy (cmd, "tar -C /sysroot");
+  strcpy (cmd, "tar -C ");
+  strcat (cmd, sysroot);
   shell_quote (cmd+15, len-15, dir);
   strcat (cmd, " -cf - .");
 
   fp = popen (cmd, "r");
   if (fp == NULL) {
     reply_with_perror ("%s", cmd);
+    free (cmd);
     return -1;
   }
+  free (cmd);
 
   /* Now we must send the reply message, before the file contents.  After
    * this there is no opportunity in the protocol to send any error
@@ -139,14 +145,14 @@ do_tar_out (const char *dir)
     }
   }
 
-  if (r == -1) {
+  if (ferror (fp)) {
     perror (dir);
     send_file_end (1);		/* Cancel. */
     pclose (fp);
     return -1;
   }
 
-  if (pclose (fp) == -1) {
+  if (pclose (fp) != 0) {
     perror (dir);
     send_file_end (1);		/* Cancel. */
     return -1;
@@ -158,7 +164,7 @@ do_tar_out (const char *dir)
 
 /* Has one FileIn parameter. */
 int
-do_tgz_in (const char *dir)
+do_tgz_in (char *dir)
 {
   int err, r, len;
   FILE *fp;
@@ -171,7 +177,7 @@ do_tgz_in (const char *dir)
   }
 
   /* "tar -C /sysroot%s -zxf -" but we have to quote the dir. */
-  len = 2 * strlen (dir) + 32;
+  len = 2 * strlen (dir) + sysroot_len + 32;
   cmd = malloc (len);
   if (!cmd) {
     err = errno;
@@ -180,7 +186,8 @@ do_tgz_in (const char *dir)
     reply_with_perror ("malloc");
     return -1;
   }
-  strcpy (cmd, "tar -C /sysroot");
+  strcpy (cmd, "tar -C ");
+  strcat (cmd, sysroot);
   shell_quote (cmd+15, len-15, dir);
   strcat (cmd, " -zxf -");
 
@@ -190,8 +197,10 @@ do_tgz_in (const char *dir)
     cancel_receive ();
     errno = err;
     reply_with_perror ("%s", cmd);
+    free (cmd);
     return -1;
   }
+  free (cmd);
 
   r = receive_file (fwrite_cb, &fp);
   if (r == -1) {		/* write error */
@@ -208,7 +217,7 @@ do_tgz_in (const char *dir)
     return -1;
   }
 
-  if (pclose (fp) == -1) {
+  if (pclose (fp) != 0) {
     err = errno;
     cancel_receive ();
     errno = err;
@@ -221,7 +230,7 @@ do_tgz_in (const char *dir)
 
 /* Has one FileOut parameter. */
 int
-do_tgz_out (const char *dir)
+do_tgz_out (char *dir)
 {
   int r, len;
   FILE *fp;
@@ -232,21 +241,24 @@ do_tgz_out (const char *dir)
   ABS_PATH (dir, -1);
 
   /* "tar -C /sysroot%s -zcf - ." but we have to quote the dir. */
-  len = 2 * strlen (dir) + 32;
+  len = 2 * strlen (dir) + sysroot_len + 32;
   cmd = malloc (len);
   if (!cmd) {
     reply_with_perror ("malloc");
     return -1;
   }
-  strcpy (cmd, "tar -C /sysroot");
+  strcpy (cmd, "tar -C ");
+  strcat (cmd, sysroot);
   shell_quote (cmd+15, len-15, dir);
   strcat (cmd, " -zcf - .");
 
   fp = popen (cmd, "r");
   if (fp == NULL) {
     reply_with_perror ("%s", cmd);
+    free (cmd);
     return -1;
   }
+  free (cmd);
 
   /* Now we must send the reply message, before the file contents.  After
    * this there is no opportunity in the protocol to send any error
@@ -261,14 +273,14 @@ do_tgz_out (const char *dir)
     }
   }
 
-  if (r == -1) {
+  if (ferror (fp)) {
     perror (dir);
     send_file_end (1);		/* Cancel. */
     pclose (fp);
     return -1;
   }
 
-  if (pclose (fp) == -1) {
+  if (pclose (fp) != 0) {
     perror (dir);
     send_file_end (1);		/* Cancel. */
     return -1;