/* libguestfs - the guestfsd daemon
- * Copyright (C) 2009 Red Hat Inc.
+ * Copyright (C) 2009-2011 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
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
int
optgroup_xz_available (void)
{
- int r = access ("/usr/bin/xz", X_OK);
- return r == 0;
+ return prog_exists ("xz");
}
-/* 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";
-
+/* Read the error file. Returns a string that the caller must free. */
static char *
-read_error_file (void)
+read_error_file (char *error_file)
{
size_t len;
- char *str = read_file (error_file, &len);
+ char *str;
+
+ str = read_file (error_file, &len);
if (str == NULL) {
str = strdup ("(no error)");
if (str == NULL) {
int err, r;
FILE *fp;
char *cmd;
+ char error_file[] = "/tmp/tarXXXXXX";
+ int fd;
+
+ fd = mkstemp (error_file);
+ if (fd == -1) {
+ reply_with_perror ("mkstemp");
+ return -1;
+ }
+
+ close (fd);
/* "tar -C /sysroot%s -xf -" but we have to quote the dir. */
if (asprintf_nowarn (&cmd, "tar -C %R -%sxf - 2> %s",
err = errno;
r = cancel_receive ();
errno = err;
- if (r != -2) reply_with_perror ("asprintf");
+ reply_with_perror ("asprintf");
+ unlink (error_file);
return -1;
}
err = errno;
r = cancel_receive ();
errno = err;
- if (r != -2) reply_with_perror ("%s", cmd);
+ reply_with_perror ("%s", cmd);
+ unlink (error_file);
free (cmd);
return -1;
}
/* The semantics of fwrite are too undefined, so write to the
* file descriptor directly instead.
*/
- int fd = fileno (fp);
+ fd = fileno (fp);
r = receive_file (write_cb, &fd);
if (r == -1) { /* write error */
- if (cancel_receive () != -2) {
- char *errstr = read_error_file ();
- reply_with_error ("write error on directory: %s: %s", dir, errstr);
- free (errstr);
- }
+ cancel_receive ();
+ char *errstr = read_error_file (error_file);
+ reply_with_error ("write error on directory: %s: %s", dir, errstr);
+ free (errstr);
+ unlink (error_file);
pclose (fp);
return -1;
}
if (r == -2) { /* cancellation from library */
+ /* This error is ignored by the library since it initiated the
+ * cancel. Nevertheless we must send an error reply here.
+ */
+ reply_with_error ("file upload cancelled");
pclose (fp);
- /* Do NOT send any error. */
+ unlink (error_file);
return -1;
}
if (pclose (fp) != 0) {
- if (r == -1) /* if r == 0, file transfer ended already */
- 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);
- }
+ char *errstr = read_error_file (error_file);
+ reply_with_error ("tar subcommand failed on directory: %s: %s",
+ dir, errstr);
+ free (errstr);
+ unlink (error_file);
return -1;
}
+ unlink (error_file);
+
return 0;
}