fix building with clang

[ps-cgit] / shared.c

diff --git a/shared.c b/shared.c
index 225ce1541ff723081fd73147e1dddfce7fb5dee7..26b6ddb3297470e4dc4480fac541978f7d813990 100644 (file)
--- a/shared.c
+++ b/shared.c
@@ -53,14 +53,18 @@ 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->owner = NULL;

+       ret->homepage = NULL;

        ret->section = ctx.cfg.section;
        ret->snapshots = ctx.cfg.snapshots;
        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_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->branch_sort = ctx.cfg.branch_sort;
        ret->commit_sort = ctx.cfg.commit_sort;
        ret->max_stats = ctx.cfg.max_stats;
        ret->branch_sort = ctx.cfg.branch_sort;
        ret->commit_sort = ctx.cfg.commit_sort;


@@ -93,7 +97,7 @@ struct cgit_repo *cgit_get_repoinfo(const char *url)
        return NULL;
 }
 
        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);


@@ -103,7 +107,6 @@ 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)
 }
 
 char *trim_end(const char *str, char c)


@@ -141,37 +144,6 @@ void strbuf_ensure_end(struct strbuf *sb, char c)
                strbuf_addch(sb, 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;
 void cgit_add_ref(struct reflist *list, struct refinfo *ref)
 {
        size_t size;


@@ -190,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->hash);
+       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);


@@ -202,7 +174,7 @@ static struct refinfo *cgit_mk_refinfo(const char *refname, const struct object_
        return ref;
 }
 
        return ref;
 }
 

-static void cgit_free_taginfo(struct taginfo *tag)
+void cgit_free_taginfo(struct taginfo *tag)

 {
        if (tag->tagger)
                free(tag->tagger);
 {
        if (tag->tagger)
                free(tag->tagger);


@@ -261,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;


@@ -320,8 +292,8 @@ static 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)
 {


@@ -330,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;


@@ -354,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)


@@ -364,46 +336,46 @@ 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;

-       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;

-       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) {

-               item.match = 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);
 

-       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
        else

-               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);
 }
 
                       ctx.qry.ignorews);
 }
 


@@ -418,6 +390,9 @@ int cgit_parse_snapshots_mask(const char *str)
        if (atoi(str))
                return 1;
 
        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);
 
        string_list_split(&tokens, str, ' ', -1);
        string_list_remove_empty_items(&tokens, 0);
 


@@ -425,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;
                        }
                }


@@ -500,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;
 }


@@ -563,49 +539,44 @@ char *expand_macros(const char *txt)
 
 char *get_mimetype_for_filename(const char *filename)
 {
 
 char *get_mimetype_for_filename(const char *filename)
 {

-       static const char *delimiters;
-       char *ext = NULL, *iterate, *mimetype = NULL, *token;
-       char line[1024];
-       FILE *fd;
+       char *ext, *mimetype, line[1024];
+       struct string_list list = STRING_LIST_INIT_NODUP;
+       int i;
+       FILE *file;

        struct string_list_item *mime;
 
        struct string_list_item *mime;
 

-       if (filename == NULL)
+       if (!filename)

                return NULL;
 
        ext = strrchr(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 (ext && *(++ext)) {
-               mime = string_list_lookup(&ctx.cfg.mimetypes, ext);
-               if (mime) {
-                       /* We could just pass the pointer here, but would have to care
-                        * whether or not to free the memory. Instead just dup. */
-                       mimetype = xstrdup(mime->util);
-               } else if (ctx.cfg.mimetype_file != NULL) {
-                       fd = fopen(ctx.cfg.mimetype_file, "r");
-                       if (fd == NULL)
-                               return NULL;
-
-                       delimiters = " \t\r\n";
-
-                       /* loop over all lines in the file */
-                       while (mimetype == NULL && fgets(line, sizeof(line), fd)) {
-                               iterate = strtok(line, delimiters);
-
-                               /* skip empty lines and comment lines */
-                               if (iterate == NULL || (iterate[0] == '#'))
-                                       continue;
-
-                               /* loop over all extensions of mimetype */
-                               while ((token = strtok(NULL, delimiters))) {
-                                       if (strcasecmp(ext, token) == 0) {
-                                               mimetype = xstrdup(iterate);
-                                               break;
-                                       }
-                               }
+       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);

                        }
                        }

-                       fclose(fd);

                }
                }

+               string_list_clear(&list, 0);

        }
        }

-
-       return mimetype;
+       fclose(file);
+       return NULL;

 }
 }