/* ui-plain.c: functions for output of plain blobs by path
*
- * Copyright (C) 2008 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)
*/
+#include <stdio.h>
#include "cgit.h"
+#include "ui-plain.h"
#include "html.h"
#include "ui-shared.h"
-int match_baselen;
-int match;
+struct walk_tree_context {
+ int match_baselen;
+ int match;
+};
-static void print_object(const unsigned char *sha1, const char *path)
+static char *get_mimetype_from_file(const char *filename, const char *ext)
+{
+ static const char *delimiters;
+ char *result;
+ FILE *fd;
+ char line[1024];
+ char *mimetype;
+ char *token;
+
+ if (!filename)
+ return NULL;
+
+ fd = fopen(filename, "r");
+ if (!fd)
+ return NULL;
+
+ delimiters = " \t\r\n";
+ result = NULL;
+
+ /* loop over all lines in the file */
+ while (!result && fgets(line, sizeof(line), fd)) {
+ mimetype = strtok(line, delimiters);
+
+ /* skip empty lines and comment lines */
+ if (!mimetype || (mimetype[0] == '#'))
+ continue;
+
+ /* loop over all extensions of mimetype */
+ while ((token = strtok(NULL, delimiters))) {
+ if (!strcasecmp(ext, token)) {
+ result = xstrdup(mimetype);
+ break;
+ }
+ }
+ }
+ fclose(fd);
+
+ return result;
+}
+
+static int print_object(const unsigned char *sha1, const char *path)
{
enum object_type type;
char *buf, *ext;
unsigned long size;
struct string_list_item *mime;
+ int freemime;
type = sha1_object_info(sha1, &size);
if (type == OBJ_BAD) {
html_status(404, "Not found", 0);
- return;
+ return 0;
}
buf = read_sha1_file(sha1, &type, &size);
if (!buf) {
html_status(404, "Not found", 0);
- return;
+ return 0;
}
ctx.page.mimetype = NULL;
ext = strrchr(path, '.');
+ freemime = 0;
if (ext && *(++ext)) {
mime = string_list_lookup(&ctx.cfg.mimetypes, ext);
- if (mime)
+ if (mime) {
ctx.page.mimetype = (char *)mime->util;
+ ctx.page.charset = NULL;
+ } else {
+ ctx.page.mimetype = get_mimetype_from_file(ctx.cfg.mimetype_file, ext);
+ if (ctx.page.mimetype) {
+ freemime = 1;
+ ctx.page.charset = NULL;
+ }
+ }
}
if (!ctx.page.mimetype) {
- if (buffer_is_binary(buf, size))
+ if (buffer_is_binary(buf, size)) {
ctx.page.mimetype = "application/octet-stream";
- else
+ ctx.page.charset = NULL;
+ } else {
ctx.page.mimetype = "text/plain";
+ }
}
- ctx.page.filename = fmt("%s", path);
+ ctx.page.filename = path;
ctx.page.size = size;
ctx.page.etag = sha1_to_hex(sha1);
cgit_print_http_headers(&ctx);
html_raw(buf, size);
- match = 1;
+ /* If we allocated this, then casting away const is safe. */
+ if (freemime)
+ free((char*) ctx.page.mimetype);
+ return 1;
}
static char *buildpath(const char *base, int baselen, const char *path)
{
if (path[0])
- return fmt("%.*s%s/", baselen, base, path);
+ return fmtalloc("%.*s%s/", baselen, base, path);
else
- return fmt("%.*s/", baselen, base);
+ return fmtalloc("%.*s/", baselen, base);
}
static void print_dir(const unsigned char *sha1, const char *base,
fullpath);
html("</li>\n");
}
- match = 2;
+ free(fullpath);
}
static void print_dir_entry(const unsigned char *sha1, const char *base,
char *fullpath;
fullpath = buildpath(base, baselen, path);
- if (!S_ISDIR(mode))
+ if (!S_ISDIR(mode) && !S_ISGITLINK(mode))
fullpath[strlen(fullpath) - 1] = 0;
html(" <li>");
- cgit_plain_link(path, NULL, NULL, ctx.qry.head, ctx.qry.sha1,
- fullpath);
+ if (S_ISGITLINK(mode)) {
+ cgit_submodule_link(NULL, fullpath, sha1_to_hex(sha1));
+ } else
+ cgit_plain_link(path, NULL, NULL, ctx.qry.head, ctx.qry.sha1,
+ fullpath);
html("</li>\n");
- match = 2;
+ free(fullpath);
}
static void print_dir_tail(void)
const char *pathname, unsigned mode, int stage,
void *cbdata)
{
- if (baselen == match_baselen) {
- if (S_ISREG(mode))
- print_object(sha1, pathname);
- else if (S_ISDIR(mode)) {
+ struct walk_tree_context *walk_tree_ctx = cbdata;
+
+ if (baselen == walk_tree_ctx->match_baselen) {
+ if (S_ISREG(mode)) {
+ if (print_object(sha1, pathname))
+ walk_tree_ctx->match = 1;
+ } else if (S_ISDIR(mode)) {
print_dir(sha1, base, baselen, pathname);
+ walk_tree_ctx->match = 2;
return READ_TREE_RECURSIVE;
}
- }
- else if (baselen > match_baselen)
+ } else if (baselen > walk_tree_ctx->match_baselen) {
print_dir_entry(sha1, base, baselen, pathname, mode);
- else if (S_ISDIR(mode))
+ walk_tree_ctx->match = 2;
+ } else if (S_ISDIR(mode)) {
return READ_TREE_RECURSIVE;
+ }
return 0;
}
const char *rev = ctx->qry.sha1;
unsigned char sha1[20];
struct commit *commit;
- const char *paths[] = {ctx->qry.path, NULL};
+ struct pathspec_item path_items = {
+ .match = ctx->qry.path,
+ .len = ctx->qry.path ? strlen(ctx->qry.path) : 0
+ };
+ struct pathspec paths = {
+ .nr = 1,
+ .items = &path_items
+ };
+ struct walk_tree_context walk_tree_ctx = {
+ .match = 0
+ };
if (!rev)
rev = ctx->qry.head;
html_status(404, "Not found", 0);
return;
}
- if (!paths[0]) {
- paths[0] = "";
- match_baselen = -1;
+ if (!path_items.match) {
+ path_items.match = "";
+ walk_tree_ctx.match_baselen = -1;
print_dir(commit->tree->object.sha1, "", 0, "");
+ walk_tree_ctx.match = 2;
}
else
- match_baselen = basedir_len(paths[0]);
- read_tree_recursive(commit->tree, "", 0, 0, paths, walk_tree, NULL);
- if (!match)
+ walk_tree_ctx.match_baselen = basedir_len(path_items.match);
+ read_tree_recursive(commit->tree, "", 0, 0, &paths, walk_tree, &walk_tree_ctx);
+ if (!walk_tree_ctx.match)
html_status(404, "Not found", 0);
- else if (match == 2)
+ else if (walk_tree_ctx.match == 2)
print_dir_tail();
}
git.ckatri.com / cgit.git / blobdiff