Merge branch 'lh/mimetypes'

[cgit.git] / cgit.h

diff --git a/cgit.h b/cgit.h
index 7881acaf065902a392bc1b513fb4d87a4aabec88..1194eb0209880289729ac3a196d6037ea7427561 100644 (file)
--- a/cgit.h
+++ b/cgit.h
@@ -15,6 +15,8 @@
 #include <revision.h>
 #include <log-tree.h>
 #include <archive.h>
+#include <string-list.h>
+#include <xdiff-interface.h>
 #include <xdiff/xdiff.h>
 #include <utf8.h>
 
@@ -22,8 +24,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"
 
 
 /*
@@ -60,6 +63,8 @@ struct cgit_repo {
        int snapshots;
        int enable_log_filecount;
        int enable_log_linecount;
+       int max_stats;
+       time_t mtime;
 };
 
 struct cgit_repolist {
@@ -84,7 +89,7 @@ struct commitinfo {
 struct taginfo {
        char *tagger;
        char *tagger_email;
-       int tagger_date;
+       unsigned long tagger_date;
        char *msg;
 };
 
@@ -117,7 +122,12 @@ struct cgit_query {
        char *path;
        char *name;
        char *mimetype;
+       char *url;
+       char *period;
        int   ofs;
+       int nohead;
+       char *sort;
+       int showmsg;
 };
 
 struct cgit_config {
@@ -127,6 +137,8 @@ struct cgit_config {
        char *css;
        char *favicon;
        char *footer;
+       char *head_include;
+       char *header;
        char *index_header;
        char *index_info;
        char *logo;
@@ -145,29 +157,39 @@ struct cgit_config {
        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 noplainemail;
+       int noheader;
        int renamelimit;
        int snapshots;
        int summary_branches;
        int summary_log;
        int summary_tags;
+       struct string_list mimetypes;
 };
 
 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 {
@@ -210,7 +232,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,
@@ -228,11 +251,5 @@ 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 */