Move cgit_repo into cgit_context

[ps-cgit] / cgit.h

diff --git a/cgit.h b/cgit.h
index a1fe5276f70b6faf02b0c9234fb4f23e38ff6c59..598d8c3b371bb8902b8109a382a194d694f8f885 100644 (file)
--- a/cgit.h
+++ b/cgit.h
@@ -16,6 +16,7 @@
 #include <log-tree.h>
 #include <archive.h>
 #include <xdiff/xdiff.h>
 #include <log-tree.h>
 #include <archive.h>
 #include <xdiff/xdiff.h>

+#include <utf8.h>

 
 
 /*
 
 
 /*


@@ -28,6 +29,8 @@
 #define CMD_BLOB     5
 #define CMD_SNAPSHOT 6
 #define CMD_TAG      7
 #define CMD_BLOB     5
 #define CMD_SNAPSHOT 6
 #define CMD_TAG      7

+#define CMD_REFS     8
+#define CMD_PATCH    9

 
 /*
  * Dateformats used on misc. pages
 
 /*
  * Dateformats used on misc. pages


@@ -47,6 +50,11 @@
 #define TM_MONTH (TM_YEAR / 12.0)
 
 
 #define TM_MONTH (TM_YEAR / 12.0)
 
 

+/*
+ * Default encoding
+ */
+#define PAGE_ENCODING "UTF-8"
+

 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 (*configfn)(const char *name, const char *value);
 typedef void (*filepair_fn)(struct diff_filepair *pair);
 typedef void (*linediff_fn)(char *line, int len);


@@ -58,7 +66,7 @@ struct cacheitem {
        int fd;
 };
 
        int fd;
 };
 

