git: update to v2.44.0

[ps-cgit] / shared.c

diff --git a/shared.c b/shared.c
index 7ec2e19296e2bfbc7226849163b8bdb05bb56e94..26b6ddb3297470e4dc4480fac541978f7d813990 100644 (file)
--- a/shared.c
+++ b/shared.c
@@ -1,6 +1,6 @@
 /* shared.c: global vars + some callback functions
  *
 /* shared.c: global vars + some callback functions
  *

- * Copyright (C) 2006 Lars Hjemli
+ * Copyright (C) 2006-2014 cgit Development Team <cgit@lists.zx2c4.com>

  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)
  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)


@@ -14,24 +14,25 @@ struct cgit_context ctx;
 int chk_zero(int result, char *msg)
 {
        if (result != 0)
 int chk_zero(int result, char *msg)
 {
        if (result != 0)

-               die("%s: %s", msg, strerror(errno));
+               die_errno("%s", msg);

        return result;
 }
 
 int chk_positive(int result, char *msg)
 {
        if (result <= 0)
        return result;
 }
 
 int chk_positive(int result, char *msg)
 {
        if (result <= 0)

-               die("%s: %s", msg, strerror(errno));
+               die_errno("%s", msg);

        return result;
 }
 
 int chk_non_negative(int result, char *msg)
 {
        return result;
 }
 
 int chk_non_negative(int result, char *msg)
 {

-       if (result < 0)
-               die("%s: %s",msg, strerror(errno));
+       if (result < 0)
+               die_errno("%s", msg);

        return result;
 }
 
        return result;
 }
 

+char *cgit_default_repo_desc = "[no description]";

 struct cgit_repo *cgit_add_repo(const char *url)
 {
        struct cgit_repo *ret;
 struct cgit_repo *cgit_add_repo(const char *url)
 {
        struct cgit_repo *ret;


@@ -51,23 +52,33 @@ struct cgit_repo *cgit_add_repo(const char *url)
        ret->url = trim_end(url, '/');
        ret->name = ret->url;
        ret->path = NULL;
        ret->url = trim_end(url, '/');
        ret->name = ret->url;
        ret->path = NULL;

-       ret->desc = "[no description]";
+       ret->desc = cgit_default_repo_desc;
+       ret->extra_head_content = NULL;

        ret->owner = NULL;
        ret->owner = NULL;

+       ret->homepage = NULL;

        ret->section = ctx.cfg.section;
        ret->section = ctx.cfg.section;

-       ret->defbranch = "master";

        ret->snapshots = ctx.cfg.snapshots;
        ret->snapshots = ctx.cfg.snapshots;

+       ret->enable_blame = ctx.cfg.enable_blame;

        ret->enable_commit_graph = ctx.cfg.enable_commit_graph;
        ret->enable_log_filecount = ctx.cfg.enable_log_filecount;
        ret->enable_log_linecount = ctx.cfg.enable_log_linecount;
        ret->enable_remote_branches = ctx.cfg.enable_remote_branches;
        ret->enable_subject_links = ctx.cfg.enable_subject_links;
        ret->enable_commit_graph = ctx.cfg.enable_commit_graph;
        ret->enable_log_filecount = ctx.cfg.enable_log_filecount;
        ret->enable_log_linecount = ctx.cfg.enable_log_linecount;
        ret->enable_remote_branches = ctx.cfg.enable_remote_branches;
        ret->enable_subject_links = ctx.cfg.enable_subject_links;

+       ret->enable_html_serving = ctx.cfg.enable_html_serving;

        ret->max_stats = ctx.cfg.max_stats;
        ret->max_stats = ctx.cfg.max_stats;

+       ret->branch_sort = ctx.cfg.branch_sort;
+       ret->commit_sort = ctx.cfg.commit_sort;

        ret->module_link = ctx.cfg.module_link;
        ret->readme = ctx.cfg.readme;
        ret->mtime = -1;
        ret->about_filter = ctx.cfg.about_filter;
        ret->commit_filter = ctx.cfg.commit_filter;
        ret->source_filter = ctx.cfg.source_filter;
        ret->module_link = ctx.cfg.module_link;
        ret->readme = ctx.cfg.readme;
        ret->mtime = -1;
        ret->about_filter = ctx.cfg.about_filter;
        ret->commit_filter = ctx.cfg.commit_filter;
        ret->source_filter = ctx.cfg.source_filter;

+       ret->email_filter = ctx.cfg.email_filter;
+       ret->owner_filter = ctx.cfg.owner_filter;
+       ret->clone_url = ctx.cfg.clone_url;
+       ret->submodules.strdup_strings = 1;
+       ret->hide = ret->ignore = 0;

        return ret;
 }
 
        return ret;
 }
 


@@ -76,15 +87,17 @@ struct cgit_repo *cgit_get_repoinfo(const char *url)
        int i;
        struct cgit_repo *repo;
 
        int i;
        struct cgit_repo *repo;
 

-       for (i=0; i<cgit_repolist.count; i++) {
+       for (i = 0; i < cgit_repolist.count; i++) {

                repo = &cgit_repolist.repos[i];
                repo = &cgit_repolist.repos[i];

+               if (repo->ignore)
+                       continue;

                if (!strcmp(repo->url, url))
                        return repo;
        }
        return NULL;
 }
 
                if (!strcmp(repo->url, url))
                        return repo;
        }
        return NULL;
 }
 

-void *cgit_free_commitinfo(struct commitinfo *info)
+void cgit_free_commitinfo(struct commitinfo *info)

 {
        free(info->author);
        free(info->author_email);
 {
        free(info->author);
        free(info->author_email);


@@ -94,60 +107,41 @@ void *cgit_free_commitinfo(struct commitinfo *info)
        free(info->msg);
        free(info->msg_encoding);
        free(info);
        free(info->msg);
        free(info->msg_encoding);
        free(info);

-       return NULL;

 }
 
 char *trim_end(const char *str, char c)
 {
        int len;
 }
 
 char *trim_end(const char *str, char c)
 {
        int len;

-       char *s, *t;

 
        if (str == NULL)
                return NULL;
 
        if (str == NULL)
                return NULL;

-       t = (char *)str;
-       len = strlen(t);
-       while(len > 0 && t[len - 1] == c)
+       len = strlen(str);
+       while (len > 0 && str[len - 1] == c)

                len--;
                len--;

-

        if (len == 0)
                return NULL;
        if (len == 0)
                return NULL;

-
-       c = t[len];
-       t[len] = '\0';
-       s = xstrdup(t);
-       t[len] = c;
-       return s;
+       return xstrndup(str, len);

 }
 
 }
 

-char *strlpart(char *txt, int maxlen)
+char *ensure_end(const char *str, char c)

 {
 {

+       size_t len = strlen(str);

        char *result;
 
        char *result;
 

-       if (!txt)
-               return txt;
+       if (len && str[len - 1] == c)
+               return xstrndup(str, len);

 
 

-       if (strlen(txt) <= maxlen)
-               return txt;
-       result = xmalloc(maxlen + 1);
-       memcpy(result, txt, maxlen - 3);
-       result[maxlen-1] = result[maxlen-2] = result[maxlen-3] = '.';
-       result[maxlen] = '\0';
+       result = xmalloc(len + 2);
+       memcpy(result, str, len);
+       result[len] = '/';
+       result[len + 1] = '\0';

        return result;
 }
 
        return result;
 }
 

-char *strrpart(char *txt, int maxlen)
+void strbuf_ensure_end(struct strbuf *sb, char c)

 {
 {

-       char *result;
-
-       if (!txt)
-               return txt;
-
-       if (strlen(txt) <= maxlen)
-               return txt;
-       result = xmalloc(maxlen + 1);
-       memcpy(result + 3, txt + strlen(txt) - maxlen + 4, maxlen - 3);
-       result[0] = result[1] = result[2] = '.';
-       return result;
+       if (!sb->len || sb->buf[sb->len - 1] != c)
+               strbuf_addch(sb, c);

 }
 
 void cgit_add_ref(struct reflist *list, struct refinfo *ref)
 }
 
 void cgit_add_ref(struct reflist *list, struct refinfo *ref)


@@ -162,13 +156,13 @@ void cgit_add_ref(struct reflist *list, struct refinfo *ref)
        list->refs[list->count++] = ref;
 }
 
        list->refs[list->count++] = ref;
 }
 

-struct refinfo *cgit_mk_refinfo(const char *refname, const unsigned char *sha1)
+static struct refinfo *cgit_mk_refinfo(const char *refname, const struct object_id *oid)

 {
        struct refinfo *ref;
 
        ref = xmalloc(sizeof (struct refinfo));
        ref->refname = xstrdup(refname);
 {
        struct refinfo *ref;
 
        ref = xmalloc(sizeof (struct refinfo));
        ref->refname = xstrdup(refname);

-       ref->object = parse_object(sha1);
+       ref->object = parse_object(the_repository, oid);

        switch (ref->object->type) {
        case OBJ_TAG:
                ref->tag = cgit_parse_tag((struct tag *)ref->object);
        switch (ref->object->type) {
        case OBJ_TAG:
                ref->tag = cgit_parse_tag((struct tag *)ref->object);


@@ -180,11 +174,47 @@ struct refinfo *cgit_mk_refinfo(const char *refname, const unsigned char *sha1)
        return ref;
 }
 
        return ref;
 }
 

-int cgit_refs_cb(const char *refname, const unsigned char *sha1, int flags,
+void cgit_free_taginfo(struct taginfo *tag)
+{
+       if (tag->tagger)
+               free(tag->tagger);
+       if (tag->tagger_email)
+               free(tag->tagger_email);
+       if (tag->msg)
+               free(tag->msg);
+       free(tag);
+}
+
+static void cgit_free_refinfo(struct refinfo *ref)
+{
+       if (ref->refname)
+               free((char *)ref->refname);
+       switch (ref->object->type) {
+       case OBJ_TAG:
+               cgit_free_taginfo(ref->tag);
+               break;
+       case OBJ_COMMIT:
+               cgit_free_commitinfo(ref->commit);
+               break;
+       }
+       free(ref);
+}
+
+void cgit_free_reflist_inner(struct reflist *list)
+{
+       int i;
+
+       for (i = 0; i < list->count; i++) {
+               cgit_free_refinfo(list->refs[i]);
+       }
+       free(list->refs);
+}
+
+int cgit_refs_cb(const char *refname, const struct object_id *oid, int flags,

                  void *cb_data)
 {
        struct reflist *list = (struct reflist *)cb_data;
                  void *cb_data)
 {
        struct reflist *list = (struct reflist *)cb_data;

-       struct refinfo *info = cgit_mk_refinfo(refname, sha1);
+       struct refinfo *info = cgit_mk_refinfo(refname, oid);

 
        if (info)
                cgit_add_ref(list, info);
 
        if (info)
                cgit_add_ref(list, info);


@@ -203,15 +233,15 @@ void cgit_diff_tree_cb(struct diff_queue_struct *q,
        }
 }
 
        }
 }
 

-static int load_mmfile(mmfile_t *file, const unsigned char *sha1)
+static int load_mmfile(mmfile_t *file, const struct object_id *oid)

 {
        enum object_type type;
 
 {
        enum object_type type;
 

-       if (is_null_sha1(sha1)) {
+       if (is_null_oid(oid)) {

                file->ptr = (char *)"";
                file->size = 0;
        } else {
                file->ptr = (char *)"";
                file->size = 0;
        } else {

-               file->ptr = read_sha1_file(sha1, &type, 
+               file->ptr = repo_read_object_file(the_repository, oid, &type,

                                           (unsigned long *)&file->size);
        }
        return 1;
                                           (unsigned long *)&file->size);
        }
        return 1;


@@ -225,10 +255,10 @@ static int load_mmfile(mmfile_t *file, const unsigned char *sha1)
  * ripped from git and modified to use globals instead of
  * a special callback-struct.
  */
  * ripped from git and modified to use globals instead of
  * a special callback-struct.
  */

