log: allow users to follow a file

[ps-cgit] / shared.c

diff --git a/shared.c b/shared.c
index 8c3d18a8879ede816a7c8b191938d78a41d7a58d..0431b59baf519442e80fbbed13df4ea3bdb56097 100644 (file)
--- a/shared.c
+++ b/shared.c
@@ -1,6 +1,6 @@
 /* shared.c: global vars + some callback functions
  *
 /* shared.c: global vars + some callback functions
  *

- * Copyright (C) 2006 Lars Hjemli
+ * Copyright (C) 2006-2014 cgit Development Team <cgit@lists.zx2c4.com>

  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)
  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)


@@ -8,7 +8,6 @@
 
 #include "cgit.h"
 #include <stdio.h>
 
 #include "cgit.h"
 #include <stdio.h>

-#include <linux/limits.h>

 
 struct cgit_repolist cgit_repolist;
 struct cgit_context ctx;
 
 struct cgit_repolist cgit_repolist;
 struct cgit_context ctx;


@@ -16,24 +15,25 @@ struct cgit_context ctx;
 int chk_zero(int result, char *msg)
 {
        if (result != 0)
 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)
        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)
 {
        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;
 }
 
        return result;
 }
 

+char *cgit_default_repo_desc = "[no description]";

 struct cgit_repo *cgit_add_repo(const char *url)
 {
        struct cgit_repo *ret;
 struct cgit_repo *cgit_add_repo(const char *url)
 {
        struct cgit_repo *ret;


@@ -53,10 +53,9 @@ struct cgit_repo *cgit_add_repo(const char *url)
        ret->url = trim_end(url, '/');
        ret->name = ret->url;
        ret->path = NULL;
        ret->url = trim_end(url, '/');
        ret->name = ret->url;
        ret->path = NULL;

-       ret->desc = "[no description]";
+       ret->desc = cgit_default_repo_desc;

        ret->owner = NULL;
        ret->section = ctx.cfg.section;
        ret->owner = NULL;
        ret->section = ctx.cfg.section;

-       ret->defbranch = "master";

        ret->snapshots = ctx.cfg.snapshots;
        ret->enable_commit_graph = ctx.cfg.enable_commit_graph;
        ret->enable_log_filecount = ctx.cfg.enable_log_filecount;
        ret->snapshots = ctx.cfg.snapshots;
        ret->enable_commit_graph = ctx.cfg.enable_commit_graph;
        ret->enable_log_filecount = ctx.cfg.enable_log_filecount;


@@ -64,12 +63,19 @@ 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->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;
        ret->mtime = -1;
        ret->about_filter = ctx.cfg.about_filter;
        ret->commit_filter = ctx.cfg.commit_filter;
        ret->source_filter = ctx.cfg.source_filter;
        ret->module_link = ctx.cfg.module_link;
        ret->readme = ctx.cfg.readme;
        ret->mtime = -1;
        ret->about_filter = ctx.cfg.about_filter;
        ret->commit_filter = ctx.cfg.commit_filter;
        ret->source_filter = ctx.cfg.source_filter;

+       ret->email_filter = ctx.cfg.email_filter;
+       ret->owner_filter = ctx.cfg.owner_filter;
+       ret->clone_url = ctx.cfg.clone_url;
+       ret->submodules.strdup_strings = 1;
+       ret->hide = ret->ignore = 0;

        return ret;
 }
 
        return ret;
 }
 


@@ -78,8 +84,10 @@ struct cgit_repo *cgit_get_repoinfo(const char *url)
        int i;
        struct cgit_repo *repo;
 
        int i;
        struct cgit_repo *repo;
 

-       for (i=0; i<cgit_repolist.count; i++) {
+       for (i = 0; i < cgit_repolist.count; i++) {

                repo = &cgit_repolist.repos[i];
                repo = &cgit_repolist.repos[i];

+               if (repo->ignore)
+                       continue;

                if (!strcmp(repo->url, url))
                        return repo;
        }
                if (!strcmp(repo->url, url))
                        return repo;
        }


@@ -102,23 +110,36 @@ void *cgit_free_commitinfo(struct commitinfo *info)
 char *trim_end(const char *str, char c)
 {
        int len;
 char *trim_end(const char *str, char c)
 {
        int len;

-       char *s, *t;

 
        if (str == NULL)
                return NULL;
 
        if (str == NULL)
                return NULL;

-       t = (char *)str;
-       len = strlen(t);
-       while(len > 0 && t[len - 1] == c)
+       len = strlen(str);
+       while (len > 0 && str[len - 1] == c)

                len--;
                len--;

-

        if (len == 0)
                return NULL;
        if (len == 0)
                return NULL;

+       return xstrndup(str, len);
+}
+
+char *ensure_end(const char *str, char c)
+{
+       size_t len = strlen(str);
+       char *result;

 
 

-       c = t[len];
-       t[len] = '\0';
-       s = xstrdup(t);
-       t[len] = c;
-       return s;
+       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 *strlpart(char *txt, int maxlen)


@@ -164,13 +185,13 @@ void cgit_add_ref(struct reflist *list, struct refinfo *ref)
        list->refs[list->count++] = 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 struct object_id *oid)

 {
        struct refinfo *ref;
 
        ref = xmalloc(sizeof (struct refinfo));
        ref->refname = xstrdup(refname);
 {
        struct refinfo *ref;
 
        ref = xmalloc(sizeof (struct refinfo));
        ref->refname = xstrdup(refname);

-       ref->object = parse_object(sha1);
+       ref->object = parse_object(oid->hash);

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


@@ -182,11 +203,47 @@ struct refinfo *cgit_mk_refinfo(const char *refname, const unsigned char *sha1)
        return ref;
 }
 
        return ref;
 }
 

-int cgit_refs_cb(const char *refname, const unsigned char *sha1, int flags,
+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 struct object_id *oid, int flags,

                  void *cb_data)
 {
        struct reflist *list = (struct reflist *)cb_data;
                  void *cb_data)
 {
        struct reflist *list = (struct reflist *)cb_data;

-       struct refinfo *info = cgit_mk_refinfo(refname, sha1);
+       struct refinfo *info = cgit_mk_refinfo(refname, oid);

 
        if (info)
                cgit_add_ref(list, info);
 
        if (info)
                cgit_add_ref(list, info);


@@ -213,7 +270,7 @@ static int load_mmfile(mmfile_t *file, const unsigned char *sha1)
                file->ptr = (char *)"";
                file->size = 0;
        } else {
                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;
                                           (unsigned long *)&file->size);
        }
        return 1;


@@ -227,10 +284,10 @@ static int load_mmfile(mmfile_t *file, const unsigned char *sha1)
  * ripped from git and modified to use globals instead of
  * a special callback-struct.
  */
  * ripped from git and modified to use globals instead of
  * a special callback-struct.
  */

