snapshot: don't reimplement cgit_print_error_page()

[cgit.git] / ui-snapshot.c

diff --git a/ui-snapshot.c b/ui-snapshot.c
index 8e76977cf42d737cc8500395262a1e4ff94d27e7..f68e877fb2e5db33d20bf1bf3575fa9b57fa0558 100644 (file)
--- 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 (ends_with(filename, fmt->suffix))
                        return fmt;
        }
        return NULL;
@@ -119,16 +112,19 @@ static int make_snapshot(const struct cgit_snapshot_format *format,
        unsigned char sha1[20];
 
        if (get_sha1(hex, sha1)) {
-               cgit_print_error("Bad object id: %s", hex);
+               cgit_print_error_page(404, "Not found",
+                               "Bad object id: %s", hex);
                return 1;
        }
        if (!lookup_commit_reference(sha1)) {
-               cgit_print_error("Not a commit reference: %s", hex);
+               cgit_print_error_page(400, "Bad request",
+                               "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;
 }
@@ -140,8 +136,8 @@ static int make_snapshot(const struct cgit_snapshot_format *format,
  * repo_basename(), we strip the basename and any following '-' and '_'
  * characters ("cgit-0.7.2" -> "0.7.2") and check the resulting name once
  * more. If this still isn't a valid commit object name, we check if pre-
- * pending a 'v' to the remaining snapshot name ("0.7.2" -> "v0.7.2") gives
- * us something valid.
+ * pending a 'v' or a 'V' to the remaining snapshot name ("0.7.2" ->
+ * "v0.7.2") gives us something valid.
  */
 static const char *get_ref_from_filename(const char *url, const char *filename,
                                         const struct cgit_snapshot_format *format)
@@ -158,7 +154,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 == '_'))
@@ -173,6 +169,10 @@ static const char *get_ref_from_filename(const char *url, const char *filename,
        if (get_sha1(snapshot.buf, sha1) == 0)
                goto out;
 
+       strbuf_splice(&snapshot, 0, 1, "V", 1);
+       if (get_sha1(snapshot.buf, sha1) == 0)
+               goto out;
+
        result = 0;
        strbuf_release(&snapshot);
 
@@ -180,42 +180,29 @@ out:
        return result ? strbuf_detach(&snapshot, NULL) : NULL;
 }
 
-__attribute__((format (printf, 1, 2)))
-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);
-       va_start(ap, fmt);
-       cgit_vprint_error(fmt, ap);
-       va_end(ap);
-       cgit_print_docend();
-}
-
 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;
 
        if (!filename) {
-               show_error("No snapshot name specified");
+               cgit_print_error_page(400, "Bad request",
+                               "No snapshot name specified");
                return;
        }
 
        f = get_format(filename);
        if (!f) {
-               show_error("Unsupported snapshot format: %s", filename);
+               cgit_print_error_page(400, "Bad request",
+                               "Unsupported snapshot format: %s", filename);
                return;
        }
 
        if (!hex && dwim) {
                hex = get_ref_from_filename(ctx.repo->url, filename, f);
                if (hex == NULL) {
-                       html_status(404, "Not found", 0);
+                       cgit_print_error_page(404, "Not found", "Not found");
                        return;
                }
                prefix = xstrdup(filename);