-char *diffbuf = NULL;
-int buflen = 0;
+static char *diffbuf = NULL;
+static int buflen = 0;

 
 

-int filediff_cb(void *priv, mmbuffer_t *mb, int nbuf)
+static int filediff_cb(void *priv, mmbuffer_t *mb, int nbuf)

 {
        int i;
 
 {
        int i;
 


@@ -262,8 +292,8 @@ int filediff_cb(void *priv, mmbuffer_t *mb, int nbuf)
        return 0;
 }
 
        return 0;
 }
 

-int cgit_diff_files(const unsigned char *old_sha1,
-                   const unsigned char *new_sha1, unsigned long *old_size,
+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)
 {
                    unsigned long *new_size, int *binary, int context,
                    int ignorews, linediff_fn fn)
 {


@@ -272,7 +302,7 @@ int cgit_diff_files(const unsigned char *old_sha1,
        xdemitconf_t emit_params;
        xdemitcb_t emit_cb;
 
        xdemitconf_t emit_params;
        xdemitcb_t emit_cb;
 

-       if (!load_mmfile(&file1, old_sha1) || !load_mmfile(&file2, new_sha1))
+       if (!load_mmfile(&file1, old_oid) || !load_mmfile(&file2, new_oid))

                return 1;
 
        *old_size = file1.size;
                return 1;
 
        *old_size = file1.size;


@@ -296,7 +326,7 @@ int cgit_diff_files(const unsigned char *old_sha1,
                diff_params.flags |= XDF_IGNORE_WHITESPACE;
        emit_params.ctxlen = context > 0 ? context : 3;
        emit_params.flags = XDL_EMIT_FUNCNAMES;
                diff_params.flags |= XDF_IGNORE_WHITESPACE;
        emit_params.ctxlen = context > 0 ? context : 3;
        emit_params.flags = XDL_EMIT_FUNCNAMES;

-       emit_cb.outf = filediff_cb;
+       emit_cb.out_line = filediff_cb;

        emit_cb.priv = fn;
        xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb);
        if (file1.size)
        emit_cb.priv = fn;
        xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb);
        if (file1.size)


@@ -306,109 +336,105 @@ int cgit_diff_files(const unsigned char *old_sha1,
        return 0;
 }
 
        return 0;
 }
 

