From 50195d6ec4e893f894ef1bbf7af6eeda56f96600 Mon Sep 17 00:00:00 2001 From: Richard Jones Date: Thu, 8 Apr 2010 16:07:32 +0100 Subject: [PATCH] New API calls to upload/download txz files (RHBZ#580556). --- appliance/packagelist.in | 2 ++ daemon/tar.c | 40 ++++++++++++++++++++++++++++++++++------ images/Makefile.am | 2 ++ images/helloworld.tar.xz | Bin 0 -> 216 bytes src/MAX_PROC_NR | 2 +- src/generator.ml | 22 ++++++++++++++++++++-- 6 files changed, 59 insertions(+), 9 deletions(-) create mode 100644 images/helloworld.tar.xz diff --git a/appliance/packagelist.in b/appliance/packagelist.in index c8674b1..842531f 100644 --- a/appliance/packagelist.in +++ b/appliance/packagelist.in @@ -27,6 +27,7 @@ udev util-linux-ng vim-minimal + xz #elif DEBIAN == 1 bsdmainutils btrfs-tools @@ -42,6 +43,7 @@ udev util-linux vim-tiny + xz-utils #endif bash diff --git a/daemon/tar.c b/daemon/tar.c index 8088606..5b73599 100644 --- a/daemon/tar.c +++ b/daemon/tar.c @@ -158,8 +158,8 @@ do_tar_out (const char *dir) } /* Has one FileIn parameter. */ -int -do_tgz_in (const char *dir) +static int +do_tXz_in (const char *dir, char filter) { int err, r; FILE *fp; @@ -172,7 +172,7 @@ do_tgz_in (const char *dir) } /* "tar -C /sysroot%s -zxf -" but we have to quote the dir. */ - if (asprintf_nowarn (&cmd, "tar -C %R -zxf -", dir) == -1) { + if (asprintf_nowarn (&cmd, "tar -C %R -%cxf -", dir, filter) == -1) { err = errno; cancel_receive (); errno = err; @@ -219,9 +219,23 @@ do_tgz_in (const char *dir) return 0; } -/* Has one FileOut parameter. */ +/* Has one FileIn parameter. */ int -do_tgz_out (const char *dir) +do_tgz_in (const char *dir) +{ + 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; @@ -229,7 +243,7 @@ do_tgz_out (const char *dir) 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 -zcf - .", dir) == -1) { + if (asprintf_nowarn (&cmd, "tar -C %R -%ccf - .", dir, filter) == -1) { reply_with_perror ("asprintf"); return -1; } @@ -276,3 +290,17 @@ do_tgz_out (const char *dir) 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'); +} diff --git a/images/Makefile.am b/images/Makefile.am index c30d8c4..ff8d46f 100644 --- a/images/Makefile.am +++ b/images/Makefile.am @@ -23,6 +23,7 @@ builddir ?= $(top_builddir)/images EXTRA_DIST = \ helloworld.tar \ helloworld.tar.gz \ + helloworld.tar.xz \ mbr-ext2-empty.img.gz \ empty known-1 known-2 known-3 known-4 known-5 \ bin-i586-dynamic \ @@ -47,6 +48,7 @@ CLEANFILES = \ images_files_src = \ $(srcdir)/helloworld.tar \ $(srcdir)/helloworld.tar.gz \ + $(srcdir)/helloworld.tar.xz \ $(srcdir)/empty \ $(srcdir)/known-1 \ $(srcdir)/known-2 \ diff --git a/images/helloworld.tar.xz b/images/helloworld.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..661f1a2040ce1e1c14ba66c116396ff9a9fa44cc GIT binary patch literal 216 zcmV;}04M+bH+ooF000E$*0e?f03iVu0001VFXf})C;tGIT>uvgyc~T2mB2AXZa;hR zESy+gjJ3o%+Nmlw^h$dA>=@fb>J-!Wr`}Wz(TZ{xK%Hk^g?V7STc~r z2j_3dx-_I!Vwi~njnu0`0000IR#Fyj3bvmB0kHvqPyhfn SrADr?#Ao{g000001X)_=o?hkv literal 0 HcmV?d00001 diff --git a/src/MAX_PROC_NR b/src/MAX_PROC_NR index 9be0dc9..dcb6b5b 100644 --- a/src/MAX_PROC_NR +++ b/src/MAX_PROC_NR @@ -1 +1 @@ -228 +230 diff --git a/src/generator.ml b/src/generator.ml index 416a66f..9d19097 100755 --- a/src/generator.ml +++ b/src/generator.ml @@ -2025,7 +2025,8 @@ The checksum is returned as a printable string."); This command uploads and unpacks local file C (an I tar file) into C. -To upload a compressed tarball, use C."); +To upload a compressed tarball, use C +or C."); ("tar_out", (RErr, [String "directory"; FileOut "tarfile"]), 70, [], [], @@ -2034,7 +2035,8 @@ To upload a compressed tarball, use C."); This command packs the contents of C and downloads it to local file C. -To download a compressed tarball, use C."); +To download a compressed tarball, use C +or C."); ("tgz_in", (RErr, [FileIn "tarball"; String "directory"]), 71, [], [InitBasicFS, Always, TestOutput ( @@ -4355,6 +4357,22 @@ This command writes zeroes over the entire C. Compare with C which just zeroes the first few blocks of a device."); + ("txz_in", (RErr, [FileIn "tarball"; String "directory"]), 229, [], + [InitBasicFS, Always, TestOutput ( + [["txz_in"; "../images/helloworld.tar.xz"; "/"]; + ["cat"; "/hello"]], "hello\n")], + "unpack compressed tarball to directory", + "\ +This command uploads and unpacks local file C (an +I tar file) into C."); + + ("txz_out", (RErr, [Pathname "directory"; FileOut "tarball"]), 230, [], + [], + "pack directory into compressed tarball", + "\ +This command packs the contents of C and downloads +it to local file C (as an xz compressed tar archive)."); + ] let all_functions = non_daemon_functions @ daemon_functions -- 1.8.3.1