X-Git-Url: https://git.cameronkatri.com/cgit.git/blobdiff_plain/da218fcd9eb554a8405ca72e84bcc0feb371194f..a87c9d8a9779eab0499efd3c44e090a28c7d1cdf:/ui-snapshot.c diff --git a/ui-snapshot.c b/ui-snapshot.c index 5136c49..ea77eb4 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 = { - .cmd = filter_argv[0], - .argv = filter_argv, - }; - cgit_open_filter(&f); + struct cgit_exec_filter f; + cgit_exec_filter_init(&f, filter_argv[0], filter_argv); + + cgit_open_filter(&f.base); rv = write_tar_archive(hex, prefix); - cgit_close_filter(&f); + cgit_close_filter(&f.base); return rv; } @@ -100,7 +99,7 @@ static const struct cgit_snapshot_format *get_format(const char *filename) const struct cgit_snapshot_format *fmt; for (fmt = cgit_snapshot_formats; fmt->suffix; fmt++) { - if (!suffixcmp(filename, fmt->suffix)) + if (ends_with(filename, fmt->suffix)) return fmt; } return NULL; @@ -122,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; } @@ -152,7 +151,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 == '_')) @@ -184,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); @@ -194,7 +193,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;