Add a favicon option to cgitrc

[ps-cgit] / cgit.h

diff --git a/cgit.h b/cgit.h
index c1a231d08390fdcc31dcb01b4abe3e5403b03d5a..7881acaf065902a392bc1b513fb4d87a4aabec88 100644 (file)
--- a/cgit.h
+++ b/cgit.h
@@ -46,13 +46,6 @@ 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);
 

-struct cacheitem {
-       char *name;
-       struct stat st;
-       int ttl;
-       int fd;
-};
-

 struct cgit_repo {
        char *url;
        char *name;
 struct cgit_repo {
        char *url;
        char *name;


@@ -123,6 +116,7 @@ struct cgit_query {
        char *sha2;
        char *path;
        char *name;
        char *sha2;
        char *path;
        char *name;

+       char *mimetype;

        int   ofs;
 };
 
        int   ofs;
 };
 


@@ -131,6 +125,8 @@ struct cgit_config {
        char *cache_root;
        char *clone_prefix;
        char *css;
        char *cache_root;
        char *clone_prefix;
        char *css;

+       char *favicon;
+       char *footer;

        char *index_header;
        char *index_info;
        char *logo;
        char *index_header;
        char *index_info;
        char *logo;


@@ -139,8 +135,11 @@ struct cgit_config {
        char *repo_group;
        char *robots;
        char *root_title;
        char *repo_group;
        char *robots;
        char *root_title;

+       char *root_desc;
+       char *root_readme;

        char *script_name;
        char *virtual_root;
        char *script_name;
        char *virtual_root;

+       int cache_size;

        int cache_dynamic_ttl;
        int cache_max_create_time;
        int cache_repo_ttl;
        int cache_dynamic_ttl;
        int cache_max_create_time;
        int cache_repo_ttl;


@@ -149,6 +148,7 @@ struct cgit_config {
        int enable_index_links;
        int enable_log_filecount;
        int enable_log_linecount;
        int enable_index_links;
        int enable_log_filecount;
        int enable_log_linecount;

+       int max_repo_count;

        int max_commit_count;
        int max_lock_attempts;
        int max_msg_len;
        int max_commit_count;
        int max_lock_attempts;
        int max_msg_len;


@@ -189,19 +189,15 @@ extern const char *cgit_version;
 extern struct cgit_repolist cgit_repolist;
 extern struct cgit_context ctx;
 extern const struct cgit_snapshot_format cgit_snapshot_formats[];
 extern struct cgit_repolist cgit_repolist;
 extern struct cgit_context ctx;
 extern const struct cgit_snapshot_format cgit_snapshot_formats[];

-extern int cgit_cmd;

 
 

-extern void cgit_prepare_context(struct cgit_context *ctx);
+extern struct cgit_repo *cgit_add_repo(const char *url);

 extern struct cgit_repo *cgit_get_repoinfo(const char *url);
 extern struct cgit_repo *cgit_get_repoinfo(const char *url);

-extern void cgit_global_config_cb(const char *name, const char *value);

 extern void cgit_repo_config_cb(const char *name, const char *value);
 extern void cgit_repo_config_cb(const char *name, const char *value);

-extern void cgit_querystring_cb(const char *name, const char *value);

 
 extern int chk_zero(int result, char *msg);
 extern int chk_positive(int result, char *msg);
 extern int chk_non_negative(int result, char *msg);
 
 
 extern int chk_zero(int result, char *msg);
 extern int chk_positive(int result, char *msg);
 extern int chk_non_negative(int result, char *msg);
 

-extern int hextoint(char c);

 extern char *trim_end(const char *str, char c);
 extern char *strlpart(char *txt, int maxlen);
 extern char *strrpart(char *txt, int maxlen);
 extern char *trim_end(const char *str, char c);
 extern char *strlpart(char *txt, int maxlen);
 extern char *strrpart(char *txt, int maxlen);


@@ -224,21 +220,19 @@ extern void cgit_diff_commit(struct commit *commit, filepair_fn fn);
 
 extern char *fmt(const char *format,...);
 
 
 extern char *fmt(const char *format,...);
 

-extern int cgit_read_config(const char *filename, configfn fn);
-extern int cgit_parse_query(char *txt, configfn fn);

 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);
 

-extern char *cache_safe_filename(const char *unsafe);
-extern int cache_lock(struct cacheitem *item);
-extern int cache_unlock(struct cacheitem *item);
-extern int cache_cancel_lock(struct cacheitem *item);
-extern int cache_exist(struct cacheitem *item);
-extern int cache_expired(struct cacheitem *item);
-

 extern const char *cgit_repobasename(const char *reponame);
 
 extern int cgit_parse_snapshots_mask(const char *str);
 
 extern const char *cgit_repobasename(const char *reponame);
 
 extern int cgit_parse_snapshots_mask(const char *str);
 

+/* libgit.a either links against or compiles its own implementation of
+ * strcasestr(), and we'd like to reuse it. Simply re-declaring it
+ * seems to do the trick.
+ */
+extern char *strcasestr(const char *haystack, const char *needle);
+
+

 #endif /* CGIT_H */
 #endif /* CGIT_H */