-char *diffbuf = NULL;
-int buflen = 0;
+static char *diffbuf = NULL;
+static 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;
 
 {
        int i;
 


@@ -313,9 +370,9 @@ void cgit_diff_tree(const unsigned char *old_sha1,
                    filepair_fn fn, const char *prefix, int ignorews)
 {
        struct diff_options opt;
                    filepair_fn fn, const char *prefix, int ignorews)
 {
        struct diff_options opt;

-       int ret;
-       int prefixlen;
+       struct pathspec_item item;

 
 

+       memset(&item, 0, sizeof(item));

        diff_setup(&opt);
        opt.output_format = DIFF_FORMAT_CALLBACK;
        opt.detect_rename = 1;
        diff_setup(&opt);
        opt.output_format = DIFF_FORMAT_CALLBACK;
        opt.detect_rename = 1;


@@ -326,17 +383,17 @@ void cgit_diff_tree(const unsigned char *old_sha1,
        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) {

-               opt.nr_paths = 1;
-               opt.paths = &prefix;
-               prefixlen = strlen(prefix);
-               opt.pathlens = &prefixlen;
+               item.match = 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_setup_done(&opt);
 
        if (old_sha1 && !is_null_sha1(old_sha1))

-               ret = diff_tree_sha1(old_sha1, new_sha1, "", &opt);
+               diff_tree_sha1(old_sha1, new_sha1, "", &opt);

        else
        else

-               ret = diff_root_tree_sha1(new_sha1, "", &opt);
+               diff_root_tree_sha1(new_sha1, "", &opt);

        diffcore_std(&opt);
        diff_flush(&opt);
 }
        diffcore_std(&opt);
        diff_flush(&opt);
 }


@@ -353,28 +410,29 @@ void cgit_diff_commit(struct commit *commit, filepair_fn fn, const char *prefix)
 
 int cgit_parse_snapshots_mask(const char *str)
 {
 
 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;
        const struct cgit_snapshot_format *f;

-       static const char *delim = " \t,:/|;";
-       int tl, sl, rv = 0;
+       int rv = 0;

 
        /* favor legacy setting */
 
        /* favor legacy setting */

-       if(atoi(str))
+       if (atoi(str))

                return 1;
                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++) {
                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;
                        }
                }
                                rv |= f->bit;
                                break;
                        }
                }

-               str += tl;

        }
        }

+
+       string_list_clear(&tokens, 0);

        return rv;
 }
 
        return rv;
 }
 


