bdd4a56ad5
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>
80 line
1.6 KiB
C
80 line
1.6 KiB
C
/* 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"
|
|
|
|
char *curr_rev;
|
|
char *match_path;
|
|
int match;
|
|
|
|
static void print_object(const unsigned char *sha1, const char *path)
|
|
{
|
|
enum object_type type;
|
|
char *buf;
|
|
unsigned long size;
|
|
|
|
type = sha1_object_info(sha1, &size);
|
|
if (type == OBJ_BAD) {
|
|
html_status(404, "Not found", 0);
|
|
return;
|
|
}
|
|
|
|
buf = read_sha1_file(sha1, &type, &size);
|
|
if (!buf) {
|
|
html_status(404, "Not found", 0);
|
|
return;
|
|
}
|
|
ctx.page.mimetype = "text/plain";
|
|
ctx.page.filename = fmt("%s", path);
|
|
ctx.page.size = size;
|
|
cgit_print_http_headers(&ctx);
|
|
html_raw(buf, size);
|
|
match = 1;
|
|
}
|
|
|
|
static int walk_tree(const unsigned char *sha1, const char *base, int baselen,
|
|
const char *pathname, unsigned mode, int stage,
|
|
void *cbdata)
|
|
{
|
|
if (S_ISDIR(mode))
|
|
return READ_TREE_RECURSIVE;
|
|
|
|
if (S_ISREG(mode))
|
|
print_object(sha1, pathname);
|
|
|
|
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;
|
|
|
|
curr_rev = xstrdup(rev);
|
|
if (get_sha1(rev, sha1)) {
|
|
html_status(404, "Not found", 0);
|
|
return;
|
|
}
|
|
commit = lookup_commit_reference(sha1);
|
|
if (!commit || parse_commit(commit)) {
|
|
html_status(404, "Not found", 0);
|
|
return;
|
|
}
|
|
match_path = ctx->qry.path;
|
|
read_tree_recursive(commit->tree, NULL, 0, 0, paths, walk_tree, NULL);
|
|
if (!match)
|
|
html_status(404, "Not found", 0);
|
|
}
|