-void cgit_diff_tree(const unsigned char *old_sha1,
-                   const unsigned char *new_sha1,
+void cgit_diff_tree(const struct object_id *old_oid,
+                   const struct object_id *new_oid,

                    filepair_fn fn, const char *prefix, int ignorews)
 {
        struct diff_options opt;
                    filepair_fn fn, const char *prefix, int ignorews)
 {
        struct diff_options opt;

-       int ret;
-       int prefixlen;
+       struct pathspec_item *item;

 
 

-       diff_setup(&opt);
+       repo_diff_setup(the_repository, &opt);

        opt.output_format = DIFF_FORMAT_CALLBACK;
        opt.detect_rename = 1;
        opt.rename_limit = ctx.cfg.renamelimit;
        opt.output_format = DIFF_FORMAT_CALLBACK;
        opt.detect_rename = 1;
        opt.rename_limit = ctx.cfg.renamelimit;

-       DIFF_OPT_SET(&opt, RECURSIVE);
+       opt.flags.recursive = 1;

        if (ignorews)
                DIFF_XDL_SET(&opt, IGNORE_WHITESPACE);
        opt.format_callback = cgit_diff_tree_cb;
        opt.format_callback_data = fn;
        if (prefix) {
        if (ignorews)
                DIFF_XDL_SET(&opt, IGNORE_WHITESPACE);
        opt.format_callback = cgit_diff_tree_cb;
        opt.format_callback_data = fn;
        if (prefix) {

-               opt.nr_paths = 1;
-               opt.paths = &prefix;
-               prefixlen = strlen(prefix);
-               opt.pathlens = &prefixlen;
+               item = xcalloc(1, sizeof(*item));
+               item->match = xstrdup(prefix);
+               item->len = strlen(prefix);
+               opt.pathspec.nr = 1;
+               opt.pathspec.items = item;

        }
        diff_setup_done(&opt);
 
        }
        diff_setup_done(&opt);
 

-       if (old_sha1 && !is_null_sha1(old_sha1))
-               ret = diff_tree_sha1(old_sha1, new_sha1, "", &opt);
+       if (old_oid && !is_null_oid(old_oid))
+               diff_tree_oid(old_oid, new_oid, "", &opt);

        else
        else

-               ret = diff_root_tree_sha1(new_sha1, "", &opt);
+               diff_root_tree_oid(new_oid, "", &opt);

        diffcore_std(&opt);
        diff_flush(&opt);
 }
 
 void cgit_diff_commit(struct commit *commit, filepair_fn fn, const char *prefix)
 {
        diffcore_std(&opt);
        diff_flush(&opt);
 }
 
 void cgit_diff_commit(struct commit *commit, filepair_fn fn, const char *prefix)
 {

-       unsigned char *old_sha1 = NULL;
+       const struct object_id *old_oid = NULL;

 
        if (commit->parents)
 
        if (commit->parents)

-               old_sha1 = commit->parents->item->object.sha1;
-       cgit_diff_tree(old_sha1, commit->object.sha1, fn, prefix,
+               old_oid = &commit->parents->item->object.oid;
+       cgit_diff_tree(old_oid, &commit->object.oid, fn, prefix,

                       ctx.qry.ignorews);
 }
 
 int cgit_parse_snapshots_mask(const char *str)
 {
                       ctx.qry.ignorews);
 }
 
 int cgit_parse_snapshots_mask(const char *str)
 {

+       struct string_list tokens = STRING_LIST_INIT_DUP;
+       struct string_list_item *item;

        const struct cgit_snapshot_format *f;
        const struct cgit_snapshot_format *f;

-       static const char *delim = " \t,:/|;";
-       int tl, sl, rv = 0;
+       int rv = 0;

 
        /* favor legacy setting */
 
        /* favor legacy setting */

-       if(atoi(str))
+       if (atoi(str))

                return 1;
                return 1;

-       for(;;) {
-               str += strspn(str,delim);
-               tl = strcspn(str,delim);
-               if (!tl)
-                       break;
+
+       if (strcmp(str, "all") == 0)
+               return INT_MAX;
+
+       string_list_split(&tokens, str, ' ', -1);
+       string_list_remove_empty_items(&tokens, 0);
+
+       for_each_string_list_item(item, &tokens) {

                for (f = cgit_snapshot_formats; f->suffix; f++) {
                for (f = cgit_snapshot_formats; f->suffix; f++) {

-                       sl = strlen(f->suffix);
-                       if((tl == sl && !strncmp(f->suffix, str, tl)) ||
-                          (tl == sl-1 && !strncmp(f->suffix+1, str, tl-1))) {
-                               rv |= f->bit;
+                       if (!strcmp(item->string, f->suffix) ||
+                           !strcmp(item->string, f->suffix + 1)) {
+                               rv |= cgit_snapshot_format_bit(f);

                                break;
                        }
                }
                                break;
                        }
                }

-               str += tl;

        }
        }

+
+       string_list_clear(&tokens, 0);

        return rv;
 }
 
        return rv;
 }
 

