Update .mailmap with my new email address

[ps-cgit] / ui-snapshot.c

diff --git a/ui-snapshot.c b/ui-snapshot.c
index 8a720801004cca005287c2f9457340da8703ef81..9b8cddd4c6b96cac7c8ea50f366d666e5502ec6e 100644 (file)
--- a/ui-snapshot.c
+++ b/ui-snapshot.c
@@ -1,7 +1,6 @@
 /* ui-snapshot.c: generate snapshot of a commit
  *
 /* 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)
  *
  * 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;
 {
        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);
        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));
 
        /* 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);
+       result = write_archive(argv.argc, nargv, NULL, NULL, 0);

        argv_array_clear(&argv);
        free(nargv);
        return result;
        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;
                                        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);
        rv = write_tar_archive(hex, prefix);

-       cgit_close_filter(&f);
+       cgit_close_filter(&f.base);

        return rv;
 }
 
        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;
 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++) {
        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;
                        return fmt;
        }
        return NULL;


@@ -125,19 +109,22 @@ static int make_snapshot(const struct cgit_snapshot_format *format,
                         const char *hex, const char *prefix,
                         const char *filename)
 {
                         const char *hex, const char *prefix,
                         const char *filename)
 {

-       unsigned char sha1[20];
+       struct object_id oid;

 
 

-       if (get_sha1(hex, sha1)) {
-               cgit_print_error("Bad object id: %s", hex);
+       if (get_oid(hex, &oid)) {
+               cgit_print_error_page(404, "Not found",
+                               "Bad object id: %s", hex);

                return 1;
        }
                return 1;
        }

-       if (!lookup_commit_reference(sha1)) {
-               cgit_print_error("Not a commit reference: %s", hex);
+       if (!lookup_commit_reference(oid.hash)) {
+               cgit_print_error_page(400, "Bad request",
+                               "Not a commit reference: %s", hex);

                return 1;
        }
                return 1;
        }

+       ctx.page.etag = oid_to_hex(&oid);

        ctx.page.mimetype = xstrdup(format->mimetype);
        ctx.page.filename = xstrdup(filename);
        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;
 }
        format->write_func(hex, prefix);
        return 0;
 }


@@ -156,18 +143,18 @@ static const char *get_ref_from_filename(const char *url, const char *filename,
                                         const struct cgit_snapshot_format *format)
 {
        const char *reponame;
                                         const struct cgit_snapshot_format *format)
 {
        const char *reponame;

-       unsigned char sha1[20];
+       struct object_id oid;

        struct strbuf snapshot = STRBUF_INIT;
        int result = 1;
 
        strbuf_addstr(&snapshot, filename);
        strbuf_setlen(&snapshot, snapshot.len - strlen(format->suffix));
 
        struct strbuf snapshot = STRBUF_INIT;
        int result = 1;
 
        strbuf_addstr(&snapshot, filename);
        strbuf_setlen(&snapshot, snapshot.len - strlen(format->suffix));
 

-       if (get_sha1(snapshot.buf, sha1) == 0)
+       if (get_oid(snapshot.buf, &oid) == 0)

                goto out;
 
        reponame = cgit_repobasename(url);
                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 == '_'))
                const char *new_start = snapshot.buf;
                new_start += strlen(reponame);
                while (new_start && (*new_start == '-' || *new_start == '_'))


@@ -175,15 +162,15 @@ static const char *get_ref_from_filename(const char *url, const char *filename,
                strbuf_splice(&snapshot, 0, new_start - snapshot.buf, "", 0);
        }
 
                strbuf_splice(&snapshot, 0, new_start - snapshot.buf, "", 0);
        }
 

-       if (get_sha1(snapshot.buf, sha1) == 0)
+       if (get_oid(snapshot.buf, &oid) == 0)

                goto out;
 
        strbuf_insert(&snapshot, 0, "v", 1);
                goto out;
 
        strbuf_insert(&snapshot, 0, "v", 1);

-       if (get_sha1(snapshot.buf, sha1) == 0)
+       if (get_oid(snapshot.buf, &oid) == 0)

                goto out;
 
        strbuf_splice(&snapshot, 0, 1, "V", 1);
                goto out;
 
        strbuf_splice(&snapshot, 0, 1, "V", 1);

-       if (get_sha1(snapshot.buf, sha1) == 0)
+       if (get_oid(snapshot.buf, &oid) == 0)

                goto out;
 
        result = 0;
                goto out;
 
        result = 0;


@@ -193,42 +180,29 @@ out:
        return result ? strbuf_detach(&snapshot, NULL) : NULL;
 }
 
        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,
 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) {
 {
        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) {
                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) {
                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);
                        return;
                }
                prefix = xstrdup(filename);