@@ -383,7 +441,8 @@ typedef struct {
        char * value;
 } cgit_env_var;
 
        char * value;
 } cgit_env_var;
 

-static char * prepare_env(struct cgit_repo * repo) {
+void cgit_prepare_repo_env(struct cgit_repo * repo)
+{

        cgit_env_var env_vars[] = {
                { .name = "CGIT_REPO_URL", .value = repo->url },
                { .name = "CGIT_REPO_NAME", .value = repo->name },
        cgit_env_var env_vars[] = {
                { .name = "CGIT_REPO_URL", .value = repo->url },
                { .name = "CGIT_REPO_NAME", .value = repo->name },


@@ -394,97 +453,14 @@ static char * prepare_env(struct cgit_repo * repo) {
                { .name = "CGIT_REPO_CLONE_URL", .value = repo->clone_url }
        };
        int env_var_count = ARRAY_SIZE(env_vars);
                { .name = "CGIT_REPO_CLONE_URL", .value = repo->clone_url }
        };
        int env_var_count = ARRAY_SIZE(env_vars);

-       long values_space = (env_var_count * (PATH_MAX + 64));
-
-       void * buffer;
-       char ** vars;
-       char * values;
-       int vars_index = 0;
-       unsigned int chars_printed;
-
-       /* Allocate buffer for environment variables: first in the buffer is an
-        * array of pointers to argument strings, terminated with a NULL pointer.
-        * After that the argument strings are placed after each other */
-       buffer = malloc(((env_var_count + 1) * sizeof(char *)) + values_space);
-       if (!buffer)
-               return NULL;
-
-       vars = buffer;
-       values = (char *) &vars[env_var_count + 1];
-
-       /* loop over all defined environment variables and their values */
-       while (vars_index < env_var_count) {
-               char * name = env_vars[vars_index].name;
-               char * value = env_vars[vars_index].value;
-
-               if (!value)
-                       value = "";
-
-               chars_printed = snprintf(values, (values_space - 1), "%s=%s", name,
-                               value);
-               if (chars_printed > (values_space - 1)) {
-                       /* Buffer space exhausted: stop adding variables.
-                        * Not all environment variables are defined, but the best we can
-                        * do is to provide the ones that _are_ defined */
-                       break;
-               }
-
-               values[chars_printed] = '\0';
-               *&vars[vars_index] = values;
-               values += (chars_printed + 1);
-               values_space -= (chars_printed + 1);
-               vars_index++;
-       }
-
-       /* terminate the array with pointers */
-       *&vars[vars_index] = NULL;
-
-       return (char *) buffer;
-}
-
-int cgit_open_filter(struct cgit_filter *filter, struct cgit_repo * repo)
-{
-
-       filter->old_stdout = chk_positive(dup(STDOUT_FILENO),
-               "Unable to duplicate STDOUT");
-       chk_zero(pipe(filter->pipe_fh), "Unable to create pipe to subprocess");
-       filter->pid = chk_non_negative(fork(), "Unable to create subprocess");
-       if (filter->pid == 0) {
-               char * env = NULL;
-
-               close(filter->pipe_fh[1]);
-               chk_non_negative(dup2(filter->pipe_fh[0], STDIN_FILENO),
-                       "Unable to use pipe as STDIN");
-
-               if (repo)
-                       env = prepare_env(repo);
-
-               execve(filter->cmd, filter->argv, (char **)env);
-
-               if (env)
-                       free(env);
-
-               die("Unable to exec subprocess %s: %s (%d)", filter->cmd,
-                       strerror(errno), errno);
-       }
-       close(filter->pipe_fh[0]);
-       chk_non_negative(dup2(filter->pipe_fh[1], STDOUT_FILENO),
-               "Unable to use pipe as STDOUT");
-       close(filter->pipe_fh[1]);
-       return 0;
-}
-
-int cgit_close_filter(struct cgit_filter *filter)
-{
-       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))
-               return 0;
-       die("Subprocess %s exited abnormally", filter->cmd);
+       cgit_env_var *p, *q;
+       static char *warn = "cgit warning: failed to set env: %s=%s\n";
+
+       p = env_vars;
+       q = p + env_var_count;
+       for (; p < q; p++)
+               if (p->value && setenv(p->name, p->value, 1))
+                       fprintf(stderr, warn, p->name, p->value);

 }
 
 /* Read the content of the specified file into a newly allocated buffer,
 }
 
 /* Read the content of the specified file into a newly allocated buffer,


@@ -515,14 +491,14 @@ int readfile(const char *path, char **buf, size_t *size)
        return (*size == st.st_size ? 0 : e);
 }
 
        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
  */
 {
        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;
 {
        char *value;
        int len;