-int cgit_open_filter(struct cgit_filter *filter)
-{
-
-       filter->old_stdout = chk_positive(dup(STDOUT_FILENO),
-               "Unable to duplicate STDOUT");
-       chk_zero(pipe(filter->pipe_fh), "Unable to create pipe to subprocess");
-       filter->pid = chk_non_negative(fork(), "Unable to create subprocess");
-       if (filter->pid == 0) {
-               close(filter->pipe_fh[1]);
-               chk_non_negative(dup2(filter->pipe_fh[0], STDIN_FILENO),
-                       "Unable to use pipe as STDIN");
-               execvp(filter->cmd, filter->argv);
-               die("Unable to exec subprocess %s: %s (%d)", filter->cmd,
-                       strerror(errno), errno);
-       }
-       close(filter->pipe_fh[0]);
-       chk_non_negative(dup2(filter->pipe_fh[1], STDOUT_FILENO),
-               "Unable to use pipe as STDOUT");
-       close(filter->pipe_fh[1]);
-       return 0;
-}
+typedef struct {
+       char * name;
+       char * value;
+} cgit_env_var;

 
 

-int cgit_close_filter(struct cgit_filter *filter)
+void cgit_prepare_repo_env(struct cgit_repo * repo)

 {
 {

-       chk_non_negative(dup2(filter->old_stdout, STDOUT_FILENO),
-               "Unable to restore STDOUT");
-       close(filter->old_stdout);
-       if (filter->pid < 0)
-               return 0;
-       waitpid(filter->pid, &filter->exitstatus, 0);
-       if (WIFEXITED(filter->exitstatus) && !WEXITSTATUS(filter->exitstatus))
-               return 0;
-       die("Subprocess %s exited abnormally", filter->cmd);
+       cgit_env_var env_vars[] = {
+               { .name = "CGIT_REPO_URL", .value = repo->url },
+               { .name = "CGIT_REPO_NAME", .value = repo->name },
+               { .name = "CGIT_REPO_PATH", .value = repo->path },
+               { .name = "CGIT_REPO_OWNER", .value = repo->owner },
+               { .name = "CGIT_REPO_DEFBRANCH", .value = repo->defbranch },
+               { .name = "CGIT_REPO_SECTION", .value = repo->section },
+               { .name = "CGIT_REPO_CLONE_URL", .value = repo->clone_url }
+       };
+       int env_var_count = ARRAY_SIZE(env_vars);
+       cgit_env_var *p, *q;
+       static char *warn = "cgit warning: failed to set env: %s=%s\n";
+
+       p = env_vars;
+       q = p + env_var_count;
+       for (; p < q; p++)
+               if (p->value && setenv(p->name, p->value, 1))
+                       fprintf(stderr, warn, p->name, p->value);

 }
 
 /* Read the content of the specified file into a newly allocated buffer,
 }
 
 /* Read the content of the specified file into a newly allocated buffer,


@@ -439,25 +465,26 @@ int readfile(const char *path, char **buf, size_t *size)
        return (*size == st.st_size ? 0 : e);
 }
 
        return (*size == st.st_size ? 0 : e);
 }
 

-int is_token_char(char c)
+static int is_token_char(char c)

 {
        return isalnum(c) || c == '_';
 }
 
 /* Replace name with getenv(name), return pointer to zero-terminating char
  */
 {
        return isalnum(c) || c == '_';
 }
 
 /* Replace name with getenv(name), return pointer to zero-terminating char
  */

-char *expand_macro(char *name, int maxlength)
+static char *expand_macro(char *name, int maxlength)

 {
        char *value;
 {
        char *value;

-       int len;
+       size_t len;

 
        len = 0;
        value = getenv(name);
        if (value) {
 
        len = 0;
        value = getenv(name);
        if (value) {

-               len = strlen(value);
+               len = strlen(value) + 1;

                if (len > maxlength)
                        len = maxlength;
                if (len > maxlength)
                        len = maxlength;

-               strncpy(name, value, len);
+               strlcpy(name, value, len);
+               --len;

        }
        return name + len;
 }
        }
        return name + len;
 }


@@ -509,3 +536,47 @@ char *expand_macros(const char *txt)
        }
        return result;
 }
        }
        return result;
 }

