X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=daemon%2Ftar.c;h=ce3ca7862e74b3e01648b2683e9ce772004fd0da;hp=26a0d302136cad8a3d896e8a13270ef3c2a77f53;hb=53ca11ee44f71ed056f72df9769ca93b9a35e1a7;hpb=5922d7084d6b43f0a1a15b664c7082dfeaf584d0 diff --git a/daemon/tar.c b/daemon/tar.c index 26a0d30..ce3ca78 100644 --- a/daemon/tar.c +++ b/daemon/tar.c @@ -23,9 +23,47 @@ #include #include +#include "read-file.h" + #include "../src/guestfs_protocol.h" #include "daemon.h" #include "actions.h" +#include "optgroups.h" + +int +optgroup_xz_available (void) +{ + int r = access ("/usr/bin/xz", X_OK); + return r == 0; +} + +/* Redirect errors from the tar command to the error file, then + * provide functions for reading it in. We overwrite the file each + * time, and since it's small and stored on the appliance we don't + * bother to delete it. + */ +static const char *error_file = "/tmp/error"; + +static char * +read_error_file (void) +{ + size_t len; + char *str = read_file (error_file, &len); + if (str == NULL) { + str = strdup ("(no error)"); + if (str == NULL) { + perror ("strdup"); + exit (EXIT_FAILURE); + } + len = strlen (str); + } + + /* Remove trailing \n character if any. */ + if (len > 0 && str[len-1] == '\n') + str[--len] = '\0'; + + return str; /* caller frees */ +} static int write_cb (void *fd_ptr, const void *buf, size_t len) @@ -35,19 +73,20 @@ write_cb (void *fd_ptr, const void *buf, size_t len) } /* Has one FileIn parameter. */ -int -do_tar_in (const char *dir) +static int +do_tXz_in (const char *dir, const char *filter) { int err, r; FILE *fp; char *cmd; /* "tar -C /sysroot%s -xf -" but we have to quote the dir. */ - if (asprintf_nowarn (&cmd, "tar -C %R -xf -", dir) == -1) { + if (asprintf_nowarn (&cmd, "tar -C %R -%sxf - 2> %s", + dir, filter, error_file) == -1) { err = errno; - cancel_receive (); + r = cancel_receive (); errno = err; - reply_with_perror ("asprintf"); + if (r != -2) reply_with_perror ("asprintf"); return -1; } @@ -57,9 +96,9 @@ do_tar_in (const char *dir) fp = popen (cmd, "w"); if (fp == NULL) { err = errno; - cancel_receive (); + r = cancel_receive (); errno = err; - reply_with_perror ("%s", cmd); + if (r != -2) reply_with_perror ("%s", cmd); free (cmd); return -1; } @@ -72,8 +111,11 @@ do_tar_in (const char *dir) r = receive_file (write_cb, &fd); if (r == -1) { /* write error */ - cancel_receive (); - reply_with_error ("write error on directory: %s", dir); + if (cancel_receive () != -2) { + char *errstr = read_error_file (); + reply_with_error ("write error on directory: %s: %s", dir, errstr); + free (errstr); + } pclose (fp); return -1; } @@ -85,145 +127,43 @@ do_tar_in (const char *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. */ -int -do_tar_out (const char *dir) -{ - int r; - FILE *fp; - char *cmd; - char buf[GUESTFS_MAX_CHUNK_SIZE]; - - /* "tar -C /sysroot%s -cf - ." but we have to quote the dir. */ - if (asprintf_nowarn (&cmd, "tar -C %R -cf - .", dir) == -1) { - reply_with_perror ("asprintf"); - return -1; - } - - 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 - * message back. Instead we can only cancel the transfer. - */ - reply (NULL, NULL); - - while ((r = fread (buf, 1, sizeof buf, fp)) > 0) { - if (send_file_write (buf, r) < 0) { - pclose (fp); - return -1; + r = cancel_receive (); + if (r != -2) { + char *errstr = read_error_file (); + reply_with_error ("tar subcommand failed on directory: %s: %s", + dir, errstr); + free (errstr); } - } - - if (ferror (fp)) { - perror (dir); - send_file_end (1); /* Cancel. */ - pclose (fp); - return -1; - } - - if (pclose (fp) != 0) { - perror (dir); - send_file_end (1); /* Cancel. */ return -1; } - if (send_file_end (0)) /* Normal end of file. */ - return -1; - return 0; } /* Has one FileIn parameter. */ -static int -do_tXz_in (const char *dir, char filter) +int +do_tar_in (const char *dir) { - int err, r; - FILE *fp; - char *cmd; - - /* "tar -C /sysroot%s -zxf -" but we have to quote the dir. */ - if (asprintf_nowarn (&cmd, "tar -C %R -%cxf -", dir, filter) == -1) { - err = errno; - cancel_receive (); - errno = err; - reply_with_perror ("asprintf"); - return -1; - } - - if (verbose) - fprintf (stderr, "%s\n", cmd); - - fp = popen (cmd, "w"); - if (fp == NULL) { - err = errno; - cancel_receive (); - errno = err; - reply_with_perror ("%s", cmd); - free (cmd); - return -1; - } - free (cmd); - - int fd = fileno (fp); - - r = receive_file (write_cb, &fd); - if (r == -1) { /* write error */ - cancel_receive (); - reply_with_error ("write error on directory: %s", dir); - pclose (fp); - return -1; - } - if (r == -2) { /* cancellation from library */ - pclose (fp); - /* Do NOT send any error. */ - return -1; - } - - 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; + return do_tXz_in (dir, ""); } /* Has one FileIn parameter. */ int do_tgz_in (const char *dir) { - return do_tXz_in (dir, 'z'); + return do_tXz_in (dir, "z"); } /* Has one FileIn parameter. */ int do_txz_in (const char *dir) { - return do_tXz_in (dir, 'J'); + return do_tXz_in (dir, "J"); } /* Has one FileOut parameter. */ static int -do_tXz_out (const char *dir, char filter) +do_tXz_out (const char *dir, const char *filter) { int r; FILE *fp; @@ -231,7 +171,7 @@ do_tXz_out (const char *dir, char filter) char buf[GUESTFS_MAX_CHUNK_SIZE]; /* "tar -C /sysroot%s -zcf - ." but we have to quote the dir. */ - if (asprintf_nowarn (&cmd, "tar -C %R -%ccf - .", dir, filter) == -1) { + if (asprintf_nowarn (&cmd, "tar -C %R -%scf - .", dir, filter) == -1) { reply_with_perror ("asprintf"); return -1; } @@ -281,14 +221,21 @@ do_tXz_out (const char *dir, char filter) /* Has one FileOut parameter. */ int +do_tar_out (const char *dir) +{ + return do_tXz_out (dir, ""); +} + +/* Has one FileOut parameter. */ +int do_tgz_out (const char *dir) { - return do_tXz_out (dir, 'z'); + return do_tXz_out (dir, "z"); } /* Has one FileOut parameter. */ int do_txz_out (const char *dir) { - return do_tXz_out (dir, 'J'); + return do_tXz_out (dir, "J"); }