filters: toggle perl utf8 situation

[cgit.git] / cgit.h

diff --git a/cgit.h b/cgit.h
index 4090cd4f2fe114d6a70f9d138d9b67b3ad861d39..f28cf300b5de975f1ef7c460bdefe9743f599361 100644 (file)
--- a/cgit.h
+++ b/cgit.h
@@ -11,6 +11,7 @@
 #include <tag.h>
 #include <diff.h>
 #include <diffcore.h>
 #include <tag.h>
 #include <diff.h>
 #include <diffcore.h>

+#include <argv-array.h>

 #include <refs.h>
 #include <revision.h>
 #include <log-tree.h>
 #include <refs.h>
 #include <revision.h>
 #include <log-tree.h>


@@ -20,6 +21,7 @@
 #include <xdiff/xdiff.h>
 #include <utf8.h>
 #include <notes.h>
 #include <xdiff/xdiff.h>
 #include <utf8.h>
 #include <notes.h>

+#include <graph.h>

 
 
 /*
 
 
 /*


@@ -50,6 +52,10 @@ typedef void (*configfn)(const char *name, const char *value);
 typedef void (*filepair_fn)(struct diff_filepair *pair);
 typedef void (*linediff_fn)(char *line, int len);
 
 typedef void (*filepair_fn)(struct diff_filepair *pair);
 typedef void (*linediff_fn)(char *line, int len);
 

+typedef enum {
+       ABOUT, COMMIT, SOURCE
+} filter_type;
+

 struct cgit_filter {
        char *cmd;
        char **argv;
 struct cgit_filter {
        char *cmd;
        char **argv;


@@ -67,19 +73,25 @@ struct cgit_repo {
        char *owner;
        char *defbranch;
        char *module_link;
        char *owner;
        char *defbranch;
        char *module_link;

-       char *readme;
+       struct string_list readme;

        char *section;
        char *clone_url;
        char *section;
        char *clone_url;

+       char *logo;
+       char *logo_link;

        int snapshots;
        int snapshots;

+       int enable_commit_graph;

        int enable_log_filecount;
        int enable_log_linecount;
        int enable_remote_branches;
        int enable_subject_links;
        int max_stats;
        int enable_log_filecount;
        int enable_log_linecount;
        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;
        time_t mtime;
        struct cgit_filter *about_filter;
        struct cgit_filter *commit_filter;
        struct cgit_filter *source_filter;

+       struct string_list submodules;

 };
 
 typedef void (*repo_config_fn)(struct cgit_repo *repo, const char *name,
 };
 
 typedef void (*repo_config_fn)(struct cgit_repo *repo, const char *name,


@@ -129,6 +141,7 @@ struct reflist {
 struct cgit_query {
        int has_symref;
        int has_sha1;
 struct cgit_query {
        int has_symref;
        int has_sha1;

+       int has_ssdiff;

        char *raw;
        char *repo;
        char *page;
        char *raw;
        char *repo;
        char *page;


@@ -157,6 +170,7 @@ struct cgit_config {
        char *agefile;
        char *cache_root;
        char *clone_prefix;
        char *agefile;
        char *cache_root;
        char *clone_prefix;

+       char *clone_url;

        char *css;
        char *favicon;
        char *footer;
        char *css;
        char *favicon;
        char *footer;


@@ -166,15 +180,19 @@ struct cgit_config {
        char *index_info;
        char *logo;
        char *logo_link;
        char *index_info;
        char *logo;
        char *logo_link;

+       char *mimetype_file;

        char *module_link;
        char *project_list;
        char *module_link;
        char *project_list;

+       struct string_list readme;

        char *robots;
        char *root_title;
        char *root_desc;
        char *root_readme;
        char *script_name;
        char *section;
        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;
        int cache_max_create_time;
        int cache_size;
        int cache_dynamic_ttl;
        int cache_max_create_time;


@@ -182,15 +200,19 @@ struct cgit_config {
        int cache_root_ttl;
        int cache_scanrc_ttl;
        int cache_static_ttl;
        int cache_root_ttl;
        int cache_scanrc_ttl;
        int cache_static_ttl;

+       int case_sensitive_sort;

        int embedded;
        int enable_filter_overrides;
        int embedded;
        int enable_filter_overrides;

-       int enable_gitweb_owner;
+       int enable_http_clone;

        int enable_index_links;
        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_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;
        int local_time;
        int max_atom_items;
        int max_repo_count;


@@ -205,11 +227,16 @@ struct cgit_config {
        int noheader;
        int renamelimit;
        int remove_suffix;
        int noheader;
        int renamelimit;
        int remove_suffix;

+       int scan_hidden_path;
+       int section_from_path;

        int snapshots;
        int snapshots;

+       int section_sort;

        int summary_branches;
        int summary_log;
        int summary_tags;
        int ssdiff;
        int summary_branches;
        int summary_log;
        int summary_tags;
        int ssdiff;

+       int branch_sort;
+       int commit_sort;

        struct string_list mimetypes;
        struct cgit_filter *about_filter;
        struct cgit_filter *commit_filter;
        struct string_list mimetypes;
        struct cgit_filter *about_filter;
        struct cgit_filter *commit_filter;


@@ -220,26 +247,26 @@ struct cgit_page {
        time_t modified;
        time_t expires;
        size_t size;
        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;
        int status;

-       char *statusmsg;
+       const char *statusmsg;

 };
 
 struct cgit_environment {
 };
 
 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;

 };
 
 struct cgit_context {
 };
 
 struct cgit_context {


@@ -250,6 +277,8 @@ struct cgit_context {
        struct cgit_page page;
 };
 
        struct cgit_page page;
 };
 

+typedef int (*write_archive_fn_t)(const char *, const char *);
+

 struct cgit_snapshot_format {
        const char *suffix;
        const char *mimetype;
 struct cgit_snapshot_format {
        const char *suffix;
        const char *mimetype;


@@ -263,6 +292,7 @@ extern struct cgit_repolist cgit_repolist;
 extern struct cgit_context ctx;
 extern const struct cgit_snapshot_format cgit_snapshot_formats[];
 
 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);
 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);


@@ -272,10 +302,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 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 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_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);
 
 extern int cgit_refs_cb(const char *refname, const unsigned char *sha1,
                        int flags, void *cb_data);
 


@@ -291,10 +325,15 @@ extern void cgit_diff_tree(const unsigned char *old_sha1,
                           const unsigned char *new_sha1,
                           filepair_fn fn, const char *prefix, int ignorews);
 
                           const unsigned char *new_sha1,
                           filepair_fn fn, const char *prefix, int ignorews);
 

-extern void cgit_diff_commit(struct commit *commit, filepair_fn fn);
+extern void cgit_diff_commit(struct commit *commit, filepair_fn fn,
+                            const char *prefix);

 
 

+__attribute__((format (printf,1,2)))

 extern char *fmt(const char *format,...);
 
 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);
 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);


@@ -306,6 +345,8 @@ extern int cgit_parse_snapshots_mask(const char *str);
 extern int cgit_open_filter(struct cgit_filter *filter);
 extern int cgit_close_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_prepare_repo_env(struct cgit_repo * repo);
+

 extern int readfile(const char *path, char **buf, size_t *size);
 
 extern char *expand_macros(const char *txt);
 extern int readfile(const char *path, char **buf, size_t *size);
 
 extern char *expand_macros(const char *txt);