X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=daemon%2Ftar.c;h=4d9feaa0d094e42c528491efaaa0601ca626a451;hb=f339cb33703fc1b561d9956c29c4eb0e57334a91;hp=a33ec3a0a6a2a11dec1494e933655d9b41e3263c;hpb=a30f66436eac79b9e532e448882d03375c0d5e78;p=libguestfs.git diff --git a/daemon/tar.c b/daemon/tar.c index a33ec3a..4d9feaa 100644 --- a/daemon/tar.c +++ b/daemon/tar.c @@ -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; @@ -68,8 +68,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 */ @@ -99,7 +101,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; @@ -123,8 +125,10 @@ do_tar_out (const char *dir) 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 @@ -158,7 +162,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; @@ -190,8 +194,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 */ @@ -221,7 +227,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; @@ -245,8 +251,10 @@ do_tgz_out (const char *dir) 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