git: update to v2.44.0

[ps-cgit] / shared.c

diff --git a/shared.c b/shared.c
index 0a11e68aae4981cf9f972a0913ac2522014fe41a..26b6ddb3297470e4dc4480fac541978f7d813990 100644 (file)
--- a/shared.c
+++ b/shared.c
@@ -53,10 +53,12 @@ struct cgit_repo *cgit_add_repo(const char *url)
        ret->name = ret->url;
        ret->path = NULL;
        ret->desc = cgit_default_repo_desc;
        ret->name = ret->url;
        ret->path = NULL;
        ret->desc = cgit_default_repo_desc;

+       ret->extra_head_content = NULL;

        ret->owner = NULL;
        ret->homepage = NULL;
        ret->section = ctx.cfg.section;
        ret->snapshots = ctx.cfg.snapshots;
        ret->owner = NULL;
        ret->homepage = NULL;
        ret->section = ctx.cfg.section;
        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_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;


@@ -160,7 +162,7 @@ static struct refinfo *cgit_mk_refinfo(const char *refname, const struct object_
 
        ref = xmalloc(sizeof (struct refinfo));
        ref->refname = xstrdup(refname);
 
        ref = xmalloc(sizeof (struct refinfo));
        ref->refname = xstrdup(refname);

-       ref->object = parse_object(oid);
+       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);


@@ -239,7 +241,7 @@ static int load_mmfile(mmfile_t *file, const struct object_id *oid)
                file->ptr = (char *)"";
                file->size = 0;
        } else {
                file->ptr = (char *)"";
                file->size = 0;
        } else {

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

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


@@ -324,7 +326,7 @@ int cgit_diff_files(const struct object_id *old_oid,
                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)


@@ -339,10 +341,9 @@ void cgit_diff_tree(const struct object_id *old_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;

-       struct pathspec_item item;
+       struct pathspec_item *item;

 
 

-       memset(&item, 0, sizeof(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;


@@ -352,10 +353,11 @@ void cgit_diff_tree(const struct object_id *old_oid,
        opt.format_callback = cgit_diff_tree_cb;
        opt.format_callback_data = fn;
        if (prefix) {
        opt.format_callback = cgit_diff_tree_cb;
        opt.format_callback_data = fn;
        if (prefix) {

-               item.match = xstrdup(prefix);
-               item.len = strlen(prefix);
+               item = xcalloc(1, sizeof(*item));
+               item->match = xstrdup(prefix);
+               item->len = strlen(prefix);

                opt.pathspec.nr = 1;
                opt.pathspec.nr = 1;

-               opt.pathspec.items = &item;
+               opt.pathspec.items = item;

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


@@ -365,8 +367,6 @@ void cgit_diff_tree(const struct object_id *old_oid,
                diff_root_tree_oid(new_oid, "", &opt);
        diffcore_std(&opt);
        diff_flush(&opt);
                diff_root_tree_oid(new_oid, "", &opt);
        diffcore_std(&opt);
        diff_flush(&opt);

-
-       free(item.match);

 }
 
 void cgit_diff_commit(struct commit *commit, filepair_fn fn, const char *prefix)
 }
 
 void cgit_diff_commit(struct commit *commit, filepair_fn fn, const char *prefix)


@@ -400,7 +400,7 @@ int cgit_parse_snapshots_mask(const char *str)
                for (f = cgit_snapshot_formats; f->suffix; f++) {
                        if (!strcmp(item->string, f->suffix) ||
                            !strcmp(item->string, f->suffix + 1)) {
                for (f = cgit_snapshot_formats; f->suffix; f++) {
                        if (!strcmp(item->string, f->suffix) ||
                            !strcmp(item->string, f->suffix + 1)) {

-                               rv |= f->bit;
+                               rv |= cgit_snapshot_format_bit(f);

                                break;
                        }
                }
                                break;
                        }
                }


@@ -475,15 +475,16 @@ static int is_token_char(char c)
 static char *expand_macro(char *name, int maxlength)
 {
        char *value;
 static char *expand_macro(char *name, int maxlength)
 {
        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;
 }


@@ -538,7 +539,9 @@ char *expand_macros(const char *txt)
 
 char *get_mimetype_for_filename(const char *filename)
 {
 
 char *get_mimetype_for_filename(const char *filename)
 {

-       char *ext, *mimetype, *token, line[1024], *saveptr;
+       char *ext, *mimetype, line[1024];
+       struct string_list list = STRING_LIST_INIT_NODUP;
+       int i;

        FILE *file;
        struct string_list_item *mime;
 
        FILE *file;
        struct string_list_item *mime;
 


@@ -563,13 +566,16 @@ char *get_mimetype_for_filename(const char *filename)
        while (fgets(line, sizeof(line), file)) {
                if (!line[0] || line[0] == '#')
                        continue;
        while (fgets(line, sizeof(line), file)) {
                if (!line[0] || line[0] == '#')
                        continue;

-               mimetype = strtok_r(line, " \t\r\n", &saveptr);
-               while ((token = strtok_r(NULL, " \t\r\n", &saveptr))) {
-                       if (!strcasecmp(ext, token)) {
+               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);
                        }
                }
                                fclose(file);
                                return xstrdup(mimetype);
                        }
                }

+               string_list_clear(&list, 0);

        }
        fclose(file);
        return NULL;
        }
        fclose(file);
        return NULL;