mirrors/cgit
0
0
Fork 0
mirror of https://git.zx2c4.com/cgit synced 2024-11-22 08:28:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of git://git.klever.net/patchwork/cgit

Browse Source 
* 'master' of git://git.klever.net/patchwork/cgit:
  allow specification of directly linked blobs mimetypes
  allow blob extract blobs by head/path combination
This commit is contained in:
Lars Hjemli 2008-06-26 12:54:44 +02:00
commit 29b37e9781
5 changed files with 39 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cgit.c
View File

@ -144,6 +144,8 @@ static void querystring_cb(const char *name, const char *value)
ctx.qry.path = trim_end(value, '/');
} else if (!strcmp(name, "name")) {
ctx.qry.name = xstrdup(value);
} else if (!strcmp(name, "mimetype")) {
ctx.qry.mimetype = xstrdup(value);
}
}

1
cgit.h
View File

@ -116,6 +116,7 @@ struct cgit_query {
char *sha2;
char *path;
char *name;
char *mimetype;
int ofs;
};

2
cmd.c
View File

@ -32,7 +32,7 @@ static void about_fn(struct cgit_context *ctx)
static void blob_fn(struct cgit_context *ctx)
{
cgit_print_blob(ctx->qry.sha1, ctx->qry.path);
cgit_print_blob(ctx->qry.sha1, ctx->qry.path, ctx->qry.head);
}
static void commit_fn(struct cgit_context *ctx)

39
ui-blob.c
View File

@ -10,20 +10,49 @@
#include "html.h"
#include "ui-shared.h"
void cgit_print_blob(const char *hex, char *path)
static char *match_path;
static unsigned char *matched_sha1;
static int walk_tree(const unsigned char *sha1, const char *base,int baselen, const char *pathname, unsigned mode, int stage) {
if(strncmp(base,match_path,baselen)
|| strcmp(match_path+baselen,pathname) )
return READ_TREE_RECURSIVE;
memmove(matched_sha1,sha1,20);
return 0;
}
void cgit_print_blob(const char *hex, char *path, const char *head)
{
unsigned char sha1[20];
enum object_type type;
unsigned char *buf;
unsigned long size;
struct commit *commit;
const char *paths[] = {path, NULL};
if (get_sha1_hex(hex, sha1)){
cgit_print_error(fmt("Bad hex value: %s", hex));
return;
if (hex) {
if (get_sha1_hex(hex, sha1)){
cgit_print_error(fmt("Bad hex value: %s", hex));
return;
}
} else {
if (get_sha1(head,sha1)) {
cgit_print_error(fmt("Bad ref: %s", head));
return;
}
}
type = sha1_object_info(sha1, &size);
if((!hex) && type == OBJ_COMMIT && path) {
commit = lookup_commit_reference(sha1);
match_path = path;
matched_sha1 = sha1;
read_tree_recursive(commit->tree, NULL, 0, 0, paths, walk_tree);
type = sha1_object_info(sha1,&size);
}
if (type == OBJ_BAD) {
cgit_print_error(fmt("Bad object name: %s", hex));
return;
@ -36,7 +65,7 @@ void cgit_print_blob(const char *hex, char *path)
}
buf[size] = '\0';
ctx.page.mimetype = NULL;
ctx.page.mimetype = ctx.qry.mimetype;
ctx.page.filename = path;
cgit_print_http_headers(&ctx);
write(htmlfd, buf, size);

2
ui-blob.h
View File

@ -1,6 +1,6 @@
#ifndef UI_BLOB_H
#define UI_BLOB_H
extern void cgit_print_blob(const char *hex, char *path);
extern void cgit_print_blob(const char *hex, char *path, const char *head);
#endif /* UI_BLOB_H */