parsing: ban sprintf()

[cgit.git] / cgit.h

diff --git a/cgit.h b/cgit.h
index 519d2afb3d4d223c68639d8f12235e35f5e98cc5..32dfd7a6b741db6d1b87aa9807bf8a69e5b3f70b 100644 (file)
--- a/cgit.h
+++ b/cgit.h
@@ -3,6 +3,8 @@
 
 
 #include <git-compat-util.h>
+#include <stdbool.h>
+
 #include <cache.h>
 #include <grep.h>
 #include <object.h>
@@ -23,13 +25,9 @@
 #include <notes.h>
 #include <graph.h>
 
-
-/*
- * Dateformats used on misc. pages
- */
-#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"
+/* Add isgraph(x) to Git's sane ctype support (see git-compat-util.h) */
+#undef isgraph
+#define isgraph(x) (isprint((x)) && !isspace((x)))
 
 
 /*
@@ -48,12 +46,18 @@
  */
 #define PAGE_ENCODING "UTF-8"
 
+#define BIT(x) (1U << (x))
+
 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 enum {
-       ABOUT, COMMIT, SOURCE
+       DIFF_UNIFIED, DIFF_SSDIFF, DIFF_STATONLY
+} diff_type;
+
+typedef enum {
+       ABOUT, COMMIT, SOURCE, EMAIL, AUTH, OWNER
 } filter_type;
 
 struct cgit_filter {
@@ -69,7 +73,6 @@ struct cgit_exec_filter {
        char *cmd;
        char **argv;
        int old_stdout;
-       int pipe_fh[2];
        int pid;
 };
 
@@ -78,7 +81,9 @@ struct cgit_repo {
        char *name;
        char *path;
        char *desc;
+       char *extra_head_content;
        char *owner;
+       char *homepage;
        char *defbranch;
        char *module_link;
        struct string_list readme;
@@ -86,12 +91,14 @@ struct cgit_repo {
        char *clone_url;
        char *logo;
        char *logo_link;
+       char *snapshot_prefix;
        int snapshots;
        int enable_commit_graph;
        int enable_log_filecount;
        int enable_log_linecount;
        int enable_remote_branches;
        int enable_subject_links;
+       int enable_html_serving;
        int max_stats;
        int branch_sort;
        int commit_sort;
@@ -99,7 +106,11 @@ struct cgit_repo {
        struct cgit_filter *about_filter;
        struct cgit_filter *commit_filter;
        struct cgit_filter *source_filter;
+       struct cgit_filter *email_filter;
+       struct cgit_filter *owner_filter;
        struct string_list submodules;
+       int hide;
+       int ignore;
 };
 
 typedef void (*repo_config_fn)(struct cgit_repo *repo, const char *name,
@@ -116,9 +127,11 @@ struct commitinfo {
        char *author;
        char *author_email;
        unsigned long author_date;
+       int author_tz;
        char *committer;
        char *committer_email;
        unsigned long committer_date;
+       int committer_tz;
        char *subject;
        char *msg;
        char *msg_encoding;
@@ -128,6 +141,7 @@ struct taginfo {
        char *tagger;
        char *tagger_email;
        unsigned long tagger_date;
+       int tagger_tz;
        char *msg;
 };
 
@@ -149,7 +163,7 @@ struct reflist {
 struct cgit_query {
        int has_symref;
        int has_sha1;
-       int has_ssdiff;
+       int has_difftype;
        char *raw;
        char *repo;
        char *page;
@@ -160,17 +174,17 @@ struct cgit_query {
        char *sha2;
        char *path;
        char *name;
-       char *mimetype;
        char *url;
        char *period;
        int   ofs;
        int nohead;
        char *sort;
        int showmsg;
-       int ssdiff;
+       diff_type difftype;
        int show_all;
        int context;
        int ignorews;
+       int follow;
        char *vpath;
 };
 
@@ -184,8 +198,6 @@ struct cgit_config {
        char *footer;
        char *head_include;
        char *header;
-       char *index_header;
-       char *index_info;
        char *logo;
        char *logo_link;
        char *mimetype_file;
@@ -209,17 +221,21 @@ struct cgit_config {
        int cache_scanrc_ttl;
        int cache_static_ttl;
        int cache_about_ttl;
+       int cache_snapshot_ttl;
        int case_sensitive_sort;
        int embedded;
        int enable_filter_overrides;
+       int enable_follow_links;
        int enable_http_clone;
        int enable_index_links;
        int enable_index_owner;
+       int enable_blame;
        int enable_commit_graph;
        int enable_log_filecount;
        int enable_log_linecount;
        int enable_remote_branches;
        int enable_subject_links;
+       int enable_html_serving;
        int enable_tree_linenumbers;
        int enable_git_config;
        int local_time;
@@ -231,7 +247,6 @@ struct cgit_config {
        int max_repodesc_len;
        int max_blob_size;
        int max_stats;
-       int nocache;
        int noplainemail;
        int noheader;
        int renamelimit;
@@ -243,13 +258,16 @@ struct cgit_config {
        int summary_branches;
        int summary_log;
        int summary_tags;
-       int ssdiff;
+       diff_type difftype;
        int branch_sort;
        int commit_sort;
        struct string_list mimetypes;
        struct cgit_filter *about_filter;
        struct cgit_filter *commit_filter;
        struct cgit_filter *source_filter;
+       struct cgit_filter *email_filter;
+       struct cgit_filter *owner_filter;
+       struct cgit_filter *auth_filter;
 };
 
 struct cgit_page {
@@ -276,6 +294,10 @@ struct cgit_environment {
        const char *script_name;
        const char *server_name;
        const char *server_port;
+       const char *http_cookie;
+       const char *http_referer;
+       unsigned int content_length;
+       int authenticated;
 };
 
 struct cgit_context {
@@ -292,7 +314,6 @@ struct cgit_snapshot_format {
        const char *suffix;
        const char *mimetype;
        write_archive_fn_t write_func;
-       int bit;
 };
 
 extern const char *cgit_version;
@@ -312,26 +333,28 @@ 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,
+extern int cgit_refs_cb(const char *refname, const struct object_id *oid,
                        int flags, void *cb_data);
 
-extern void *cgit_free_commitinfo(struct commitinfo *info);
+extern void cgit_free_commitinfo(struct commitinfo *info);
+extern void cgit_free_taginfo(struct taginfo *info);
 
-extern int cgit_diff_files(const unsigned char *old_sha1,
-                          const unsigned char *new_sha1,
+void cgit_diff_tree_cb(struct diff_queue_struct *q,
+                      struct diff_options *options, void *data);
+
+extern int cgit_diff_files(const struct object_id *old_oid,
+                          const struct object_id *new_oid,
                           unsigned long *old_size, unsigned long *new_size,
                           int *binary, int context, int ignorews,
                           linediff_fn fn);
 
-extern void cgit_diff_tree(const unsigned char *old_sha1,
-                          const unsigned char *new_sha1,
+extern void cgit_diff_tree(const struct object_id *old_oid,
+                          const struct object_id *new_oid,
                           filepair_fn fn, const char *prefix, int ignorews);
 
 extern void cgit_diff_commit(struct commit *commit, filepair_fn fn,
@@ -350,6 +373,9 @@ extern void cgit_parse_url(const char *url);
 extern const char *cgit_repobasename(const char *reponame);
 
 extern int cgit_parse_snapshots_mask(const char *str);
+extern const struct object_id *cgit_snapshot_get_sig(const char *ref,
+                                                    const struct cgit_snapshot_format *f);
+extern const unsigned cgit_snapshot_format_bit(const struct cgit_snapshot_format *f);
 
 extern int cgit_open_filter(struct cgit_filter *filter, ...);
 extern int cgit_close_filter(struct cgit_filter *filter);
@@ -365,4 +391,6 @@ extern int readfile(const char *path, char **buf, size_t *size);
 
 extern char *expand_macros(const char *txt);
 
+extern char *get_mimetype_for_filename(const char *filename);
+
 #endif /* CGIT_H */