X-Git-Url: https://git.cameronkatri.com/cgit.git/blobdiff_plain/1de3048d08fc6491630c45437f88f5ab03c0508f..d6c40507711ff6cc19c8fd3f28412845a33faf50:/cgit.h diff --git a/cgit.h b/cgit.h index c7ab5c6..42140ac 100644 --- a/cgit.h +++ b/cgit.h @@ -11,6 +11,7 @@ #include #include #include +#include #include #include #include @@ -52,16 +53,28 @@ typedef void (*filepair_fn)(struct diff_filepair *pair); typedef void (*linediff_fn)(char *line, int len); typedef enum { - ABOUT, COMMIT, SOURCE + DIFF_UNIFIED, DIFF_SSDIFF, DIFF_STATONLY +} diff_type; + +typedef enum { + ABOUT, COMMIT, SOURCE, EMAIL, AUTH, OWNER } filter_type; struct cgit_filter { + int (*open)(struct cgit_filter *, va_list ap); + int (*close)(struct cgit_filter *); + void (*fprintf)(struct cgit_filter *, FILE *, const char *prefix); + void (*cleanup)(struct cgit_filter *); + int argument_count; +}; + +struct cgit_exec_filter { + struct cgit_filter base; char *cmd; char **argv; int old_stdout; int pipe_fh[2]; int pid; - int exitstatus; }; struct cgit_repo { @@ -72,7 +85,7 @@ struct cgit_repo { char *owner; char *defbranch; char *module_link; - char *readme; + struct string_list readme; char *section; char *clone_url; char *logo; @@ -84,10 +97,15 @@ struct cgit_repo { int enable_remote_branches; int enable_subject_links; int max_stats; + int branch_sort; + int commit_sort; time_t mtime; struct cgit_filter *about_filter; struct cgit_filter *commit_filter; struct cgit_filter *source_filter; + struct cgit_filter *email_filter; + struct cgit_filter *owner_filter; + struct string_list submodules; }; typedef void (*repo_config_fn)(struct cgit_repo *repo, const char *name, @@ -137,7 +155,7 @@ struct reflist { struct cgit_query { int has_symref; int has_sha1; - int has_ssdiff; + int has_difftype; char *raw; char *repo; char *page; @@ -155,7 +173,7 @@ struct cgit_query { int nohead; char *sort; int showmsg; - int ssdiff; + diff_type difftype; int show_all; int context; int ignorews; @@ -176,16 +194,18 @@ struct cgit_config { char *index_info; char *logo; char *logo_link; + char *mimetype_file; char *module_link; char *project_list; - char *readme; + struct string_list readme; char *robots; char *root_title; char *root_desc; char *root_readme; char *script_name; char *section; - char *virtual_root; + char *repository_sort; + char *virtual_root; /* Always ends with '/'. */ char *strict_export; int cache_size; int cache_dynamic_ttl; @@ -194,17 +214,21 @@ struct cgit_config { int cache_root_ttl; int cache_scanrc_ttl; int cache_static_ttl; + int cache_about_ttl; + int cache_snapshot_ttl; + int case_sensitive_sort; int embedded; int enable_filter_overrides; - int enable_gitweb_owner; int enable_http_clone; int enable_index_links; + int enable_index_owner; int enable_commit_graph; int enable_log_filecount; int enable_log_linecount; int enable_remote_branches; int enable_subject_links; int enable_tree_linenumbers; + int enable_git_config; int local_time; int max_atom_items; int max_repo_count; @@ -222,40 +246,50 @@ struct cgit_config { int scan_hidden_path; int section_from_path; int snapshots; + int section_sort; int summary_branches; int summary_log; int summary_tags; - int ssdiff; + diff_type difftype; + int branch_sort; + int commit_sort; struct string_list mimetypes; struct cgit_filter *about_filter; struct cgit_filter *commit_filter; struct cgit_filter *source_filter; + struct cgit_filter *email_filter; + struct cgit_filter *owner_filter; + struct cgit_filter *auth_filter; }; struct cgit_page { time_t modified; time_t expires; size_t size; - char *mimetype; - char *charset; - char *filename; - char *etag; - char *title; + const char *mimetype; + const char *charset; + const char *filename; + const char *etag; + const char *title; int status; - char *statusmsg; + const char *statusmsg; }; struct cgit_environment { - char *cgit_config; - char *http_host; - char *https; - char *no_http; - char *path_info; - char *query_string; - char *request_method; - char *script_name; - char *server_name; - char *server_port; + const char *cgit_config; + const char *http_host; + const char *https; + const char *no_http; + const char *path_info; + const char *query_string; + const char *request_method; + const char *script_name; + const char *server_name; + const char *server_port; + const char *http_cookie; + const char *http_referer; + unsigned int content_length; + int authenticated; }; struct cgit_context { @@ -266,6 +300,8 @@ struct cgit_context { struct cgit_page page; }; +typedef int (*write_archive_fn_t)(const char *, const char *); + struct cgit_snapshot_format { const char *suffix; const char *mimetype; @@ -279,6 +315,7 @@ extern struct cgit_repolist cgit_repolist; extern struct cgit_context ctx; extern const struct cgit_snapshot_format cgit_snapshot_formats[]; +extern char *cgit_default_repo_desc; extern struct cgit_repo *cgit_add_repo(const char *url); extern struct cgit_repo *cgit_get_repoinfo(const char *url); extern void cgit_repo_config_cb(const char *name, const char *value); @@ -288,10 +325,14 @@ extern int chk_positive(int result, char *msg); extern int chk_non_negative(int result, char *msg); extern char *trim_end(const char *str, char c); +extern char *ensure_end(const char *str, char c); extern char *strlpart(char *txt, int maxlen); extern char *strrpart(char *txt, int maxlen); +extern void strbuf_ensure_end(struct strbuf *sb, char c); + extern void cgit_add_ref(struct reflist *list, struct refinfo *ref); +extern void cgit_free_reflist_inner(struct reflist *list); extern int cgit_refs_cb(const char *refname, const unsigned char *sha1, int flags, void *cb_data); @@ -313,6 +354,9 @@ extern void cgit_diff_commit(struct commit *commit, filepair_fn fn, __attribute__((format (printf,1,2))) extern char *fmt(const char *format,...); +__attribute__((format (printf,1,2))) +extern char *fmtalloc(const char *format,...); + extern struct commitinfo *cgit_parse_commit(struct commit *commit); extern struct taginfo *cgit_parse_tag(struct tag *tag); extern void cgit_parse_url(const char *url); @@ -321,8 +365,13 @@ extern const char *cgit_repobasename(const char *reponame); extern int cgit_parse_snapshots_mask(const char *str); -extern int cgit_open_filter(struct cgit_filter *filter); +extern int cgit_open_filter(struct cgit_filter *filter, ...); extern int cgit_close_filter(struct cgit_filter *filter); +extern void cgit_fprintf_filter(struct cgit_filter *filter, FILE *f, const char *prefix); +extern void cgit_exec_filter_init(struct cgit_exec_filter *filter, char *cmd, char **argv); +extern struct cgit_filter *cgit_new_filter(const char *cmd, filter_type filtertype); +extern void cgit_cleanup_filters(void); +extern void cgit_init_filters(void); extern void cgit_prepare_repo_env(struct cgit_repo * repo);