remove trailing whitespaces from source files

[cgit.git] / ui-summary.c

diff --git a/ui-summary.c b/ui-summary.c
index 0754bb7f99b8eee1f5febdb902b49e2c57470c82..df99ce10a9b326797dec19ac91e5b8709807ce5a 100644 (file)
--- a/ui-summary.c
+++ b/ui-summary.c
@@ -1,21 +1,23 @@
 /* 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)
  */
 
 #include "cgit.h"
+#include "ui-summary.h"
 #include "html.h"
 #include "ui-log.h"
 #include "ui-refs.h"
 #include "ui-blob.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++;
@@ -24,13 +26,16 @@ static void print_url(char *base, char *suffix)
 
        if (!base || !*base)
                return;
-       if (suffix && *suffix)
-               base = fmt("%s/%s", base, suffix);
+       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 void print_urls(char *txt, char *suffix)
@@ -90,57 +95,70 @@ void cgit_print_summary()
        html("</table>");
 }
 
+/* The caller must free the return value. */
+static char* append_readme_path(const char *filename, const char *ref, const char *path)
+{
+       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. */
+
+       file = xstrdup(filename);
+       base_dir = dirname(file);
+       if (!strcmp(base_dir, ".") || !strcmp(base_dir, "..")) {
+               if (!ref) {
+                       free(file);
+                       return NULL;
+               }
+               full_path = xstrdup(path);
+       } else
+               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 || prefixcmp(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 *slash, *tmp, *colon, *ref;
+       char *filename, *ref;
+       int free_filename = 0;
 
-       if (!ctx.repo->readme || !(*ctx.repo->readme))
+       if (ctx.repo->readme.nr == 0)
                return;
 
-       ref = NULL;
+       filename = ctx.repo->readme.items[0].string;
+       ref = ctx.repo->readme.items[0].util;
 
-       /* Check if the readme is tracked in the git repo. */
-       colon = strchr(ctx.repo->readme, ':');
-       if (colon && strlen(colon) > 1) {
-               *colon = '\0';
-               ref = ctx.repo->readme;
-               ctx.repo->readme = colon + 1;
-               if (!(*ctx.repo->readme))
+       if (path) {
+               free_filename = 1;
+               filename = append_readme_path(filename, ref, path);
+               if (!filename)
                        return;
        }
 
-       /* Prepend repo path to relative readme path unless tracked. */
-       if (!ref && *ctx.repo->readme != '/')
-               ctx.repo->readme = xstrdup(fmt("%s/%s", ctx.repo->path,
-                                              ctx.repo->readme));
-
-       /* If a subpath is specified for the about page, make it relative
-        * to the directory containing the configured readme.
-        */
-       if (path) {
-               slash = strrchr(ctx.repo->readme, '/');
-               if (!slash) {
-                       if (!colon)
-                               return;
-                       slash = colon;
-               }
-               tmp = xmalloc(slash - ctx.repo->readme + 1 + strlen(path) + 1);
-               strncpy(tmp, ctx.repo->readme, slash - ctx.repo->readme + 1);
-               strcpy(tmp + (slash - ctx.repo->readme + 1), path);
-       } else
-               tmp = ctx.repo->readme;
-
        /* 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)
-               cgit_open_filter(ctx.repo->about_filter);
+       cgit_open_filter(ctx.repo->about_filter, filename);
        if (ref)
-               cgit_print_file(tmp, ref);
+               cgit_print_file(filename, ref, 1);
        else
-               html_include(tmp);
-       if (ctx.repo->about_filter)
-               cgit_close_filter(ctx.repo->about_filter);
+               html_include(filename);
+       cgit_close_filter(ctx.repo->about_filter);
+
        html("</div>");
+       if (free_filename)
+               free(filename);
 }