X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/f7f26f88755ac6a3b9af4918b51b0d6e7a692c78..9999b0a3e915c76a52be433830660e803ef71cb0:/ui-snapshot.c?ds=inline diff --git a/ui-snapshot.c b/ui-snapshot.c index 901c0c9..582dc31 100644 --- a/ui-snapshot.c +++ b/ui-snapshot.c @@ -58,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; } @@ -98,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; @@ -127,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; } @@ -189,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);