cgit: replace 'unsigned char sha1[20]' with 'struct object_id oid'

[cgit.git] / cgit.c

diff --git a/cgit.c b/cgit.c
index 3ed1935c1eb4eb5561ccaed3f9d169b72286ca90..9f5a80fe9ce76e01c945854729dc697690780643 100644 (file)
--- a/cgit.c
+++ b/cgit.c
@@ -41,6 +41,8 @@ static void repo_config(struct cgit_repo *repo, const char *name, const char *va
                repo->desc = xstrdup(value);
        else if (!strcmp(name, "owner"))
                repo->owner = xstrdup(value);
+       else if (!strcmp(name, "homepage"))
+               repo->homepage = xstrdup(value);
        else if (!strcmp(name, "defbranch"))
                repo->defbranch = xstrdup(value);
        else if (!strcmp(name, "snapshots"))
@@ -55,6 +57,8 @@ static void repo_config(struct cgit_repo *repo, const char *name, const char *va
                repo->enable_remote_branches = atoi(value);
        else if (!strcmp(name, "enable-subject-links"))
                repo->enable_subject_links = atoi(value);
+       else if (!strcmp(name, "enable-html-serving"))
+               repo->enable_html_serving = atoi(value);
        else if (!strcmp(name, "branch-sort")) {
                if (!strcmp(value, "age"))
                        repo->branch_sort = 1;
@@ -170,6 +174,8 @@ static void config_cb(const char *name, const char *value)
                ctx.cfg.enable_remote_branches = atoi(value);
        else if (!strcmp(name, "enable-subject-links"))
                ctx.cfg.enable_subject_links = atoi(value);
+       else if (!strcmp(name, "enable-html-serving"))
+               ctx.cfg.enable_html_serving = atoi(value);
        else if (!strcmp(name, "enable-tree-linenumbers"))
                ctx.cfg.enable_tree_linenumbers = atoi(value);
        else if (!strcmp(name, "enable-git-config"))
@@ -465,13 +471,14 @@ static char *find_default_branch(struct cgit_repo *repo)
 static char *guess_defbranch(void)
 {
        const char *ref;
-       unsigned char sha1[20];
+       struct object_id oid;
 
-       ref = resolve_ref_unsafe("HEAD", 0, sha1, NULL);
+       ref = resolve_ref_unsafe("HEAD", 0, oid.hash, NULL);
        if (!ref || !starts_with(ref, "refs/heads/"))
                return "master";
        return xstrdup(ref + 11);
 }
+
 /* The caller must free filename and ref after calling this. */
 static inline void parse_readme(const char *readme, char **filename, char **ref, struct cgit_repo *repo)
 {
@@ -551,7 +558,7 @@ static void print_no_repo_clone_urls(const char *url)
 
 static int prepare_repo_cmd(void)
 {
-       unsigned char sha1[20];
+       struct object_id oid;
        int nongit = 0;
        int rc;
 
@@ -609,12 +616,12 @@ static int prepare_repo_cmd(void)
                return 1;
        }
 
-       if (get_sha1(ctx.qry.head, sha1)) {
-               char *tmp = xstrdup(ctx.qry.head);
-               ctx.qry.head = ctx.repo->defbranch;
+       if (get_oid(ctx.qry.head, &oid)) {
+               char *old_head = ctx.qry.head;
+               ctx.qry.head = xstrdup(ctx.repo->defbranch);
                cgit_print_error_page(404, "Not found",
-                               "Invalid branch: %s", tmp);
-               free(tmp);
+                               "Invalid branch: %s", old_head);
+               free(old_head);
                return 1;
        }
        string_list_sort(&ctx.repo->submodules);
@@ -789,6 +796,8 @@ static void print_repo(FILE *f, struct cgit_repo *repo)
                fprintf(f, "repo.module-link=%s\n", repo->module_link);
        if (repo->section)
                fprintf(f, "repo.section=%s\n", repo->section);
+       if (repo->homepage)
+               fprintf(f, "repo.homepage=%s\n", repo->homepage);
        if (repo->clone_url)
                fprintf(f, "repo.clone-url=%s\n", repo->clone_url);
        fprintf(f, "repo.enable-commit-graph=%d\n",
@@ -821,6 +830,7 @@ static void print_repo(FILE *f, struct cgit_repo *repo)
                fprintf(f, "repo.logo-link=%s\n", repo->logo_link);
        fprintf(f, "repo.enable-remote-branches=%d\n", repo->enable_remote_branches);
        fprintf(f, "repo.enable-subject-links=%d\n", repo->enable_subject_links);
+       fprintf(f, "repo.enable-html-serving=%d\n", repo->enable_html_serving);
        if (repo->branch_sort == 1)
                fprintf(f, "repo.branch-sort=age\n");
        if (repo->commit_sort) {
@@ -932,7 +942,7 @@ static void cgit_parse_args(int argc, const char **argv)
 
        for (i = 1; i < argc; i++) {
                if (!strcmp(argv[i], "--version")) {
-                       printf("CGit %s | http://git.zx2c4.com/cgit/\n\nCompiled in features:\n", CGIT_VERSION);
+                       printf("CGit %s | https://git.zx2c4.com/cgit/\n\nCompiled in features:\n", CGIT_VERSION);
 #ifdef NO_LUA
                        printf("[-] ");
 #else
@@ -1017,7 +1027,7 @@ static int calc_ttl(void)
        return ctx.cfg.cache_repo_ttl;
 }
 
-int main(int argc, const char **argv)
+int cmd_main(int argc, const char **argv)
 {
        const char *path;
        int err, ttl;