t0107: Skip ZIP tests if unzip(1) isn't available

[ps-cgit] / cgit.h

diff --git a/cgit.h b/cgit.h
index ed5cf1487c7f728b0150510d79c30636790ea81a..850b7925b374ca37f05a9c86e84e47ed3acbdab8 100644 (file)
--- a/cgit.h
+++ b/cgit.h
@@ -85,6 +85,7 @@ struct cgit_repo {
        int enable_remote_branches;
        int enable_subject_links;
        int max_stats;
+       int branch_sort;
        int commit_sort;
        time_t mtime;
        struct cgit_filter *about_filter;
@@ -190,7 +191,7 @@ struct cgit_config {
        char *script_name;
        char *section;
        char *repository_sort;
-       char *virtual_root;
+       char *virtual_root;     /* Always ends with '/'. */
        char *strict_export;
        int cache_size;
        int cache_dynamic_ttl;
@@ -234,6 +235,7 @@ struct cgit_config {
        int summary_log;
        int summary_tags;
        int ssdiff;
+       int branch_sort;
        int commit_sort;
        struct string_list mimetypes;
        struct cgit_filter *about_filter;
@@ -245,26 +247,26 @@ struct cgit_page {
        time_t modified;
        time_t expires;
        size_t size;
-       char *mimetype;
-       char *charset;
-       char *filename;
-       char *etag;
-       char *title;
+       const char *mimetype;
+       const char *charset;
+       const char *filename;
+       const char *etag;
+       const char *title;
        int status;
-       char *statusmsg;
+       const 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;
+       const char *cgit_config;
+       const char *http_host;
+       const char *https;
+       const char *no_http;
+       const char *path_info;
+       const char *query_string;
+       const char *request_method;
+       const char *script_name;
+       const char *server_name;
+       const char *server_port;
 };
 
 struct cgit_context {
@@ -300,9 +302,12 @@ extern int chk_positive(int result, char *msg);
 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,
@@ -326,6 +331,9 @@ extern void cgit_diff_commit(struct commit *commit, filepair_fn fn,
 __attribute__((format (printf,1,2)))
 extern char *fmt(const char *format,...);
 
+__attribute__((format (printf,1,2)))
+extern char *fmtalloc(const char *format,...);
+
 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);