Archives/cgit
2
0
Fork 0
mirror of https://git.zx2c4.com/cgit/ synced 2024-11-04 06:00:44 +00:00
Code Issues Projects Releases Wiki Activity
c2766deb67
cgit/ui-plain.c

147 lines
3.2 KiB
C
Raw Normal View History

Implement plain view This implements a way to access plain blobs by path (similar to the tree view) instead of by sha1. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2008-08-06 08:53:50 +00:00
/* ui-plain.c: functions for output of plain blobs by path
*
* Copyright (C) 2008 Lars Hjemli
*
* Licensed under GNU General Public License v2
* (see COPYING for full license text)
*/
#include "cgit.h"
#include "html.h"
#include "ui-shared.h"
ui-plain: more efficient walk_tree() Git's read_tree_recursive() already filters out the objects by pathname, so we only have to compare baselen to the expected. That is, no string matching is required. Additionally, if the requested path is a directory, the old code would walk through all of its immediate children. This is not necessary, this so we no longer do that. Signed-off-by: Mark Lodato <lodatom@gmail.com>
2010-01-31 06:07:41 +00:00
int match_baselen;
Implement plain view This implements a way to access plain blobs by path (similar to the tree view) instead of by sha1. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2008-08-06 08:53:50 +00:00
int match;
static void print_object(const unsigned char *sha1, const char *path)
{
enum object_type type;
Add support for mime type registration and lookup This patch makes it possible to register mappings from filename extension to mime type in cgitrc and use this mapping when returning blob content in `plain` view. The reason for adding this mapping to cgitrc (as opposed to parsing something like /etc/mime.types) is to allow quick lookup of a limited number of filename extensions (/etc/mime-types on my machine currently contains over 700 entries). NB: A nice addition to this patch would be to parse /etc/mime.types when `plain` view is requested for a file with an extension for which there is no mapping registered in cgitrc. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2009-02-13 19:43:30 +00:00
char *buf, *ext;
Fix some warnings to allow -Werror The type used to declare the st_size field of a 'struct stat' can be a 32- or 64-bit sized type, which can vary from one platform to another, or even from one compilation to another. In particular, on linux, if you include the following define: #define _FILE_OFFSET_BITS 64 prior to including certain system header files, then the type used for the st_size field will be __off64_t, otherwise it will be an __off_t. Note that the above define is included at the top of git-compat-util.h. In cache.c, the "%zd" format specifier expects a "signed size_t", another type which can vary, when an __off64_t or a __off_t is provided. To supress the warning, use the PRIuMAX format specifier and cast the st_size field to uintmax_t. This should work an any platform for which git currently compiles. In ui-plain.c, the size parameter of sha1_object_info() and read_sha1_file() is defined to be "unsigned long *" not "size_t *". So, to supress the warning, simply declare size with the correct type. Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2008-11-04 19:22:08 +00:00
unsigned long size;
Add support for mime type registration and lookup This patch makes it possible to register mappings from filename extension to mime type in cgitrc and use this mapping when returning blob content in `plain` view. The reason for adding this mapping to cgitrc (as opposed to parsing something like /etc/mime.types) is to allow quick lookup of a limited number of filename extensions (/etc/mime-types on my machine currently contains over 700 entries). NB: A nice addition to this patch would be to parse /etc/mime.types when `plain` view is requested for a file with an extension for which there is no mapping registered in cgitrc. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2009-02-13 19:43:30 +00:00
struct string_list_item *mime;
Implement plain view This implements a way to access plain blobs by path (similar to the tree view) instead of by sha1. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2008-08-06 08:53:50 +00:00
type = sha1_object_info(sha1, &size);
if (type == OBJ_BAD) {
Supply status description to html_status() Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2008-08-06 20:57:44 +00:00
html_status(404, "Not found", 0);
Implement plain view This implements a way to access plain blobs by path (similar to the tree view) instead of by sha1. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2008-08-06 08:53:50 +00:00
return;
}
buf = read_sha1_file(sha1, &type, &size);
if (!buf) {
Supply status description to html_status() Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2008-08-06 20:57:44 +00:00
html_status(404, "Not found", 0);
Implement plain view This implements a way to access plain blobs by path (similar to the tree view) instead of by sha1. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2008-08-06 08:53:50 +00:00
return;
}
Add support for mime type registration and lookup This patch makes it possible to register mappings from filename extension to mime type in cgitrc and use this mapping when returning blob content in `plain` view. The reason for adding this mapping to cgitrc (as opposed to parsing something like /etc/mime.types) is to allow quick lookup of a limited number of filename extensions (/etc/mime-types on my machine currently contains over 700 entries). NB: A nice addition to this patch would be to parse /etc/mime.types when `plain` view is requested for a file with an extension for which there is no mapping registered in cgitrc. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2009-02-13 19:43:30 +00:00
ctx.page.mimetype = NULL;
ext = strrchr(path, '.');
if (ext && *(++ext)) {
mime = string_list_lookup(ext, &ctx.cfg.mimetypes);
if (mime)
ctx.page.mimetype = (char *)mime->util;
}
if (!ctx.page.mimetype) {
if (buffer_is_binary(buf, size))
ctx.page.mimetype = "application/octet-stream";
else
ctx.page.mimetype = "text/plain";
}
Implement plain view This implements a way to access plain blobs by path (similar to the tree view) instead of by sha1. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2008-08-06 08:53:50 +00:00
ctx.page.filename = fmt("%s", path);
ctx.page.size = size;
Add support for ETag in 'plain' view When downloading a blob identified by its path, the client might want to know if the blob has been modified since a previous download of the same path. To this end, an ETag containing the blob SHA1 seems to be ideal. Todo: add support for HEAD requests... Suggested-by: Owen Taylor <otaylor@redhat.com> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2009-02-19 21:38:36 +00:00
ctx.page.etag = sha1_to_hex(sha1);
Implement plain view This implements a way to access plain blobs by path (similar to the tree view) instead of by sha1. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2008-08-06 08:53:50 +00:00
cgit_print_http_headers(&ctx);
html_raw(buf, size);
match = 1;
}
ui-plain: print directory listings When a user requests a plain view of a tree (as opposed to a blob), print out a directory listing rather than giving a 404 Not Found. Also, fix a segfault when ctx->qry.path is NULL - i.e, when /plain is requested without a path. Signed-off-by: Mark Lodato <lodatom@gmail.com>
2010-01-31 19:25:03 +00:00
static void print_dir(const unsigned char *sha1, const char *path,
const char *base)
{
char *fullpath;
if (path[0] || base[0])
fullpath = fmt("/%s%s/", base, path);
else
fullpath = "/";
ctx.page.etag = sha1_to_hex(sha1);
cgit_print_http_headers(&ctx);
htmlf("<html><head><title>%s</title></head>\n<body>\n"
" <h2>%s</h2>\n <ul>\n", fullpath, fullpath);
if (path[0] || base[0])
html(" <li><a href=\"../\">../</a></li>\n");
match = 2;
}
static void print_dir_entry(const unsigned char *sha1, const char *path,
unsigned mode)
{
const char *sep = "";
if (S_ISDIR(mode))
sep = "/";
htmlf(" <li><a href=\"%s%s\">%s%s</a></li>\n", path, sep, path, sep);
match = 2;
}
static void print_dir_tail(void)
{
html(" </ul>\n</body></html>\n");
}
Implement plain view This implements a way to access plain blobs by path (similar to the tree view) instead of by sha1. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2008-08-06 08:53:50 +00:00
static int walk_tree(const unsigned char *sha1, const char *base, int baselen,
const char *pathname, unsigned mode, int stage,
void *cbdata)
{
ui-plain: more efficient walk_tree() Git's read_tree_recursive() already filters out the objects by pathname, so we only have to compare baselen to the expected. That is, no string matching is required. Additionally, if the requested path is a directory, the old code would walk through all of its immediate children. This is not necessary, this so we no longer do that. Signed-off-by: Mark Lodato <lodatom@gmail.com>
2010-01-31 06:07:41 +00:00
if (baselen == match_baselen) {
if (S_ISREG(mode))
print_object(sha1, pathname);
ui-plain: print directory listings When a user requests a plain view of a tree (as opposed to a blob), print out a directory listing rather than giving a 404 Not Found. Also, fix a segfault when ctx->qry.path is NULL - i.e, when /plain is requested without a path. Signed-off-by: Mark Lodato <lodatom@gmail.com>
2010-01-31 19:25:03 +00:00
else if (S_ISDIR(mode)) {
print_dir(sha1, pathname, base);
return READ_TREE_RECURSIVE;
}
ui-plain: more efficient walk_tree() Git's read_tree_recursive() already filters out the objects by pathname, so we only have to compare baselen to the expected. That is, no string matching is required. Additionally, if the requested path is a directory, the old code would walk through all of its immediate children. This is not necessary, this so we no longer do that. Signed-off-by: Mark Lodato <lodatom@gmail.com>
2010-01-31 06:07:41 +00:00
}
ui-plain: print directory listings When a user requests a plain view of a tree (as opposed to a blob), print out a directory listing rather than giving a 404 Not Found. Also, fix a segfault when ctx->qry.path is NULL - i.e, when /plain is requested without a path. Signed-off-by: Mark Lodato <lodatom@gmail.com>
2010-01-31 19:25:03 +00:00
else if (baselen > match_baselen)
print_dir_entry(sha1, pathname, mode);
ui-plain: more efficient walk_tree() Git's read_tree_recursive() already filters out the objects by pathname, so we only have to compare baselen to the expected. That is, no string matching is required. Additionally, if the requested path is a directory, the old code would walk through all of its immediate children. This is not necessary, this so we no longer do that. Signed-off-by: Mark Lodato <lodatom@gmail.com>
2010-01-31 06:07:41 +00:00
else if (S_ISDIR(mode))
Implement plain view This implements a way to access plain blobs by path (similar to the tree view) instead of by sha1. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2008-08-06 08:53:50 +00:00
return READ_TREE_RECURSIVE;
ui-plain: more efficient walk_tree() Git's read_tree_recursive() already filters out the objects by pathname, so we only have to compare baselen to the expected. That is, no string matching is required. Additionally, if the requested path is a directory, the old code would walk through all of its immediate children. This is not necessary, this so we no longer do that. Signed-off-by: Mark Lodato <lodatom@gmail.com>
2010-01-31 06:07:41 +00:00
return 0;
}
Implement plain view This implements a way to access plain blobs by path (similar to the tree view) instead of by sha1. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2008-08-06 08:53:50 +00:00
ui-plain: more efficient walk_tree() Git's read_tree_recursive() already filters out the objects by pathname, so we only have to compare baselen to the expected. That is, no string matching is required. Additionally, if the requested path is a directory, the old code would walk through all of its immediate children. This is not necessary, this so we no longer do that. Signed-off-by: Mark Lodato <lodatom@gmail.com>
2010-01-31 06:07:41 +00:00
static int basedir_len(const char *path)
{
char *p = strrchr(path, '/');
if (p)
return p - path + 1;
Implement plain view This implements a way to access plain blobs by path (similar to the tree view) instead of by sha1. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2008-08-06 08:53:50 +00:00
return 0;
}
void cgit_print_plain(struct cgit_context *ctx)
{
const char *rev = ctx->qry.sha1;
unsigned char sha1[20];
struct commit *commit;
const char *paths[] = {ctx->qry.path, NULL};
if (!rev)
rev = ctx->qry.head;
if (get_sha1(rev, sha1)) {
Supply status description to html_status() Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2008-08-06 20:57:44 +00:00
html_status(404, "Not found", 0);
Implement plain view This implements a way to access plain blobs by path (similar to the tree view) instead of by sha1. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2008-08-06 08:53:50 +00:00
return;
}
commit = lookup_commit_reference(sha1);
if (!commit || parse_commit(commit)) {
Supply status description to html_status() Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2008-08-06 20:57:44 +00:00
html_status(404, "Not found", 0);
Implement plain view This implements a way to access plain blobs by path (similar to the tree view) instead of by sha1. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2008-08-06 08:53:50 +00:00
return;
}
ui-plain: print directory listings When a user requests a plain view of a tree (as opposed to a blob), print out a directory listing rather than giving a 404 Not Found. Also, fix a segfault when ctx->qry.path is NULL - i.e, when /plain is requested without a path. Signed-off-by: Mark Lodato <lodatom@gmail.com>
2010-01-31 19:25:03 +00:00
if (!paths[0]) {
paths[0] = "";
match_baselen = -1;
print_dir(commit->tree->object.sha1, "", "");
}
else
match_baselen = basedir_len(paths[0]);
Fix segfault on ppc when browsing tree
2009-12-10 15:35:42 +00:00
read_tree_recursive(commit->tree, "", 0, 0, paths, walk_tree, NULL);
Implement plain view This implements a way to access plain blobs by path (similar to the tree view) instead of by sha1. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2008-08-06 08:53:50 +00:00
if (!match)
Supply status description to html_status() Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2008-08-06 20:57:44 +00:00
html_status(404, "Not found", 0);
ui-plain: print directory listings When a user requests a plain view of a tree (as opposed to a blob), print out a directory listing rather than giving a 404 Not Found. Also, fix a segfault when ctx->qry.path is NULL - i.e, when /plain is requested without a path. Signed-off-by: Mark Lodato <lodatom@gmail.com>
2010-01-31 19:25:03 +00:00
else if (match == 2)
print_dir_tail();
Implement plain view This implements a way to access plain blobs by path (similar to the tree view) instead of by sha1. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2008-08-06 08:53:50 +00:00
}
Reference in New Issue Copy Permalink