log: allow users to follow a file

[ps-cgit] / ui-summary.c

diff --git a/ui-summary.c b/ui-summary.c
index 2f8a822ad5c1b5414b99ffeec2573669b2ba9a46..b0af0737a14762a808428829342ec42c3e6e743b 100644 (file)
--- a/ui-summary.c
+++ b/ui-summary.c
@@ -1,7 +1,6 @@
 /* ui-summary.c: functions for generating repo summary page
  *
 /* ui-summary.c: functions for generating repo summary page
  *

- * Copyright (C) 2006 Lars Hjemli
- * Copyright (C) 2010 Jason A. Donenfeld <Jason@zx2c4.com>
+ * 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)


@@ -13,35 +12,13 @@
 #include "ui-log.h"
 #include "ui-refs.h"
 #include "ui-blob.h"
 #include "ui-log.h"
 #include "ui-refs.h"
 #include "ui-blob.h"

+#include "ui-shared.h"
+#include <libgen.h>

 
 

-static void print_url(char *base, char *suffix)
-{
-       int columns = 3;
-       struct strbuf basebuf = STRBUF_INIT;
-
-       if (ctx.repo->enable_log_filecount)
-               columns++;
-       if (ctx.repo->enable_log_linecount)
-               columns++;
-
-       if (!base || !*base)
-               return;
-       if (suffix && *suffix) {
-               strbuf_addf(&basebuf, "%s/%s", base, suffix);
-               base = basebuf.buf;
-       }
-       htmlf("<tr><td colspan='%d'><a href='", columns);
-       html_url_path(base);
-       html("'>");
-       html_txt(base);
-       html("</a></td></tr>\n");
-       strbuf_release(&basebuf);
-}
+static int urls;

 
 

-static void print_urls(char *txt, char *suffix)
+static void print_url(const char *url)

 {
 {

-       char *h = txt, *t, c;
-       int urls = 0;

        int columns = 3;
 
        if (ctx.repo->enable_log_filecount)
        int columns = 3;
 
        if (ctx.repo->enable_log_filecount)


@@ -49,28 +26,21 @@ static void print_urls(char *txt, char *suffix)
        if (ctx.repo->enable_log_linecount)
                columns++;
 
        if (ctx.repo->enable_log_linecount)
                columns++;
 

-
-       while (h && *h) {
-               while (h && *h == ' ')
-                       h++;
-               if (!*h)
-                       break;
-               t = h;
-               while (t && *t && *t != ' ')
-                       t++;
-               c = *t;
-               *t = 0;
-               if (urls++ == 0) {
-                       htmlf("<tr class='nohover'><td colspan='%d'>&nbsp;</td></tr>", columns);
-                       htmlf("<tr><th class='left' colspan='%d'>Clone</th></tr>\n", columns);
-               }
-               print_url(h, suffix);
-               *t = c;
-               h = t;
+       if (urls++ == 0) {
+               htmlf("<tr class='nohover'><td colspan='%d'>&nbsp;</td></tr>", columns);
+               htmlf("<tr class='nohover'><th class='left' colspan='%d'>Clone</th></tr>\n", columns);

        }
        }

+
+       htmlf("<tr><td colspan='%d'><a rel='vcs-git' href='", columns);
+       html_url_path(url);
+       html("' title='");
+       html_attr(ctx.repo->name);
+       html(" Git repository'>");
+       html_txt(url);
+       html("</a></td></tr>\n");

 }
 
 }
 

-void cgit_print_summary()
+void cgit_print_summary(void)

 {
        int columns = 3;
 
 {
        int columns = 3;
 


@@ -88,78 +58,75 @@ void cgit_print_summary()
                cgit_print_log(ctx.qry.head, 0, ctx.cfg.summary_log, NULL,
                               NULL, NULL, 0, 0, 0);
        }
                cgit_print_log(ctx.qry.head, 0, ctx.cfg.summary_log, NULL,
                               NULL, NULL, 0, 0, 0);
        }

-       if (ctx.repo->clone_url)
-               print_urls(expand_macros(ctx.repo->clone_url), NULL);
-       else if (ctx.cfg.clone_prefix)
-               print_urls(ctx.cfg.clone_prefix, ctx.repo->url);
+       urls = 0;
+       cgit_add_clone_urls(print_url);

        html("</table>");
 }
 
        html("</table>");
 }
 

-/* The caller must free filename and ref after calling this. */
-void cgit_parse_readme(const char *readme, const char *path, char **filename, char **ref, struct cgit_repo *repo)
+/* The caller must free the return value. */
+static char* append_readme_path(const char *filename, const char *ref, const char *path)

 {
 {

-       const char *slash, *colon;
-
-       *filename = NULL;
-       *ref = NULL;
-
-       if (!readme || !(*readme))
-               return;
-
-       /* Check if the readme is tracked in the git repo. */
-       colon = strchr(readme, ':');
-       if (colon && strlen(colon) > 1) {
-               /* If it starts with a colon, we want to use
-                * the default branch */
-               if (colon == readme && repo->defbranch)
-                       *ref = xstrdup(repo->defbranch);
-               else
-                       *ref = xstrndup(readme, colon - readme);
-               readme = colon + 1;
-       }
-
-       /* Prepend repo path to relative readme path unless tracked. */
-       if (!(*ref) && *readme != '/')
-               readme = fmtalloc("%s/%s", repo->path, readme);
-
+       char *file, *base_dir, *full_path, *resolved_base = NULL, *resolved_full = NULL;

        /* If a subpath is specified for the about page, make it relative
         * to the directory containing the configured readme. */
        /* If a subpath is specified for the about page, make it relative
         * to the directory containing the configured readme. */

-       if (path) {
-               slash = strrchr(readme, '/');
-               if (!slash) {
-                       if (!colon)
-                               return;
-                       slash = colon;
+
+       file = xstrdup(filename);
+       base_dir = dirname(file);
+       if (!strcmp(base_dir, ".") || !strcmp(base_dir, "..")) {
+               if (!ref) {
+                       free(file);
+                       return NULL;

                }
                }

-               *filename = xmalloc(slash - readme + 1 + strlen(path) + 1);
-               strncpy(*filename, readme, slash - readme + 1);
-               strcpy(*filename + (slash - readme + 1), path);
+               full_path = xstrdup(path);

        } else
        } else

-               *filename = xstrdup(readme);
+               full_path = fmtalloc("%s/%s", base_dir, path);
+
+       if (!ref) {
+               resolved_base = realpath(base_dir, NULL);
+               resolved_full = realpath(full_path, NULL);
+               if (!resolved_base || !resolved_full || !starts_with(resolved_full, resolved_base)) {
+                       free(full_path);
+                       full_path = NULL;
+               }
+       }
+
+       free(file);
+       free(resolved_base);
+       free(resolved_full);
+
+       return full_path;

 }
 
 void cgit_print_repo_readme(char *path)
 {
        char *filename, *ref;
 }
 
 void cgit_print_repo_readme(char *path)
 {
        char *filename, *ref;

-       cgit_parse_readme(ctx.repo->readme, path, &filename, &ref, ctx.repo);
+       int free_filename = 0;
+
+       if (ctx.repo->readme.nr == 0)
+               return;
+
+       filename = ctx.repo->readme.items[0].string;
+       ref = ctx.repo->readme.items[0].util;
+
+       if (path) {
+               free_filename = 1;
+               filename = append_readme_path(filename, ref, path);
+               if (!filename)
+                       return;
+       }

 
        /* Print the calculated readme, either from the git repo or from the
         * filesystem, while applying the about-filter.
         */
        html("<div id='summary'>");
 
        /* Print the calculated readme, either from the git repo or from the
         * filesystem, while applying the about-filter.
         */
        html("<div id='summary'>");

-       if (ctx.repo->about_filter) {
-               ctx.repo->about_filter->argv[1] = filename;
-               cgit_open_filter(ctx.repo->about_filter);
-       }
+       cgit_open_filter(ctx.repo->about_filter, filename);

        if (ref)
        if (ref)

-               cgit_print_file(filename, ref);
+               cgit_print_file(filename, ref, 1);

        else
                html_include(filename);
        else
                html_include(filename);

-       if (ctx.repo->about_filter) {
-               cgit_close_filter(ctx.repo->about_filter);
-               ctx.repo->about_filter->argv[1] = NULL;
-       }
+       cgit_close_filter(ctx.repo->about_filter);
+

        html("</div>");
        html("</div>");

-       free(filename);
-       free(ref);
+       if (free_filename)
+               free(filename);

 }
 }