+
+char *get_mimetype_for_filename(const char *filename)
+{
+       char *ext, *mimetype, line[1024];
+       struct string_list list = STRING_LIST_INIT_NODUP;
+       int i;
+       FILE *file;
+       struct string_list_item *mime;
+
+       if (!filename)
+               return NULL;
+
+       ext = strrchr(filename, '.');
+       if (!ext)
+               return NULL;
+       ++ext;
+       if (!ext[0])
+               return NULL;
+       mime = string_list_lookup(&ctx.cfg.mimetypes, ext);
+       if (mime)
+               return xstrdup(mime->util);
+
+       if (!ctx.cfg.mimetype_file)
+               return NULL;
+       file = fopen(ctx.cfg.mimetype_file, "r");
+       if (!file)
+               return NULL;
+       while (fgets(line, sizeof(line), file)) {
+               if (!line[0] || line[0] == '#')
+                       continue;
+               string_list_split_in_place(&list, line, " \t\r\n", -1);
+               string_list_remove_empty_items(&list, 0);
+               mimetype = list.items[0].string;
+               for (i = 1; i < list.nr; i++) {
+                       if (!strcasecmp(ext, list.items[i].string)) {
+                               fclose(file);
+                               return xstrdup(mimetype);
+                       }
+               }
+               string_list_clear(&list, 0);
+       }
+       fclose(file);
+       return NULL;
+}