Diffstat (limited to 'shared.c')
| -rw-r--r-- | shared.c | 134 |
1 files changed, 71 insertions, 63 deletions
@@ -6,8 +6,6 @@ * (see COPYING for full license text) */ -#define USE_THE_REPOSITORY_VARIABLE - #include "cgit.h" struct cgit_repolist cgit_repolist; @@ -52,18 +50,14 @@ struct cgit_repo *cgit_add_repo(const char *url) ret = &cgit_repolist.repos[cgit_repolist.count-1]; memset(ret, 0, sizeof(struct cgit_repo)); ret->url = trim_end(url, '/'); - *strchrnul(ret->url, '\n') = '\0'; 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->enable_blame = ctx.cfg.enable_blame; ret->enable_commit_graph = ctx.cfg.enable_commit_graph; - ret->enable_follow_links = ctx.cfg.enable_follow_links; 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; @@ -101,7 +95,7 @@ struct cgit_repo *cgit_get_repoinfo(const char *url) return NULL; } -void cgit_free_commitinfo(struct commitinfo *info) +void *cgit_free_commitinfo(struct commitinfo *info) { free(info->author); free(info->author_email); @@ -111,6 +105,7 @@ void cgit_free_commitinfo(struct commitinfo *info) free(info->msg); free(info->msg_encoding); free(info); + return NULL; } char *trim_end(const char *str, char c) @@ -148,6 +143,37 @@ void strbuf_ensure_end(struct strbuf *sb, char c) strbuf_addch(sb, c); } +char *strlpart(char *txt, int maxlen) +{ + char *result; + + if (!txt) + return txt; + + 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'; + return result; +} + +char *strrpart(char *txt, int maxlen) +{ + 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; +} + void cgit_add_ref(struct reflist *list, struct refinfo *ref) { size_t size; @@ -166,7 +192,7 @@ static struct refinfo *cgit_mk_refinfo(const char *refname, const struct object_ ref = xmalloc(sizeof (struct refinfo)); ref->refname = xstrdup(refname); - ref->object = parse_object(the_repository, oid); + ref->object = parse_object(oid->hash); switch (ref->object->type) { case OBJ_TAG: ref->tag = cgit_parse_tag((struct tag *)ref->object); @@ -178,7 +204,7 @@ static struct refinfo *cgit_mk_refinfo(const char *refname, const struct object_ return ref; } -void cgit_free_taginfo(struct taginfo *tag) +static void cgit_free_taginfo(struct taginfo *tag) { if (tag->tagger) free(tag->tagger); @@ -214,10 +240,11 @@ void cgit_free_reflist_inner(struct reflist *list) free(list->refs); } -int cgit_refs_cb(const struct reference *ref, void *cb_data) +int cgit_refs_cb(const char *refname, const struct object_id *oid, int flags, + void *cb_data) { struct reflist *list = (struct reflist *)cb_data; - struct refinfo *info = cgit_mk_refinfo(ref->name, ref->oid); + struct refinfo *info = cgit_mk_refinfo(refname, oid); if (info) cgit_add_ref(list, info); @@ -236,15 +263,15 @@ void cgit_diff_tree_cb(struct diff_queue_struct *q, } } -static int load_mmfile(mmfile_t *file, const struct object_id *oid) +static int load_mmfile(mmfile_t *file, const unsigned char *sha1) { enum object_type type; - if (is_null_oid(oid)) { + if (is_null_sha1(sha1)) { file->ptr = (char *)""; file->size = 0; } else { - file->ptr = odb_read_object(the_repository->objects, oid, &type, + file->ptr = read_sha1_file(sha1, &type, (unsigned long *)&file->size); } return 1; @@ -295,8 +322,8 @@ static int filediff_cb(void *priv, mmbuffer_t *mb, int nbuf) return 0; } -int cgit_diff_files(const struct object_id *old_oid, - const struct object_id *new_oid, unsigned long *old_size, +int cgit_diff_files(const unsigned char *old_sha1, + const unsigned char *new_sha1, unsigned long *old_size, unsigned long *new_size, int *binary, int context, int ignorews, linediff_fn fn) { @@ -305,7 +332,7 @@ int cgit_diff_files(const struct object_id *old_oid, xdemitconf_t emit_params; xdemitcb_t emit_cb; - if (!load_mmfile(&file1, old_oid) || !load_mmfile(&file2, new_oid)) + if (!load_mmfile(&file1, old_sha1) || !load_mmfile(&file2, new_sha1)) return 1; *old_size = file1.size; @@ -329,7 +356,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; - emit_cb.out_line = filediff_cb; + emit_cb.outf = filediff_cb; emit_cb.priv = fn; xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb); if (file1.size) @@ -339,46 +366,46 @@ int cgit_diff_files(const struct object_id *old_oid, return 0; } -void cgit_diff_tree(const struct object_id *old_oid, - const struct object_id *new_oid, +void cgit_diff_tree(const unsigned char *old_sha1, + const unsigned char *new_sha1, filepair_fn fn, const char *prefix, int ignorews) { struct diff_options opt; - struct pathspec_item *item; + struct pathspec_item item; - repo_diff_setup(the_repository, &opt); + memset(&item, 0, sizeof(item)); + diff_setup(&opt); opt.output_format = DIFF_FORMAT_CALLBACK; opt.detect_rename = 1; opt.rename_limit = ctx.cfg.renamelimit; - opt.flags.recursive = 1; + DIFF_OPT_SET(&opt, RECURSIVE); if (ignorews) DIFF_XDL_SET(&opt, IGNORE_WHITESPACE); opt.format_callback = cgit_diff_tree_cb; opt.format_callback_data = fn; if (prefix) { - item = xcalloc(1, sizeof(*item)); - item->match = xstrdup(prefix); - item->len = strlen(prefix); + item.match = prefix; + item.len = strlen(prefix); opt.pathspec.nr = 1; - opt.pathspec.items = item; + opt.pathspec.items = &item; } diff_setup_done(&opt); - if (old_oid && !is_null_oid(old_oid)) - diff_tree_oid(old_oid, new_oid, "", &opt); + if (old_sha1 && !is_null_sha1(old_sha1)) + diff_tree_sha1(old_sha1, new_sha1, "", &opt); else - diff_root_tree_oid(new_oid, "", &opt); + diff_root_tree_sha1(new_sha1, "", &opt); diffcore_std(&opt); diff_flush(&opt); } void cgit_diff_commit(struct commit *commit, filepair_fn fn, const char *prefix) { - const struct object_id *old_oid = NULL; + unsigned char *old_sha1 = NULL; if (commit->parents) - old_oid = &commit->parents->item->object.oid; - cgit_diff_tree(old_oid, &commit->object.oid, fn, prefix, + old_sha1 = commit->parents->item->object.oid.hash; + cgit_diff_tree(old_sha1, commit->object.oid.hash, fn, prefix, ctx.qry.ignorews); } @@ -393,17 +420,14 @@ int cgit_parse_snapshots_mask(const char *str) if (atoi(str)) return 1; - if (strcmp(str, "all") == 0) - return INT_MAX; - - string_list_split(&tokens, str, " ", -1); + 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++) { if (!strcmp(item->string, f->suffix) || !strcmp(item->string, f->suffix + 1)) { - rv |= cgit_snapshot_format_bit(f); + rv |= f->bit; break; } } @@ -441,10 +465,9 @@ void cgit_prepare_repo_env(struct cgit_repo * repo) } /* Read the content of the specified file into a newly allocated buffer, - * zeroterminate the buffer, truncate at a new line, and return 0 on success, - * errno otherwise. + * zeroterminate the buffer and return 0 on success, errno otherwise. */ -int read_first_line(const char *path, char **buf, size_t *size) +int readfile(const char *path, char **buf, size_t *size) { int fd, e; struct stat st; @@ -465,18 +488,10 @@ int read_first_line(const char *path, char **buf, size_t *size) *size = read_in_full(fd, *buf, st.st_size); e = errno; (*buf)[*size] = '\0'; - *strchrnul(*buf, '\n') = '\0'; close(fd); return (*size == st.st_size ? 0 : e); } -char *strdup_first_line(const char *txt) -{ - char *t = xstrdup(txt); - *strchrnul(t, '\n') = '\0'; - return t; -} - static int is_token_char(char c) { return isalnum(c) || c == '_'; @@ -487,16 +502,15 @@ static int is_token_char(char c) static char *expand_macro(char *name, int maxlength) { char *value; - size_t len; + int len; len = 0; value = getenv(name); if (value) { - len = strlen(value) + 1; + len = strlen(value); if (len > maxlength) len = maxlength; - strlcpy(name, value, len); - --len; + strncpy(name, value, len); } return name + len; } @@ -551,10 +565,7 @@ char *expand_macros(const char *txt) char *get_mimetype_for_filename(const char *filename) { - const char *ext; - char *mimetype, line[1024]; - struct string_list list = STRING_LIST_INIT_NODUP; - int i; + char *ext, *mimetype, *token, line[1024], *saveptr; FILE *file; struct string_list_item *mime; @@ -579,16 +590,13 @@ char *get_mimetype_for_filename(const char *filename) 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)) { + mimetype = strtok_r(line, " \t\r\n", &saveptr); + while ((token = strtok_r(NULL, " \t\r\n", &saveptr))) { + if (!strcasecmp(ext, token)) { fclose(file); return xstrdup(mimetype); } } - string_list_clear(&list, 0); } fclose(file); return NULL; |