Merge branch 'lh/embedded'

[cgit.git] / cgit.h

diff --git a/cgit.h b/cgit.h
index e82e9aabc870d1ac91225dd4a5f9dcbda6bb0cc6..8c64efeaa6e7f5698751e202b64765280e3985cf 100644 (file)
--- a/cgit.h
+++ b/cgit.h
@@ -15,6 +15,7 @@
 #include <revision.h>
 #include <log-tree.h>
 #include <archive.h>
+#include <xdiff-interface.h>
 #include <xdiff/xdiff.h>
 #include <utf8.h>
 
@@ -22,8 +23,9 @@
 /*
  * Dateformats used on misc. pages
  */
-#define FMT_LONGDATE "%Y-%m-%d %H:%M:%S"
+#define FMT_LONGDATE "%Y-%m-%d %H:%M:%S (%Z)"
 #define FMT_SHORTDATE "%Y-%m-%d"
+#define FMT_ATOMDATE "%Y-%m-%dT%H:%M:%SZ"
 
 
 /*
@@ -46,13 +48,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);
 
-struct cacheitem {
-       char *name;
-       struct stat st;
-       int ttl;
-       int fd;
-};
-
 struct cgit_repo {
        char *url;
        char *name;
@@ -67,6 +62,8 @@ struct cgit_repo {
        int snapshots;
        int enable_log_filecount;
        int enable_log_linecount;
+       int max_stats;
+       time_t mtime;
 };
 
 struct cgit_repolist {
@@ -91,7 +88,7 @@ struct commitinfo {
 struct taginfo {
        char *tagger;
        char *tagger_email;
-       int tagger_date;
+       unsigned long tagger_date;
        char *msg;
 };
 
@@ -123,7 +120,13 @@ struct cgit_query {
        char *sha2;
        char *path;
        char *name;
+       char *mimetype;
+       char *url;
+       char *period;
        int   ofs;
+       int nohead;
+       char *sort;
+       int showmsg;
 };
 
 struct cgit_config {
@@ -131,6 +134,10 @@ struct cgit_config {
        char *cache_root;
        char *clone_prefix;
        char *css;
+       char *favicon;
+       char *footer;
+       char *head_include;
+       char *header;
        char *index_header;
        char *index_info;
        char *logo;
@@ -139,21 +146,29 @@ struct cgit_config {
        char *repo_group;
        char *robots;
        char *root_title;
+       char *root_desc;
+       char *root_readme;
        char *script_name;
        char *virtual_root;
+       int cache_size;
        int cache_dynamic_ttl;
        int cache_max_create_time;
        int cache_repo_ttl;
        int cache_root_ttl;
        int cache_static_ttl;
+       int embedded;
        int enable_index_links;
        int enable_log_filecount;
        int enable_log_linecount;
+       int local_time;
+       int max_repo_count;
        int max_commit_count;
        int max_lock_attempts;
        int max_msg_len;
        int max_repodesc_len;
+       int max_stats;
        int nocache;
+       int noheader;
        int renamelimit;
        int snapshots;
        int summary_branches;
@@ -164,10 +179,14 @@ struct cgit_config {
 struct cgit_page {
        time_t modified;
        time_t expires;
+       size_t size;
        char *mimetype;
        char *charset;
        char *filename;
+       char *etag;
        char *title;
+       int status;
+       char *statusmsg;
 };
 
 struct cgit_context {
@@ -198,7 +217,6 @@ 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);
@@ -211,7 +229,8 @@ extern void *cgit_free_commitinfo(struct commitinfo *info);
 
 extern int cgit_diff_files(const unsigned char *old_sha1,
                           const unsigned char *new_sha1,
-                          linediff_fn fn);
+                          unsigned long *old_size, unsigned long *new_size,
+                          int *binary, linediff_fn fn);
 
 extern void cgit_diff_tree(const unsigned char *old_sha1,
                           const unsigned char *new_sha1,
@@ -221,21 +240,13 @@ extern void cgit_diff_commit(struct commit *commit, filepair_fn fn);
 
 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 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);
 
+
 #endif /* CGIT_H */