Add and use a common readfile() function

[ps-cgit] / cgit.h

diff --git a/cgit.h b/cgit.h
index aab898b03bdbff524059b17b2ebc136243fa605d..adb8da4f49be0499eb83ed4a40794f11825be96a 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>
 
@@ -47,6 +49,15 @@ 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 cgit_filter {
+       char *cmd;
+       char **argv;
+       int old_stdout;
+       int pipe_fh[2];
+       int pid;
+       int exitstatus;
+};
+
 struct cgit_repo {
        char *url;
        char *name;
@@ -61,6 +72,11 @@ struct cgit_repo {
        int snapshots;
        int enable_log_filecount;
        int enable_log_linecount;
+       int max_stats;
+       time_t mtime;
+       struct cgit_filter *about_filter;
+       struct cgit_filter *commit_filter;
+       struct cgit_filter *source_filter;
 };
 
 struct cgit_repolist {
@@ -119,8 +135,10 @@ struct cgit_query {
        char *name;
        char *mimetype;
        char *url;
+       char *period;
        int   ofs;
        int nohead;
+       char *sort;
        int showmsg;
 };
 
@@ -131,6 +149,8 @@ struct cgit_config {
        char *css;
        char *favicon;
        char *footer;
+       char *head_include;
+       char *header;
        char *index_header;
        char *index_info;
        char *logo;
@@ -149,6 +169,7 @@ 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;
@@ -158,12 +179,19 @@ struct cgit_config {
        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_filter *about_filter;
+       struct cgit_filter *commit_filter;
+       struct cgit_filter *source_filter;
 };
 
 struct cgit_page {
@@ -173,10 +201,27 @@ struct cgit_page {
        char *mimetype;
        char *charset;
        char *filename;
+       char *etag;
        char *title;
+       int status;
+       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;
 };
 
 struct cgit_context {
+       struct cgit_environment env;
        struct cgit_query qry;
        struct cgit_config cfg;
        struct cgit_repo *repo;
@@ -216,7 +261,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,
@@ -234,11 +280,9 @@ 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);
+extern int cgit_open_filter(struct cgit_filter *filter);
+extern int cgit_close_filter(struct cgit_filter *filter);
 
+extern int readfile(const char *path, char **buf, size_t *size);
 
 #endif /* CGIT_H */