Fix silly spelling error.

[cgit.git] / cgit.h

diff --git a/cgit.h b/cgit.h
index c7ab5c63928ccc4efa4672182bc035fbae9d7135..a474d7777b3b4b5aadb76a9549a49d878c829cdd 100644 (file)
--- a/cgit.h
+++ b/cgit.h
@@ -11,6 +11,7 @@
 #include <tag.h>
 #include <diff.h>
 #include <diffcore.h>
+#include <argv-array.h>
 #include <refs.h>
 #include <revision.h>
 #include <log-tree.h>
@@ -72,7 +73,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 +85,13 @@ 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 string_list submodules;
 };
 
 typedef void (*repo_config_fn)(struct cgit_repo *repo, const char *name,
@@ -176,16 +180,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 +200,20 @@ struct cgit_config {
        int cache_root_ttl;
        int cache_scanrc_ttl;
        int cache_static_ttl;
+       int cache_about_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,10 +231,13 @@ 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;
+       int branch_sort;
+       int commit_sort;
        struct string_list mimetypes;
        struct cgit_filter *about_filter;
        struct cgit_filter *commit_filter;
@@ -236,26 +248,26 @@ 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;
 };
 
 struct cgit_context {
@@ -266,6 +278,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 +293,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 +303,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 +332,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);