doc: use consistent id's when generating html files

[cgit.git] / cgit.c

diff --git a/cgit.c b/cgit.c
index 20f6e279e3be60653d70a3e0966064afcd8c6480..bd9cb3fb11a66383d56256b2c0426e0070e7208c 100644 (file)
--- a/cgit.c
+++ b/cgit.c
@@ -31,6 +31,7 @@ static void process_cached_repolist(const char *path);
 
 static void repo_config(struct cgit_repo *repo, const char *name, const char *value)
 {
 
 static void repo_config(struct cgit_repo *repo, const char *name, const char *value)
 {

+       const char *path;

        struct string_list_item *item;
 
        if (!strcmp(name, "name"))
        struct string_list_item *item;
 
        if (!strcmp(name, "name"))


@@ -41,6 +42,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);
                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"))
        else if (!strcmp(name, "defbranch"))
                repo->defbranch = xstrdup(value);
        else if (!strcmp(name, "snapshots"))


@@ -55,6 +58,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);
                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;
        else if (!strcmp(name, "branch-sort")) {
                if (!strcmp(value, "age"))
                        repo->branch_sort = 1;


@@ -69,8 +74,8 @@ static void repo_config(struct cgit_repo *repo, const char *name, const char *va
                repo->max_stats = cgit_find_stats_period(value, NULL);
        else if (!strcmp(name, "module-link"))
                repo->module_link= xstrdup(value);
                repo->max_stats = cgit_find_stats_period(value, NULL);
        else if (!strcmp(name, "module-link"))
                repo->module_link= xstrdup(value);

-       else if (starts_with(name, "module-link.")) {
-               item = string_list_append(&repo->submodules, xstrdup(name + 12));
+       else if (skip_prefix(name, "module-link.", &path)) {
+               item = string_list_append(&repo->submodules, xstrdup(path));

                item->util = xstrdup(value);
        } else if (!strcmp(name, "section"))
                repo->section = xstrdup(value);
                item->util = xstrdup(value);
        } else if (!strcmp(name, "section"))
                repo->section = xstrdup(value);


@@ -82,6 +87,10 @@ static void repo_config(struct cgit_repo *repo, const char *name, const char *va
                repo->logo = xstrdup(value);
        else if (!strcmp(name, "logo-link") && value != NULL)
                repo->logo_link = xstrdup(value);
                repo->logo = xstrdup(value);
        else if (!strcmp(name, "logo-link") && value != NULL)
                repo->logo_link = xstrdup(value);

+       else if (!strcmp(name, "hide"))
+               repo->hide = atoi(value);
+       else if (!strcmp(name, "ignore"))
+               repo->ignore = atoi(value);

        else if (ctx.cfg.enable_filter_overrides) {
                if (!strcmp(name, "about-filter"))
                        repo->about_filter = cgit_new_filter(value, ABOUT);
        else if (ctx.cfg.enable_filter_overrides) {
                if (!strcmp(name, "about-filter"))
                        repo->about_filter = cgit_new_filter(value, ABOUT);


@@ -91,20 +100,24 @@ static void repo_config(struct cgit_repo *repo, const char *name, const char *va
                        repo->source_filter = cgit_new_filter(value, SOURCE);
                else if (!strcmp(name, "email-filter"))
                        repo->email_filter = cgit_new_filter(value, EMAIL);
                        repo->source_filter = cgit_new_filter(value, SOURCE);
                else if (!strcmp(name, "email-filter"))
                        repo->email_filter = cgit_new_filter(value, EMAIL);

+               else if (!strcmp(name, "owner-filter"))
+                       repo->owner_filter = cgit_new_filter(value, OWNER);

        }
 }
 
 static void config_cb(const char *name, const char *value)
 {
        }
 }
 
 static void config_cb(const char *name, const char *value)
 {

+       const char *arg;
+

        if (!strcmp(name, "section") || !strcmp(name, "repo.group"))
                ctx.cfg.section = xstrdup(value);
        else if (!strcmp(name, "repo.url"))
                ctx.repo = cgit_add_repo(value);
        else if (ctx.repo && !strcmp(name, "repo.path"))
                ctx.repo->path = trim_end(value, '/');
        if (!strcmp(name, "section") || !strcmp(name, "repo.group"))
                ctx.cfg.section = xstrdup(value);
        else if (!strcmp(name, "repo.url"))
                ctx.repo = cgit_add_repo(value);
        else if (ctx.repo && !strcmp(name, "repo.path"))
                ctx.repo->path = trim_end(value, '/');

-       else if (ctx.repo && starts_with(name, "repo."))
-               repo_config(ctx.repo, name + 5, value);
-       else if (!strcmp(name, "readme") && value != NULL)
+       else if (ctx.repo && skip_prefix(name, "repo.", &arg))
+               repo_config(ctx.repo, arg, value);
+       else if (!strcmp(name, "readme"))

                string_list_append(&ctx.cfg.readme, xstrdup(value));
        else if (!strcmp(name, "root-title"))
                ctx.cfg.root_title = xstrdup(value);
                string_list_append(&ctx.cfg.readme, xstrdup(value));
        else if (!strcmp(name, "root-title"))
                ctx.cfg.root_title = xstrdup(value);


@@ -146,12 +159,16 @@ static void config_cb(const char *name, const char *value)
                ctx.cfg.snapshots = cgit_parse_snapshots_mask(value);
        else if (!strcmp(name, "enable-filter-overrides"))
                ctx.cfg.enable_filter_overrides = atoi(value);
                ctx.cfg.snapshots = cgit_parse_snapshots_mask(value);
        else if (!strcmp(name, "enable-filter-overrides"))
                ctx.cfg.enable_filter_overrides = atoi(value);

+       else if (!strcmp(name, "enable-follow-links"))
+               ctx.cfg.enable_follow_links = atoi(value);

        else if (!strcmp(name, "enable-http-clone"))
                ctx.cfg.enable_http_clone = atoi(value);
        else if (!strcmp(name, "enable-index-links"))
                ctx.cfg.enable_index_links = atoi(value);
        else if (!strcmp(name, "enable-index-owner"))
                ctx.cfg.enable_index_owner = atoi(value);
        else if (!strcmp(name, "enable-http-clone"))
                ctx.cfg.enable_http_clone = atoi(value);
        else if (!strcmp(name, "enable-index-links"))
                ctx.cfg.enable_index_links = atoi(value);
        else if (!strcmp(name, "enable-index-owner"))
                ctx.cfg.enable_index_owner = atoi(value);

+       else if (!strcmp(name, "enable-blame"))
+               ctx.cfg.enable_blame = atoi(value);

        else if (!strcmp(name, "enable-commit-graph"))
                ctx.cfg.enable_commit_graph = atoi(value);
        else if (!strcmp(name, "enable-log-filecount"))
        else if (!strcmp(name, "enable-commit-graph"))
                ctx.cfg.enable_commit_graph = atoi(value);
        else if (!strcmp(name, "enable-log-filecount"))


@@ -162,6 +179,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);
                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"))
        else if (!strcmp(name, "enable-tree-linenumbers"))
                ctx.cfg.enable_tree_linenumbers = atoi(value);
        else if (!strcmp(name, "enable-git-config"))


@@ -194,6 +213,8 @@ static void config_cb(const char *name, const char *value)
                ctx.cfg.commit_filter = cgit_new_filter(value, COMMIT);
        else if (!strcmp(name, "email-filter"))
                ctx.cfg.email_filter = cgit_new_filter(value, EMAIL);
                ctx.cfg.commit_filter = cgit_new_filter(value, COMMIT);
        else if (!strcmp(name, "email-filter"))
                ctx.cfg.email_filter = cgit_new_filter(value, EMAIL);

+       else if (!strcmp(name, "owner-filter"))
+               ctx.cfg.owner_filter = cgit_new_filter(value, OWNER);

        else if (!strcmp(name, "auth-filter"))
                ctx.cfg.auth_filter = cgit_new_filter(value, AUTH);
        else if (!strcmp(name, "embedded"))
        else if (!strcmp(name, "auth-filter"))
                ctx.cfg.auth_filter = cgit_new_filter(value, AUTH);
        else if (!strcmp(name, "embedded"))


@@ -237,7 +258,7 @@ static void config_cb(const char *name, const char *value)
        else if (!strcmp(name, "summary-tags"))
                ctx.cfg.summary_tags = atoi(value);
        else if (!strcmp(name, "side-by-side-diffs"))
        else if (!strcmp(name, "summary-tags"))
                ctx.cfg.summary_tags = atoi(value);
        else if (!strcmp(name, "side-by-side-diffs"))

-               ctx.cfg.ssdiff = atoi(value);
+               ctx.cfg.difftype = atoi(value) ? DIFF_SSDIFF : DIFF_UNIFIED;

        else if (!strcmp(name, "agefile"))
                ctx.cfg.agefile = xstrdup(value);
        else if (!strcmp(name, "mimetype-file"))
        else if (!strcmp(name, "agefile"))
                ctx.cfg.agefile = xstrdup(value);
        else if (!strcmp(name, "mimetype-file"))


@@ -264,8 +285,8 @@ static void config_cb(const char *name, const char *value)
                        ctx.cfg.branch_sort = 1;
                if (!strcmp(value, "name"))
                        ctx.cfg.branch_sort = 0;
                        ctx.cfg.branch_sort = 1;
                if (!strcmp(value, "name"))
                        ctx.cfg.branch_sort = 0;

-       } else if (starts_with(name, "mimetype."))
-               add_mimetype(name + 9, value);
+       } else if (skip_prefix(name, "mimetype.", &arg))
+               add_mimetype(arg, value);

        else if (!strcmp(name, "include"))
                parse_configfile(expand_macros(value), config_cb);
 }
        else if (!strcmp(name, "include"))
                parse_configfile(expand_macros(value), config_cb);
 }


