*/
#include "cgit.h"
-#include <stdio.h>
struct cgit_repolist cgit_repolist;
struct cgit_context ctx;
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_commit_graph = ctx.cfg.enable_commit_graph;
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->branch_sort = ctx.cfg.branch_sort;
ret->commit_sort = ctx.cfg.commit_sort;
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->msg);
free(info->msg_encoding);
free(info);
- return NULL;
}
char *trim_end(const char *str, 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;
ref = xmalloc(sizeof (struct refinfo));
ref->refname = xstrdup(refname);
- ref->object = parse_object(oid->hash);
+ ref->object = parse_object(oid);
switch (ref->object->type) {
case OBJ_TAG:
ref->tag = cgit_parse_tag((struct tag *)ref->object);
return ref;
}
-static void cgit_free_taginfo(struct taginfo *tag)
+void cgit_free_taginfo(struct taginfo *tag)
{
if (tag->tagger)
free(tag->tagger);
return 0;
}
-static void cgit_diff_tree_cb(struct diff_queue_struct *q,
- struct diff_options *options, void *data)
+void cgit_diff_tree_cb(struct diff_queue_struct *q,
+ struct diff_options *options, void *data)
{
int i;
}
}
-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;
- if (is_null_sha1(sha1)) {
+ if (is_null_oid(oid)) {
file->ptr = (char *)"";
file->size = 0;
} else {
- file->ptr = read_sha1_file(sha1, &type,
+ file->ptr = read_object_file(oid, &type,
(unsigned long *)&file->size);
}
return 1;
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)
{
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 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;
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) {
- item.match = prefix;
+ item.match = xstrdup(prefix);
item.len = strlen(prefix);
opt.pathspec.nr = 1;
opt.pathspec.items = &item;
}
diff_setup_done(&opt);
- if (old_sha1 && !is_null_sha1(old_sha1))
- 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
- diff_root_tree_sha1(new_sha1, "", &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)
{
- unsigned char *old_sha1 = NULL;
+ const struct object_id *old_oid = NULL;
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);
}
if (atoi(str))
return 1;
+ if (strcmp(str, "all") == 0)
+ return INT_MAX;
+
string_list_split(&tokens, str, ' ', -1);
string_list_remove_empty_items(&tokens, 0);
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;
}
}
static char *expand_macro(char *name, int maxlength)
{
char *value;
- int len;
+ size_t len;
len = 0;
value = getenv(name);
if (value) {
- len = strlen(value);
+ len = strlen(value) + 1;
if (len > maxlength)
len = maxlength;
- strncpy(name, value, len);
+ strlcpy(name, value, len);
+ --len;
}
return name + len;
}
}
return result;
}
+
+char *get_mimetype_for_filename(const char *filename)
+{
+ char *ext, *mimetype, *token, line[1024], *saveptr;
+ 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;
+ 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);
+ }
+ }
+ }
+ fclose(file);
+ return NULL;
+}