syntax-highlighting: always use utf-8 to avoid ascii codec issues

[cgit.git] / cgit.h

diff --git a/cgit.h b/cgit.h
index 92e8c558dab46e402381f084e437cf5be90b0b21..de5c94a1862692f19f35a66f38f4c24e80dad247 100644 (file)
--- a/cgit.h
+++ b/cgit.h
@@ -3,6 +3,8 @@
 
 
 #include <git-compat-util.h>
+#include <stdbool.h>
+
 #include <cache.h>
 #include <grep.h>
 #include <object.h>
@@ -23,6 +25,9 @@
 #include <notes.h>
 #include <graph.h>
 
+/* Add isgraph(x) to Git's sane ctype support (see git-compat-util.h) */
+#undef isgraph
+#define isgraph(x) (isprint((x)) && !isspace((x)))
 
 /*
  * Dateformats used on misc. pages
@@ -53,20 +58,25 @@ 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 extra_args;
        int old_stdout;
        int pipe_fh[2];
        int pid;
@@ -91,6 +101,7 @@ struct cgit_repo {
        int enable_log_linecount;
        int enable_remote_branches;
        int enable_subject_links;
+       int enable_html_serving;
        int max_stats;
        int branch_sort;
        int commit_sort;
@@ -98,7 +109,11 @@ struct cgit_repo {
        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;
+       int hide;
+       int ignore;
 };
 
 typedef void (*repo_config_fn)(struct cgit_repo *repo, const char *name,
@@ -148,7 +163,7 @@ struct reflist {
 struct cgit_query {
        int has_symref;
        int has_sha1;
-       int has_ssdiff;
+       int has_difftype;
        char *raw;
        char *repo;
        char *page;
@@ -159,17 +174,17 @@ struct cgit_query {
        char *sha2;
        char *path;
        char *name;
-       char *mimetype;
        char *url;
        char *period;
        int   ofs;
        int nohead;
        char *sort;
        int showmsg;
-       int ssdiff;
+       diff_type difftype;
        int show_all;
        int context;
        int ignorews;
+       int follow;
        char *vpath;
 };
 
@@ -208,9 +223,11 @@ struct cgit_config {
        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_follow_links;
        int enable_http_clone;
        int enable_index_links;
        int enable_index_owner;
@@ -219,6 +236,7 @@ struct cgit_config {
        int enable_log_linecount;
        int enable_remote_branches;
        int enable_subject_links;
+       int enable_html_serving;
        int enable_tree_linenumbers;
        int enable_git_config;
        int local_time;
@@ -242,13 +260,16 @@ struct cgit_config {
        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 {
@@ -275,6 +296,10 @@ struct cgit_environment {
        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 {
@@ -318,11 +343,14 @@ 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,
+extern int cgit_refs_cb(const char *refname, const struct object_id *oid,
                        int flags, void *cb_data);
 
 extern void *cgit_free_commitinfo(struct commitinfo *info);
 
+void cgit_diff_tree_cb(struct diff_queue_struct *q,
+                      struct diff_options *options, void *data);
+
 extern int cgit_diff_files(const unsigned char *old_sha1,
                           const unsigned char *new_sha1,
                           unsigned long *old_size, unsigned long *new_size,
@@ -355,6 +383,8 @@ 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);
 
@@ -362,4 +392,6 @@ extern int readfile(const char *path, char **buf, size_t *size);
 
 extern char *expand_macros(const char *txt);
 
+extern char *get_mimetype_for_filename(const char *filename);
+
 #endif /* CGIT_H */