X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/8bf4a0465e81da877e0c81620ae4ac9356145fc9..8eef4589d0ba80fd4e6a9ce2f3ca4fcf266a64e0:/ui-snapshot.c

diff --git a/ui-snapshot.c b/ui-snapshot.c
index 8a72080..cb34f4b 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)
@@ -16,7 +15,6 @@ static int write_archive_type(const char *format, const char *hex, const char *p
 {
 	struct argv_array argv = ARGV_ARRAY_INIT;
 	const char **nargv;
-	char *user_home, *xdg_home;
 	int result;
 	argv_array_push(&argv, "snapshot");
 	argv_array_push(&argv, format);
@@ -39,15 +37,7 @@ static int write_archive_type(const char *format, const char *hex, const char *p
 	/* argv_array guarantees a trailing NULL entry. */
 	memcpy(nargv, argv.argv, sizeof(char *) * (argv.argc + 1));
 
-	user_home = getenv("HOME");
-	xdg_home = getenv("XDG_CONFIG_HOME");
-	unsetenv("HOME");
-	unsetenv("XDG_CONFIG_HOME");
 	result = write_archive(argv.argc, nargv, NULL, 1, NULL, 0);
-	if (user_home)
-		setenv("HOME", user_home, 1);
-	if (xdg_home)
-		setenv("XDG_CONFIG_HOME", xdg_home, 1);
 	argv_array_clear(&argv);
 	free(nargv);
 	return result;
@@ -68,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;
 }
 
@@ -108,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 (ends_with(filename, fmt->suffix))
 			return fmt;
 	}
 	return NULL;
@@ -135,9 +119,10 @@ static int make_snapshot(const struct cgit_snapshot_format *format,
 		cgit_print_error("Not a commit reference: %s", hex);
 		return 1;
 	}
+	ctx.page.etag = sha1_to_hex(sha1);
 	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;
 }
@@ -167,7 +152,7 @@ static const char *get_ref_from_filename(const char *url, const char *filename,
 		goto out;
 
 	reponame = cgit_repobasename(url);
-	if (prefixcmp(snapshot.buf, reponame) == 0) {
+	if (starts_with(snapshot.buf, reponame)) {
 		const char *new_start = snapshot.buf;
 		new_start += strlen(reponame);
 		while (new_start && (*new_start == '-' || *new_start == '_'))
@@ -199,9 +184,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);
@@ -209,7 +194,7 @@ static void show_error(char *fmt, ...)
 }
 
 void cgit_print_snapshot(const char *head, const char *hex,
-			 const char *filename, int snapshots, int dwim)
+			 const char *filename, int dwim)
 {
 	const struct cgit_snapshot_format* f;
 	char *prefix = NULL;