4 files changed, 52 insertions, 3 deletions

diff --git a/cgitrc.5.txt b/cgitrc.5.txtindex ba77826..4ad3e64 100644--- a/cgitrc.5.txt+++ b/cgitrc.5.txt@@ -407,8 +407,8 @@ side-by-side-diffs:: snapshots:: 	Text which specifies the default set of snapshot formats that cgit 	generates links for. The value is a space-separated list of zero or-	more of the values "tar", "tar.gz", "tar.bz2", "tar.xz" and "zip".-	The special value "all" enables all snapshot formats.+	more of the values "tar", "tar.gz", "tar.bz2", "tar.xz", "tar.lz" and+	"zip". The special value "all" enables all snapshot formats. 	Default value: none.  source-filter::
diff --git a/cgitrc.5.txt b/cgitrc.5.txt
index ba77826..4ad3e64 100644
--- a/cgitrc.5.txt
+++ b/cgitrc.5.txt
@@ -407,8 +407,8 @@ side-by-side-diffs::
 snapshots::
 	Text which specifies the default set of snapshot formats that cgit
 	generates links for. The value is a space-separated list of zero or
-	more of the values "tar", "tar.gz", "tar.bz2", "tar.xz" and "zip".
-	The special value "all" enables all snapshot formats.
+	more of the values "tar", "tar.gz", "tar.bz2", "tar.xz", "tar.lz" and
+	"zip". The special value "all" enables all snapshot formats.
 	Default value: none.
 
 source-filter::
diff --git a/tests/setup.sh b/tests/setup.shindex 7590f04..69e47e6 100755--- a/tests/setup.sh+++ b/tests/setup.sh@@ -104,7 +104,7 @@ virtual-root=/ cache-root=$PWD/cache  cache-size=1021-snapshots=tar.gz tar.bz zip+snapshots=tar.gz tar.bz tar.lz zip enable-log-filecount=1 enable-log-linecount=1 summary-log=5
diff --git a/tests/setup.sh b/tests/setup.sh
index 7590f04..69e47e6 100755
--- a/tests/setup.sh
+++ b/tests/setup.sh
@@ -104,7 +104,7 @@ virtual-root=/
 cache-root=$PWD/cache
 
 cache-size=1021
-snapshots=tar.gz tar.bz zip
+snapshots=tar.gz tar.bz tar.lz zip
 enable-log-filecount=1
 enable-log-linecount=1
 summary-log=5
diff --git a/tests/t0107-snapshot.sh b/tests/t0107-snapshot.shindex 6cf7aaa..a845ad9 100755--- a/tests/t0107-snapshot.sh+++ b/tests/t0107-snapshot.sh@@ -38,6 +38,48 @@ test_expect_success 'verify untarred file-5' ' 	test_line_count = 1 master/file-5 ' +if test -n "$(which lzip 2>/dev/null)"; then+	test_set_prereq LZIP+else+	say 'Skipping LZIP validation tests: lzip not found'+fi++test_expect_success LZIP 'get foo/snapshot/master.tar.lz' '+	cgit_url "foo/snapshot/master.tar.lz" >tmp+'++test_expect_success LZIP 'check html headers' '+	head -n 1 tmp |+	grep "Content-Type: application/x-lzip" &&++	head -n 2 tmp |+	grep "Content-Disposition: inline; filename=.master.tar.lz."+'++test_expect_success LZIP 'strip off the header lines' '+	strip_headers <tmp >master.tar.lz+'++test_expect_success LZIP 'verify lzip format' '+	lzip --test master.tar.lz &&+	cp master.tar.lz /tmp/.+'++test_expect_success LZIP 'untar' '+	rm -rf master &&+	tar --lzip -xf master.tar.lz+'++test_expect_success LZIP 'count files' '+	ls master/ >output &&+	test_line_count = 5 output+'++test_expect_success LZIP 'verify untarred file-5' '+	grep "^5$" master/file-5 &&+	test_line_count = 1 master/file-5+'+ test_expect_success 'get foo/snapshot/master.zip' ' 	cgit_url "foo/snapshot/master.zip" >tmp '
diff --git a/tests/t0107-snapshot.sh b/tests/t0107-snapshot.sh
index 6cf7aaa..a845ad9 100755
--- a/tests/t0107-snapshot.sh
+++ b/tests/t0107-snapshot.sh
@@ -38,6 +38,48 @@ test_expect_success 'verify untarred file-5' '
 	test_line_count = 1 master/file-5
 '
 