-struct repoinfo {
+struct cgit_repo {

        char *url;
        char *name;
        char *path;
        char *url;
        char *name;
        char *path;


@@ -68,15 +76,16 @@ struct repoinfo {
        char *group;
        char *module_link;
        char *readme;
        char *group;
        char *module_link;
        char *readme;

+       char *clone_url;

        int snapshots;
        int enable_log_filecount;
        int enable_log_linecount;
 };
 
        int snapshots;
        int enable_log_filecount;
        int enable_log_linecount;
 };
 

-struct repolist {
+struct cgit_repolist {

        int length;
        int count;
        int length;
        int count;

-       struct repoinfo *repos;
+       struct cgit_repo *repos;

 };
 
 struct commitinfo {
 };
 
 struct commitinfo {


@@ -89,6 +98,7 @@ struct commitinfo {
        unsigned long committer_date;
        char *subject;
        char *msg;
        unsigned long committer_date;
        char *subject;
        char *msg;

+       char *msg_encoding;

 };
 
 struct taginfo {
 };
 
 struct taginfo {


@@ -113,61 +123,74 @@ struct reflist {
        int count;
 };
 
        int count;
 };
 

+struct cgit_query {
+       int has_symref;
+       int has_sha1;
+       char *raw;
+       char *repo;
+       char *page;
+       char *search;
+       char *grep;
+       char *head;
+       char *sha1;
+       char *sha2;
+       char *path;
+       char *name;
+       int   ofs;
+};
+
+struct cgit_config {
+       char *agefile;
+       char *cache_root;
+       char *clone_prefix;
+       char *css;
+       char *index_header;
+       char *index_info;
+       char *logo;
+       char *logo_link;
+       char *module_link;
+       char *repo_group;
+       char *robots;
+       char *root_title;
+       char *script_name;
+       char *virtual_root;
+       int cache_dynamic_ttl;
+       int cache_max_create_time;
+       int cache_repo_ttl;
+       int cache_root_ttl;
+       int cache_static_ttl;
+       int enable_index_links;
+       int enable_log_filecount;
+       int enable_log_linecount;
+       int max_commit_count;
+       int max_lock_attempts;
+       int max_msg_len;
+       int max_repodesc_len;
+       int nocache;
+       int renamelimit;
+       int snapshots;
+       int summary_branches;
+       int summary_log;
+       int summary_tags;
+};
+
+struct cgit_context {
+       struct cgit_query qry;
+       struct cgit_config cfg;
+       struct cgit_repo *repo;
+};
+

 extern const char *cgit_version;
 
 extern const char *cgit_version;
 

-extern struct repolist cgit_repolist;
-extern struct repoinfo *cgit_repo;
+extern struct cgit_repolist cgit_repolist;
+extern struct cgit_context ctx;

 extern int cgit_cmd;
 
 extern int cgit_cmd;
 

-extern char *cgit_root_title;
-extern char *cgit_css;
-extern char *cgit_logo;
-extern char *cgit_index_header;
-extern char *cgit_logo_link;
-extern char *cgit_module_link;
-extern char *cgit_agefile;
-extern char *cgit_virtual_root;
-extern char *cgit_script_name;
-extern char *cgit_cache_root;
-extern char *cgit_repo_group;
-
-extern int cgit_nocache;
-extern int cgit_snapshots;
-extern int cgit_enable_index_links;
-extern int cgit_enable_log_filecount;
-extern int cgit_enable_log_linecount;
-extern int cgit_max_lock_attempts;
-extern int cgit_cache_root_ttl;
-extern int cgit_cache_repo_ttl;
-extern int cgit_cache_dynamic_ttl;
-extern int cgit_cache_static_ttl;
-extern int cgit_cache_max_create_time;
-extern int cgit_summary_log;
-extern int cgit_summary_tags;
-extern int cgit_summary_branches;
-
-extern int cgit_max_msg_len;
-extern int cgit_max_repodesc_len;
-extern int cgit_max_commit_count;
-
-extern int cgit_query_has_symref;
-extern int cgit_query_has_sha1;
-
-extern char *cgit_querystring;
-extern char *cgit_query_repo;
-extern char *cgit_query_page;
-extern char *cgit_query_search;
-extern char *cgit_query_head;
-extern char *cgit_query_sha1;
-extern char *cgit_query_sha2;
-extern char *cgit_query_path;
-extern char *cgit_query_name;
-extern int   cgit_query_ofs;
-

 extern int htmlfd;
 
 extern int htmlfd;
 

+extern void cgit_prepare_context(struct cgit_context *ctx);

 extern int cgit_get_cmd_index(const char *cmd);
 extern int cgit_get_cmd_index(const char *cmd);

-extern struct repoinfo *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_querystring_cb(const char *name, const char *value);
 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_querystring_cb(const char *name, const char *value);


@@ -178,6 +201,8 @@ extern int chk_non_negative(int result, char *msg);
 
 extern int hextoint(char c);
 extern char *trim_end(const char *str, char c);
 
 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 void cgit_add_ref(struct reflist *list, struct refinfo *ref);
 extern int cgit_refs_cb(const char *refname, const unsigned char *sha1,
 
 extern void cgit_add_ref(struct reflist *list, struct refinfo *ref);
 extern int cgit_refs_cb(const char *refname, const unsigned char *sha1,


@@ -203,6 +228,7 @@ extern void html_txt(char *txt);
 extern void html_ntxt(int len, char *txt);
 extern void html_attr(char *txt);
 extern void html_hidden(char *name, char *value);
 extern void html_ntxt(int len, char *txt);
 extern void html_attr(char *txt);
 extern void html_hidden(char *name, char *value);

+extern void html_option(char *value, char *text, char *selected_value);

 extern void html_link_open(char *url, char *title, char *class);
 extern void html_link_close(void);
 extern void html_filemode(unsigned short mode);
 extern void html_link_open(char *url, char *title, char *class);
 extern void html_link_close(void);
 extern void html_filemode(unsigned short mode);


@@ -232,9 +258,12 @@ extern const char *cgit_repobasename(const char *reponame);
 extern void cgit_tree_link(char *name, char *title, char *class, char *head,
                           char *rev, char *path);
 extern void cgit_log_link(char *name, char *title, char *class, char *head,
 extern void cgit_tree_link(char *name, char *title, char *class, char *head,
                           char *rev, char *path);
 extern void cgit_log_link(char *name, char *title, char *class, char *head,

-                         char *rev, char *path, int ofs);
+                         char *rev, char *path, int ofs, char *grep,
+                         char *pattern);

 extern void cgit_commit_link(char *name, char *title, char *class, char *head,
                             char *rev);
 extern void cgit_commit_link(char *name, char *title, char *class, char *head,
                             char *rev);

+extern void cgit_refs_link(char *name, char *title, char *class, char *head,
+                          char *rev, char *path);

 extern void cgit_snapshot_link(char *name, char *title, char *class,
                               char *head, char *rev, char *archivename);
 extern void cgit_diff_link(char *name, char *title, char *class, char *head,
 extern void cgit_snapshot_link(char *name, char *title, char *class,
                               char *head, char *rev, char *archivename);
 extern void cgit_diff_link(char *name, char *title, char *class, char *head,


@@ -256,12 +285,15 @@ extern void cgit_print_tags(int maxcount);
 
 extern void cgit_print_repolist(struct cacheitem *item);
 extern void cgit_print_summary();
 
 extern void cgit_print_repolist(struct cacheitem *item);
 extern void cgit_print_summary();

-extern void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *path, int pager);
+extern void cgit_print_log(const char *tip, int ofs, int cnt, char *grep,
+                          char *pattern, char *path, int pager);

 extern void cgit_print_blob(struct cacheitem *item, const char *hex, char *path);
 extern void cgit_print_tree(const char *rev, char *path);
 extern void cgit_print_commit(char *hex);
 extern void cgit_print_blob(struct cacheitem *item, const char *hex, char *path);
 extern void cgit_print_tree(const char *rev, char *path);
 extern void cgit_print_commit(char *hex);

+extern void cgit_print_refs();

 extern void cgit_print_tag(char *revname);
 extern void cgit_print_diff(const char *new_hex, const char *old_hex, const char *prefix);
 extern void cgit_print_tag(char *revname);
 extern void cgit_print_diff(const char *new_hex, const char *old_hex, const char *prefix);

+extern void cgit_print_patch(char *hex, struct cacheitem *item);

 extern void cgit_print_snapshot(struct cacheitem *item, const char *head,
                                const char *hex, const char *prefix,
                                const char *filename, int snapshot);
 extern void cgit_print_snapshot(struct cacheitem *item, const char *head,
                                const char *hex, const char *prefix,
                                const char *filename, int snapshot);