Replace shell_quote function with %Q and %R printf specifiers.

[libguestfs.git] / daemon / tar.c

diff --git a/daemon/tar.c b/daemon/tar.c
index ecf919d..39b983c 100644 (file)
--- 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,9 +36,9 @@ 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;
+  int err, r;
   FILE *fp;
   char *cmd;
 
@@ -49,18 +49,16 @@ do_tar_in (const char *dir)
   }
 
   /* "tar -C /sysroot%s -xf -" but we have to quote the dir. */
-  len = 2 * strlen (dir) + 32;
-  cmd = malloc (len);
-  if (!cmd) {
+  if (asprintf_nowarn (&cmd, "tar -C %R -xf -", dir) == -1) {
     err = errno;
     cancel_receive ();
     errno = err;
-    reply_with_perror ("malloc");
+    reply_with_perror ("asprintf");
     return -1;
   }
-  strcpy (cmd, "tar -C /sysroot");
-  shell_quote (cmd+15, len-15, dir);
-  strcat (cmd, " -xf -");
+
+  if (verbose)
+    fprintf (stderr, "%s\n", cmd);
 
   fp = popen (cmd, "w");
   if (fp == NULL) {
@@ -68,8 +66,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 +86,7 @@ do_tar_in (const char *dir)
     return -1;
   }
 
-  if (pclose (fp) == -1) {
+  if (pclose (fp) != 0) {
     err = errno;
     cancel_receive ();
     errno = err;
@@ -99,9 +99,9 @@ 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;
+  int r;
   FILE *fp;
   char *cmd;
   char buf[GUESTFS_MAX_CHUNK_SIZE];
@@ -110,21 +110,21 @@ 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;
-  cmd = malloc (len);
-  if (!cmd) {
-    reply_with_perror ("malloc");
+  if (asprintf_nowarn (&cmd, "tar -C %R -cf - .", dir) == -1) {
+    reply_with_perror ("asprintf");
     return -1;
   }
-  strcpy (cmd, "tar -C /sysroot");
-  shell_quote (cmd+15, len-15, dir);
-  strcat (cmd, " -cf - .");
+
+  if (verbose)
+    fprintf (stderr, "%s\n", cmd);
 
   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 +139,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,9 +158,9 @@ 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;
+  int err, r;
   FILE *fp;
   char *cmd;
 
@@ -171,18 +171,16 @@ do_tgz_in (const char *dir)
   }
 
   /* "tar -C /sysroot%s -zxf -" but we have to quote the dir. */
-  len = 2 * strlen (dir) + 32;
-  cmd = malloc (len);
-  if (!cmd) {
+  if (asprintf_nowarn (&cmd, "tar -C %R -zxf -", dir) == -1) {
     err = errno;
     cancel_receive ();
     errno = err;
-    reply_with_perror ("malloc");
+    reply_with_perror ("asprintf");
     return -1;
   }
-  strcpy (cmd, "tar -C /sysroot");
-  shell_quote (cmd+15, len-15, dir);
-  strcat (cmd, " -zxf -");
+
+  if (verbose)
+    fprintf (stderr, "%s\n", cmd);
 
   fp = popen (cmd, "w");
   if (fp == NULL) {
@@ -190,8 +188,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 +208,7 @@ do_tgz_in (const char *dir)
     return -1;
   }
 
-  if (pclose (fp) == -1) {
+  if (pclose (fp) != 0) {
     err = errno;
     cancel_receive ();
     errno = err;
@@ -221,9 +221,9 @@ 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;
+  int r;
   FILE *fp;
   char *cmd;
   char buf[GUESTFS_MAX_CHUNK_SIZE];
@@ -232,21 +232,21 @@ 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;
-  cmd = malloc (len);
-  if (!cmd) {
-    reply_with_perror ("malloc");
+  if (asprintf_nowarn (&cmd, "tar -C %R -zcf - .", dir) == -1) {
+    reply_with_perror ("asprintf");
     return -1;
   }
-  strcpy (cmd, "tar -C /sysroot");
-  shell_quote (cmd+15, len-15, dir);
-  strcat (cmd, " -zcf - .");
+
+  if (verbose)
+    fprintf (stderr, "%s\n", cmd);
 
   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 +261,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;