@@ -304,23 +325,27 @@ static void querystring_cb(const char *name, const char *value)
                ctx.qry.path = trim_end(value, '/');
        } else if (!strcmp(name, "name")) {
                ctx.qry.name = xstrdup(value);
                ctx.qry.path = trim_end(value, '/');
        } else if (!strcmp(name, "name")) {
                ctx.qry.name = xstrdup(value);

-       } else if (!strcmp(name, "mimetype")) {
-               ctx.qry.mimetype = xstrdup(value);

        } else if (!strcmp(name, "s")) {
                ctx.qry.sort = xstrdup(value);
        } else if (!strcmp(name, "showmsg")) {
                ctx.qry.showmsg = atoi(value);
        } else if (!strcmp(name, "period")) {
                ctx.qry.period = xstrdup(value);
        } else if (!strcmp(name, "s")) {
                ctx.qry.sort = xstrdup(value);
        } else if (!strcmp(name, "showmsg")) {
                ctx.qry.showmsg = atoi(value);
        } else if (!strcmp(name, "period")) {
                ctx.qry.period = xstrdup(value);

+       } else if (!strcmp(name, "dt")) {
+               ctx.qry.difftype = atoi(value);
+               ctx.qry.has_difftype = 1;

        } else if (!strcmp(name, "ss")) {
        } else if (!strcmp(name, "ss")) {

-               ctx.qry.ssdiff = atoi(value);
-               ctx.qry.has_ssdiff = 1;
+               /* No longer generated, but there may be links out there. */
+               ctx.qry.difftype = atoi(value) ? DIFF_SSDIFF : DIFF_UNIFIED;
+               ctx.qry.has_difftype = 1;

        } else if (!strcmp(name, "all")) {
                ctx.qry.show_all = atoi(value);
        } else if (!strcmp(name, "context")) {
                ctx.qry.context = atoi(value);
        } else if (!strcmp(name, "ignorews")) {
                ctx.qry.ignorews = atoi(value);
        } else if (!strcmp(name, "all")) {
                ctx.qry.show_all = atoi(value);
        } else if (!strcmp(name, "context")) {
                ctx.qry.context = atoi(value);
        } else if (!strcmp(name, "ignorews")) {
                ctx.qry.ignorews = atoi(value);

+       } else if (!strcmp(name, "follow")) {
+               ctx.qry.follow = atoi(value);

        }
 }
 
        }
 }
 


