X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/8c4c2c464b664228d4819af6ec1f8438af3c7c89..9999b0a3e915c76a52be433830660e803ef71cb0:/ui-snapshot.c

diff --git a/ui-snapshot.c b/ui-snapshot.c
index 42b7489..582dc31 100644
--- a/ui-snapshot.c
+++ b/ui-snapshot.c
@@ -1,7 +1,6 @@
 /* ui-snapshot.c: generate snapshot of a commit
  *
- * Copyright (C) 2006 Lars Hjemli
- * Copyright (C) 2012 Jason A. Donenfeld <Jason@zx2c4.com>
+ * Copyright (C) 2006-2014 cgit Development Team <cgit@lists.zx2c4.com>
  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)
@@ -59,13 +58,12 @@ static int write_compressed_tar_archive(const char *hex,
 					char *filter_argv[])
 {
 	int rv;
-	struct cgit_filter f;
+	struct cgit_exec_filter f;
+	cgit_exec_filter_init(&f, filter_argv[0], filter_argv);
 
-	f.cmd = filter_argv[0];
-	f.argv = filter_argv;
-	cgit_open_filter(&f);
+	cgit_open_filter(&f.base);
 	rv = write_tar_archive(hex, prefix);
-	cgit_close_filter(&f);
+	cgit_close_filter(&f.base);
 	return rv;
 }
 
@@ -99,14 +97,9 @@ const struct cgit_snapshot_format cgit_snapshot_formats[] = {
 static const struct cgit_snapshot_format *get_format(const char *filename)
 {
 	const struct cgit_snapshot_format *fmt;
-	int fl, sl;
 
-	fl = strlen(filename);
 	for (fmt = cgit_snapshot_formats; fmt->suffix; fmt++) {
-		sl = strlen(fmt->suffix);
-		if (sl >= fl)
-			continue;
-		if (!strcmp(fmt->suffix, filename + fl - sl))
+		if (!suffixcmp(filename, fmt->suffix))
 			return fmt;
 	}
 	return NULL;
@@ -128,7 +121,7 @@ static int make_snapshot(const struct cgit_snapshot_format *format,
 	}
 	ctx.page.mimetype = xstrdup(format->mimetype);
 	ctx.page.filename = xstrdup(filename);
-	cgit_print_http_headers(&ctx);
+	cgit_print_http_headers();
 	format->write_func(hex, prefix);
 	return 0;
 }
@@ -190,9 +183,9 @@ static void show_error(char *fmt, ...)
 	va_list ap;
 
 	ctx.page.mimetype = "text/html";
-	cgit_print_http_headers(&ctx);
-	cgit_print_docstart(&ctx);
-	cgit_print_pageheader(&ctx);
+	cgit_print_http_headers();
+	cgit_print_docstart();
+	cgit_print_pageheader();
 	va_start(ap, fmt);
 	cgit_vprint_error(fmt, ap);
 	va_end(ap);