/* 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
#include "actions.h"
static int
-fwrite_cb (void *fp_ptr, const void *buf, int len)
+write_cb (void *fd_ptr, const void *buf, size_t len)
{
- FILE *fp = *(FILE **)fp_ptr;
- return fwrite (buf, len, 1, fp) == 1 ? 0 : -1;
+ int fd = *(int *)fd_ptr;
+ return xwrite (fd, buf, len);
}
/* Has one FileIn parameter. */
int
-do_tar_in (char *dir)
+do_tar_in (const char *dir)
{
- int err, r, len;
+ int err, r;
FILE *fp;
char *cmd;
if (!root_mounted || dir[0] != '/') {
cancel_receive ();
- reply_with_error ("tar-in: root must be mounted and path must be absolute");
+ reply_with_error ("root must be mounted and path must be absolute");
return -1;
}
/* "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) {
}
free (cmd);
- r = receive_file (fwrite_cb, &fp);
+ /* The semantics of fwrite are too undefined, so write to the
+ * file descriptor directly instead.
+ */
+ int fd = fileno (fp);
+
+ r = receive_file (write_cb, &fd);
if (r == -1) { /* write error */
- err = errno;
cancel_receive ();
- errno = err;
- reply_with_perror ("write: %s", dir);
+ reply_with_error ("write error on directory: %s", dir);
pclose (fp);
return -1;
}
return -1;
}
- if (pclose (fp) == -1) {
- err = errno;
- cancel_receive ();
- errno = err;
- reply_with_perror ("pclose: %s", dir);
+ if (pclose (fp) != 0) {
+ if (r == -1) /* if r == 0, file transfer ended already */
+ cancel_receive ();
+ reply_with_error ("tar subcommand failed on directory: %s", dir);
return -1;
}
/* Has one FileOut parameter. */
int
-do_tar_out (char *dir)
+do_tar_out (const char *dir)
{
- int r, len;
+ int r;
FILE *fp;
char *cmd;
char buf[GUESTFS_MAX_CHUNK_SIZE];
- NEED_ROOT (-1);
- 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) {
return -1;
}
- if (pclose (fp) == -1) {
+ if (pclose (fp) != 0) {
perror (dir);
send_file_end (1); /* Cancel. */
return -1;
}
- send_file_end (0); /* Normal end of file. */
+ if (send_file_end (0)) /* Normal end of file. */
+ return -1;
+
return 0;
}
/* Has one FileIn parameter. */
-int
-do_tgz_in (char *dir)
+static int
+do_tXz_in (const char *dir, char filter)
{
- int err, r, len;
+ int err, r;
FILE *fp;
char *cmd;
if (!root_mounted || dir[0] != '/') {
cancel_receive ();
- reply_with_error ("tar-in: root must be mounted and path must be absolute");
+ reply_with_error ("root must be mounted and path must be absolute");
return -1;
}
/* "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 -%cxf -", dir, filter) == -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) {
}
free (cmd);
- r = receive_file (fwrite_cb, &fp);
+ int fd = fileno (fp);
+
+ r = receive_file (write_cb, &fd);
if (r == -1) { /* write error */
- err = errno;
cancel_receive ();
- errno = err;
- reply_with_perror ("write: %s", dir);
+ reply_with_error ("write error on directory: %s", dir);
pclose (fp);
return -1;
}
return -1;
}
- if (pclose (fp) == -1) {
- err = errno;
- cancel_receive ();
- errno = err;
- reply_with_perror ("pclose: %s", dir);
+ if (pclose (fp) != 0) {
+ if (r == -1) /* if r == 0, file transfer ended already */
+ cancel_receive ();
+ reply_with_error ("tar subcommand failed on directory: %s", dir);
return -1;
}
return 0;
}
-/* Has one FileOut parameter. */
+/* Has one FileIn parameter. */
int
-do_tgz_out (char *dir)
+do_tgz_in (const char *dir)
{
- int r, len;
+ return do_tXz_in (dir, 'z');
+}
+
+/* Has one FileIn parameter. */
+int
+do_txz_in (const char *dir)
+{
+ return do_tXz_in (dir, 'J');
+}
+
+/* Has one FileOut parameter. */
+static int
+do_tXz_out (const char *dir, char filter)
+{
+ int r;
FILE *fp;
char *cmd;
char buf[GUESTFS_MAX_CHUNK_SIZE];
- NEED_ROOT (-1);
- 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 -%ccf - .", dir, filter) == -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) {
return -1;
}
- if (pclose (fp) == -1) {
+ if (pclose (fp) != 0) {
perror (dir);
send_file_end (1); /* Cancel. */
return -1;
}
- send_file_end (0); /* Normal end of file. */
+ if (send_file_end (0)) /* Normal end of file. */
+ return -1;
+
return 0;
}
+
+/* Has one FileOut parameter. */
+int
+do_tgz_out (const char *dir)
+{
+ return do_tXz_out (dir, 'z');
+}
+
+/* Has one FileOut parameter. */
+int
+do_txz_out (const char *dir)
+{
+ return do_tXz_out (dir, 'J');
+}
git.annexia.org / libguestfs.git / blobdiff