+if test -n "$(which lzip 2>/dev/null)"; then
+	test_set_prereq LZIP
+else
+	say 'Skipping LZIP validation tests: lzip not found'
+fi
+
+test_expect_success LZIP 'get foo/snapshot/master.tar.lz' '
+	cgit_url "foo/snapshot/master.tar.lz" >tmp
+'
+
+test_expect_success LZIP 'check html headers' '
+	head -n 1 tmp |
+	grep "Content-Type: application/x-lzip" &&
+
+	head -n 2 tmp |
+	grep "Content-Disposition: inline; filename=.master.tar.lz."
+'
+
+test_expect_success LZIP 'strip off the header lines' '
+	strip_headers <tmp >master.tar.lz
+'
+
+test_expect_success LZIP 'verify lzip format' '
+	lzip --test master.tar.lz &&
+	cp master.tar.lz /tmp/.
+'
+
+test_expect_success LZIP 'untar' '
+	rm -rf master &&
+	tar --lzip -xf master.tar.lz
+'
+
+test_expect_success LZIP 'count files' '
+	ls master/ >output &&
+	test_line_count = 5 output
+'
+
+test_expect_success LZIP 'verify untarred file-5' '
+	grep "^5$" master/file-5 &&
+	test_line_count = 1 master/file-5
+'
+
 test_expect_success 'get foo/snapshot/master.zip' '
 	cgit_url "foo/snapshot/master.zip" >tmp
 '
diff --git a/ui-snapshot.c b/ui-snapshot.cindex 9461d51..92cde42 100644--- a/ui-snapshot.c+++ b/ui-snapshot.c@@ -79,6 +79,12 @@ static int write_tar_bzip2_archive(const char *hex, const char *prefix) 	return write_compressed_tar_archive(hex, prefix, argv); } +static int write_tar_lzip_archive(const char *hex, const char *prefix)+{+	char *argv[] = { "lzip", NULL };+	return write_compressed_tar_archive(hex, prefix, argv);+}+ static int write_tar_xz_archive(const char *hex, const char *prefix) { 	char *argv[] = { "xz", NULL };@@ -90,6 +96,7 @@ const struct cgit_snapshot_format cgit_snapshot_formats[] = { 	{ ".tar",	"application/x-tar",	write_tar_archive	}, 	{ ".tar.gz",	"application/x-gzip",	write_tar_gzip_archive	}, 	{ ".tar.bz2",	"application/x-bzip2",	write_tar_bzip2_archive	},+	{ ".tar.lz",	"application/x-lzip",	write_tar_lzip_archive	}, 	{ ".tar.xz",	"application/x-xz",	write_tar_xz_archive	}, 	{ ".zip",	"application/x-zip",	write_zip_archive	}, 	{ NULL }
diff --git a/ui-snapshot.c b/ui-snapshot.c
index 9461d51..92cde42 100644
--- a/ui-snapshot.c
+++ b/ui-snapshot.c
@@ -79,6 +79,12 @@ static int write_tar_bzip2_archive(const char *hex, const char *prefix)
 	return write_compressed_tar_archive(hex, prefix, argv);
 }
 
+static int write_tar_lzip_archive(const char *hex, const char *prefix)
+{
+	char *argv[] = { "lzip", NULL };
+	return write_compressed_tar_archive(hex, prefix, argv);
+}
+
 static int write_tar_xz_archive(const char *hex, const char *prefix)
 {
 	char *argv[] = { "xz", NULL };
@@ -90,6 +96,7 @@ const struct cgit_snapshot_format cgit_snapshot_formats[] = {
 	{ ".tar",	"application/x-tar",	write_tar_archive	},
 	{ ".tar.gz",	"application/x-gzip",	write_tar_gzip_archive	},
 	{ ".tar.bz2",	"application/x-bzip2",	write_tar_bzip2_archive	},
+	{ ".tar.lz",	"application/x-lzip",	write_tar_lzip_archive	},
 	{ ".tar.xz",	"application/x-xz",	write_tar_xz_archive	},
 	{ ".zip",	"application/x-zip",	write_zip_archive	},
 	{ NULL }