@@ -372,7 +397,7 @@ static void prepare_context(void)
        ctx.cfg.summary_log = 10;
        ctx.cfg.summary_tags = 10;
        ctx.cfg.max_atom_items = 10;
        ctx.cfg.summary_log = 10;
        ctx.cfg.summary_tags = 10;
        ctx.cfg.max_atom_items = 10;

-       ctx.cfg.ssdiff = 0;
+       ctx.cfg.difftype = DIFF_UNIFIED;

        ctx.env.cgit_config = getenv("CGIT_CONFIG");
        ctx.env.http_host = getenv("HTTP_HOST");
        ctx.env.https = getenv("HTTPS");
        ctx.env.cgit_config = getenv("CGIT_CONFIG");
        ctx.env.http_host = getenv("HTTP_HOST");
        ctx.env.https = getenv("HTTPS");


@@ -409,7 +434,7 @@ struct refmatch {
        int match;
 };
 
        int match;
 };
 

-static int find_current_ref(const char *refname, const unsigned char *sha1,
+static int find_current_ref(const char *refname, const struct object_id *oid,

                            int flags, void *cb_data)
 {
        struct refmatch *info;
                            int flags, void *cb_data)
 {
        struct refmatch *info;


@@ -450,14 +475,15 @@ static char *find_default_branch(struct cgit_repo *repo)
 
 static char *guess_defbranch(void)
 {
 
 static char *guess_defbranch(void)
 {

-       const char *ref;
-       unsigned char sha1[20];
+       const char *ref, *refname;
+       struct object_id oid;

 
 

-       ref = resolve_ref_unsafe("HEAD", sha1, 0, NULL);
-       if (!ref || !starts_with(ref, "refs/heads/"))
+       ref = resolve_ref_unsafe("HEAD", 0, &oid, NULL);
+       if (!ref || !skip_prefix(ref, "refs/heads/", &refname))

                return "master";
                return "master";

-       return xstrdup(ref + 11);
+       return xstrdup(refname);

 }
 }

+

 /* 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)
 {
 /* 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)
 {


@@ -504,12 +530,6 @@ static void choose_readme(struct cgit_repo *repo)
                        free(ref);
                        continue;
                }
                        free(ref);
                        continue;
                }

-               /* If there's only one item, we skip the possibly expensive
-                * selection process. */
-               if (repo->readme.nr == 1) {
-                       found = 1;
-                       break;
-               }

                if (ref) {
                        if (cgit_ref_path_exists(filename, ref, 1)) {
                                found = 1;
                if (ref) {
                        if (cgit_ref_path_exists(filename, ref, 1)) {
                                found = 1;


@@ -530,12 +550,19 @@ static void choose_readme(struct cgit_repo *repo)
                string_list_append(&repo->readme, filename)->util = ref;
 }
 
                string_list_append(&repo->readme, filename)->util = ref;
 }
 

-static int prepare_repo_cmd(void)
+static void print_no_repo_clone_urls(const char *url)

 {
 {

-       unsigned char sha1[20];
-       int nongit = 0;
-       int rc;
+        html("<tr><td><a rel='vcs-git' href='");
+        html_url_path(url);
+        html("' title='");
+        html_attr(ctx.repo->name);
+        html(" Git repository'>");
+        html_txt(url);
+        html("</a></td></tr>\n");
+}

 
 

+static void prepare_repo_env(int *nongit)
+{

        /* The path to the git repository. */
        setenv("GIT_DIR", ctx.repo->path, 1);
 
        /* The path to the git repository. */
        setenv("GIT_DIR", ctx.repo->path, 1);
 


@@ -548,8 +575,13 @@ static int prepare_repo_cmd(void)
        /* Setup the git directory and initialize the notes system. Both of these
         * load local configuration from the git repository, so we do them both while
         * the HOME variables are unset. */
        /* Setup the git directory and initialize the notes system. Both of these
         * load local configuration from the git repository, so we do them both while
         * the HOME variables are unset. */

-       setup_git_directory_gently(&nongit);
+       setup_git_directory_gently(nongit);

        init_display_notes(NULL);
        init_display_notes(NULL);

+}
+static int prepare_repo_cmd(int nongit)
+{
+       struct object_id oid;
+       int rc;

 
        if (nongit) {
                const char *name = ctx.repo->name;
 
        if (nongit) {
                const char *name = ctx.repo->name;


@@ -580,24 +612,25 @@ static int prepare_repo_cmd(void)
                cgit_print_docstart();
                cgit_print_pageheader();
                cgit_print_error("Repository seems to be empty");
                cgit_print_docstart();
                cgit_print_pageheader();
                cgit_print_error("Repository seems to be empty");

+               if (!strcmp(ctx.qry.page, "summary")) {
+                       html("<table class='list'><tr class='nohover'><td>&nbsp;</td></tr><tr class='nohover'><th class='left'>Clone</th></tr>\n");
+                       cgit_prepare_repo_env(ctx.repo);
+                       cgit_add_clone_urls(print_no_repo_clone_urls);
+                       html("</table>\n");
+               }

                cgit_print_docend();
                return 1;
        }
 
                cgit_print_docend();
                return 1;
        }
 

-       if (get_sha1(ctx.qry.head, sha1)) {
-               char *tmp = xstrdup(ctx.qry.head);
-               ctx.qry.head = ctx.repo->defbranch;
-               ctx.page.status = 404;
-               ctx.page.statusmsg = "Not found";
-               cgit_print_http_headers();
-               cgit_print_docstart();
-               cgit_print_pageheader();
-               cgit_print_error("Invalid branch: %s", tmp);
-               cgit_print_docend();
-               free(tmp);
+       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", old_head);
+               free(old_head);

                return 1;
        }
                return 1;
        }

-       sort_string_list(&ctx.repo->submodules);
+       string_list_sort(&ctx.repo->submodules);

        cgit_prepare_repo_env(ctx.repo);
        choose_readme(ctx.repo);
        return 0;
        cgit_prepare_repo_env(ctx.repo);
        choose_readme(ctx.repo);
        return 0;


@@ -629,7 +662,7 @@ static inline void open_auth_filter(const char *function)
 static inline void authenticate_post(void)
 {
        char buffer[MAX_AUTHENTICATION_POST_BYTES];
 static inline void authenticate_post(void)
 {
        char buffer[MAX_AUTHENTICATION_POST_BYTES];

-       int len;
+       unsigned int len;

 
        open_auth_filter("authenticate-post");
        len = ctx.env.content_length;
 
        open_auth_filter("authenticate-post");
        len = ctx.env.content_length;


@@ -668,6 +701,7 @@ static inline void authenticate_cookie(void)
 static void process_request(void)
 {
        struct cgit_cmd *cmd;
 static void process_request(void)
 {
        struct cgit_cmd *cmd;

+       int nongit = 0;

 
        /* If we're not yet authenticated, no matter what page we're on,
         * display the authentication body from the auth_filter. This should
 
        /* If we're not yet authenticated, no matter what page we're on,
         * display the authentication body from the auth_filter. This should


@@ -683,21 +717,25 @@ static void process_request(void)
                return;
        }
 
                return;
        }
 

+       if (ctx.repo)
+               prepare_repo_env(&nongit);
+

        cmd = cgit_get_cmd();
        if (!cmd) {
                ctx.page.title = "cgit error";
        cmd = cgit_get_cmd();
        if (!cmd) {
                ctx.page.title = "cgit error";

-               ctx.page.status = 404;
-               ctx.page.statusmsg = "Not found";
-               cgit_print_http_headers();
-               cgit_print_docstart();
-               cgit_print_pageheader();
-               cgit_print_error("Invalid request");
-               cgit_print_docend();
+               cgit_print_error_page(404, "Not found", "Invalid request");

                return;
        }
 
        if (!ctx.cfg.enable_http_clone && cmd->is_clone) {
                return;
        }
 
        if (!ctx.cfg.enable_http_clone && cmd->is_clone) {

-               html_status(404, "Not found", 0);
+               ctx.page.title = "cgit error";
+               cgit_print_error_page(404, "Not found", "Invalid request");
+               return;
+       }
+
+       if (cmd->want_repo && !ctx.repo) {
+               cgit_print_error_page(400, "Bad request",
+                               "No repository selected");

                return;
        }
 
                return;
        }
 


@@ -707,28 +745,10 @@ static void process_request(void)
         */
        ctx.qry.vpath = cmd->want_vpath ? ctx.qry.path : NULL;
 
         */
        ctx.qry.vpath = cmd->want_vpath ? ctx.qry.path : NULL;
 

-       if (cmd->want_repo && !ctx.repo) {
-               cgit_print_http_headers();
-               cgit_print_docstart();
-               cgit_print_pageheader();
-               cgit_print_error("No repository selected");
-               cgit_print_docend();
-               return;
-       }
-
-       if (ctx.repo && prepare_repo_cmd())
+       if (ctx.repo && prepare_repo_cmd(nongit))

                return;
 
                return;
 

-       if (cmd->want_layout) {
-               cgit_print_http_headers();
-               cgit_print_docstart();
-               cgit_print_pageheader();
-       }
-

        cmd->fn();
        cmd->fn();

-
-       if (cmd->want_layout)
-               cgit_print_docend();

 }
 
 static int cmp_repos(const void *a, const void *b)
 }
 
 static int cmp_repos(const void *a, const void *b)


@@ -786,6 +806,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);
                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",
        if (repo->clone_url)
                fprintf(f, "repo.clone-url=%s\n", repo->clone_url);
        fprintf(f, "repo.enable-commit-graph=%d\n",


@@ -802,6 +824,8 @@ static void print_repo(FILE *f, struct cgit_repo *repo)
                cgit_fprintf_filter(repo->source_filter, f, "repo.source-filter=");
        if (repo->email_filter && repo->email_filter != ctx.cfg.email_filter)
                cgit_fprintf_filter(repo->email_filter, f, "repo.email-filter=");
                cgit_fprintf_filter(repo->source_filter, f, "repo.source-filter=");
        if (repo->email_filter && repo->email_filter != ctx.cfg.email_filter)
                cgit_fprintf_filter(repo->email_filter, f, "repo.email-filter=");

+       if (repo->owner_filter && repo->owner_filter != ctx.cfg.owner_filter)
+               cgit_fprintf_filter(repo->owner_filter, f, "repo.owner-filter=");

        if (repo->snapshots != ctx.cfg.snapshots) {
                char *tmp = build_snapshot_setting(repo->snapshots);
                fprintf(f, "repo.snapshots=%s\n", tmp ? tmp : "");
        if (repo->snapshots != ctx.cfg.snapshots) {
                char *tmp = build_snapshot_setting(repo->snapshots);
                fprintf(f, "repo.snapshots=%s\n", tmp ? tmp : "");


@@ -816,6 +840,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.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) {
        if (repo->branch_sort == 1)
                fprintf(f, "repo.branch-sort=age\n");
        if (repo->commit_sort) {


@@ -824,6 +849,8 @@ static void print_repo(FILE *f, struct cgit_repo *repo)
                else if (repo->commit_sort == 2)
                        fprintf(f, "repo.commit-sort=topo\n");
        }
                else if (repo->commit_sort == 2)
                        fprintf(f, "repo.commit-sort=topo\n");
        }

+       fprintf(f, "repo.hide=%d\n", repo->hide);
+       fprintf(f, "repo.ignore=%d\n", repo->ignore);

        fprintf(f, "\n");
 }
 
        fprintf(f, "\n");
 }
 


@@ -921,11 +948,12 @@ out:
 static void cgit_parse_args(int argc, const char **argv)
 {
        int i;
 static void cgit_parse_args(int argc, const char **argv)
 {
        int i;

+       const char *arg;

        int scan = 0;
 
        for (i = 1; i < argc; i++) {
                if (!strcmp(argv[i], "--version")) {
        int scan = 0;
 
        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
 #ifdef NO_LUA
                        printf("[-] ");
 #else


@@ -941,28 +969,28 @@ static void cgit_parse_args(int argc, const char **argv)
 
                        exit(0);
                }
 
                        exit(0);
                }

-               if (starts_with(argv[i], "--cache=")) {
-                       ctx.cfg.cache_root = xstrdup(argv[i] + 8);
+               if (skip_prefix(argv[i], "--cache=", &arg)) {
+                       ctx.cfg.cache_root = xstrdup(arg);

                } else if (!strcmp(argv[i], "--nocache")) {
                        ctx.cfg.nocache = 1;
                } else if (!strcmp(argv[i], "--nohttp")) {
                        ctx.env.no_http = "1";
                } else if (!strcmp(argv[i], "--nocache")) {
                        ctx.cfg.nocache = 1;
                } else if (!strcmp(argv[i], "--nohttp")) {
                        ctx.env.no_http = "1";

-               } else if (starts_with(argv[i], "--query=")) {
-                       ctx.qry.raw = xstrdup(argv[i] + 8);
-               } else if (starts_with(argv[i], "--repo=")) {
-                       ctx.qry.repo = xstrdup(argv[i] + 7);
-               } else if (starts_with(argv[i], "--page=")) {
-                       ctx.qry.page = xstrdup(argv[i] + 7);
-               } else if (starts_with(argv[i], "--head=")) {
-                       ctx.qry.head = xstrdup(argv[i] + 7);
+               } else if (skip_prefix(argv[i], "--query=", &arg)) {
+                       ctx.qry.raw = xstrdup(arg);
+               } else if (skip_prefix(argv[i], "--repo=", &arg)) {
+                       ctx.qry.repo = xstrdup(arg);
+               } else if (skip_prefix(argv[i], "--page=", &arg)) {
+                       ctx.qry.page = xstrdup(arg);
+               } else if (skip_prefix(argv[i], "--head=", &arg)) {
+                       ctx.qry.head = xstrdup(arg);

                        ctx.qry.has_symref = 1;
                        ctx.qry.has_symref = 1;

-               } else if (starts_with(argv[i], "--sha1=")) {
-                       ctx.qry.sha1 = xstrdup(argv[i] + 7);
+               } else if (skip_prefix(argv[i], "--sha1=", &arg)) {
+                       ctx.qry.sha1 = xstrdup(arg);

                        ctx.qry.has_sha1 = 1;
                        ctx.qry.has_sha1 = 1;

-               } else if (starts_with(argv[i], "--ofs=")) {
-                       ctx.qry.ofs = atoi(argv[i] + 6);
-               } else if (starts_with(argv[i], "--scan-tree=") ||
-                          starts_with(argv[i], "--scan-path=")) {
+               } else if (skip_prefix(argv[i], "--ofs=", &arg)) {
+                       ctx.qry.ofs = atoi(arg);
+               } else if (skip_prefix(argv[i], "--scan-tree=", &arg) ||
+                          skip_prefix(argv[i], "--scan-path=", &arg)) {

                        /*
                         * HACK: The global snapshot bit mask defines the set
                         * of allowed snapshot formats, but the config file
                        /*
                         * HACK: The global snapshot bit mask defines the set
                         * of allowed snapshot formats, but the config file


@@ -976,7 +1004,7 @@ static void cgit_parse_args(int argc, const char **argv)
                         */
                        ctx.cfg.snapshots = 0xFF;
                        scan++;
                         */
                        ctx.cfg.snapshots = 0xFF;
                        scan++;

-                       scan_tree(argv[i] + 12, repo_config);
+                       scan_tree(arg, repo_config);

                }
        }
        if (scan) {
                }
        }
        if (scan) {


@@ -987,7 +1015,7 @@ static void cgit_parse_args(int argc, const char **argv)
        }
 }
 
        }
 }
 

-static int calc_ttl()
+static int calc_ttl(void)

 {
        if (!ctx.repo)
                return ctx.cfg.cache_root_ttl;
 {
        if (!ctx.repo)
                return ctx.cfg.cache_root_ttl;


@@ -1010,7 +1038,7 @@ static int calc_ttl()
        return ctx.cfg.cache_repo_ttl;
 }
 
        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;
 {
        const char *path;
        int err, ttl;