X-Git-Url: https://git.cameronkatri.com/cgit.git/blobdiff_plain/bfc14d067da0fdf65f306fcd9a65829d9694dbeb..b67ea0c0222d5b7eb4f65413047138e72055d8c5:/shared.c diff --git a/shared.c b/shared.c index 0967f92..6259d75 100644 --- a/shared.c +++ b/shared.c @@ -1,6 +1,6 @@ /* shared.c: global vars + some callback functions * - * Copyright (C) 2006 Lars Hjemli + * Copyright (C) 2006-2014 cgit Development Team * * Licensed under GNU General Public License v2 * (see COPYING for full license text) @@ -15,21 +15,21 @@ struct cgit_context ctx; 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) - die("%s: %s", msg, strerror(errno)); + die_errno("%s", 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; } @@ -63,6 +63,7 @@ struct cgit_repo *cgit_add_repo(const char *url) ret->enable_remote_branches = ctx.cfg.enable_remote_branches; ret->enable_subject_links = ctx.cfg.enable_subject_links; 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; @@ -80,7 +81,7 @@ struct cgit_repo *cgit_get_repoinfo(const char *url) int i; struct cgit_repo *repo; - for (i=0; iurl, url)) return repo; @@ -108,13 +109,34 @@ char *trim_end(const char *str, char c) if (str == NULL) return NULL; len = strlen(str); - while(len > 0 && str[len - 1] == c) + while (len > 0 && str[len - 1] == c) len--; if (len == 0) return NULL; return xstrndup(str, len); } +char *ensure_end(const char *str, char c) +{ + size_t len = strlen(str); + char *result; + + if (len && str[len - 1] == c) + return xstrndup(str, len); + + result = xmalloc(len + 2); + memcpy(result, str, len); + result[len] = '/'; + result[len + 1] = '\0'; + return result; +} + +void strbuf_ensure_end(struct strbuf *sb, char c) +{ + if (!sb->len || sb->buf[sb->len - 1] != c) + strbuf_addch(sb, c); +} + char *strlpart(char *txt, int maxlen) { char *result; @@ -158,7 +180,7 @@ void cgit_add_ref(struct reflist *list, struct refinfo *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 unsigned char *sha1) { struct refinfo *ref; @@ -176,6 +198,42 @@ struct refinfo *cgit_mk_refinfo(const char *refname, const unsigned char *sha1) return ref; } +static 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 unsigned char *sha1, int flags, void *cb_data) { @@ -187,8 +245,8 @@ int cgit_refs_cb(const char *refname, const unsigned char *sha1, int flags, return 0; } -void cgit_diff_tree_cb(struct diff_queue_struct *q, - struct diff_options *options, void *data) +static void cgit_diff_tree_cb(struct diff_queue_struct *q, + struct diff_options *options, void *data) { int i; @@ -207,7 +265,7 @@ static int load_mmfile(mmfile_t *file, const unsigned char *sha1) file->ptr = (char *)""; file->size = 0; } else { - file->ptr = read_sha1_file(sha1, &type, + file->ptr = read_sha1_file(sha1, &type, (unsigned long *)&file->size); } return 1; @@ -224,7 +282,7 @@ static int load_mmfile(mmfile_t *file, const unsigned char *sha1) char *diffbuf = NULL; 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; @@ -346,28 +404,29 @@ void cgit_diff_commit(struct commit *commit, filepair_fn fn, const char *prefix) 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; - static const char *delim = " \t,:/|;"; - int tl, sl, rv = 0; + int rv = 0; /* favor legacy setting */ - if(atoi(str)) + if (atoi(str)) return 1; - for(;;) { - str += strspn(str,delim); - tl = strcspn(str,delim); - if (!tl) - break; + + 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++) { - sl = strlen(f->suffix); - if((tl == sl && !strncmp(f->suffix, str, tl)) || - (tl == sl-1 && !strncmp(f->suffix+1, str, tl-1))) { + if (!strcmp(item->string, f->suffix) || + !strcmp(item->string, f->suffix + 1)) { rv |= f->bit; break; } } - str += tl; } + + string_list_clear(&tokens, 0); return rv; } @@ -400,7 +459,6 @@ void cgit_prepare_repo_env(struct cgit_repo * repo) 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"); @@ -410,8 +468,7 @@ int cgit_open_filter(struct cgit_filter *filter) 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); + die_errno("Unable to exec subprocess %s", filter->cmd); } close(filter->pipe_fh[0]); chk_non_negative(dup2(filter->pipe_fh[1], STDOUT_FILENO), @@ -422,13 +479,15 @@ int cgit_open_filter(struct cgit_filter *filter) int cgit_close_filter(struct cgit_filter *filter) { + int exit_status; + 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)) + waitpid(filter->pid, &exit_status, 0); + if (WIFEXITED(exit_status) && !WEXITSTATUS(exit_status)) return 0; die("Subprocess %s exited abnormally", filter->cmd); } @@ -461,14 +520,14 @@ int readfile(const char *path, char **buf, size_t *size) 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 */ -char *expand_macro(char *name, int maxlength) +static char *expand_macro(char *name, int maxlength) { char *value; int len;