author | Lars Hjemli <hjemli@gmail.com> | 2009-12-12 11:09:47 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2009-12-12 11:09:47 (UTC) |
commit | 547a64fbd65de293c290f4e18bbeae958d54aaa7 (patch) (unidiff) | |
tree | e35d8ae4e9408cd552e539c5af08d4bd6fdd1e8f | |
parent | 0642435fed6793a0d038e1e5097a91293ee89a05 (diff) | |
parent | c86e206a9773f97dc6de6bbf45712bb304de3653 (diff) | |
download | cgit-547a64fbd65de293c290f4e18bbeae958d54aaa7.zip cgit-547a64fbd65de293c290f4e18bbeae958d54aaa7.tar.gz cgit-547a64fbd65de293c290f4e18bbeae958d54aaa7.tar.bz2 |
Merge branch 'stable'
-rw-r--r-- | Makefile | 2 | ||||
-rw-r--r-- | ui-blob.c | 2 | ||||
-rw-r--r-- | ui-plain.c | 2 | ||||
-rw-r--r-- | ui-tree.c | 2 |
4 files changed, 4 insertions, 4 deletions
@@ -1,49 +1,49 @@ | |||
1 | CGIT_VERSION = v0.8.3 | 1 | CGIT_VERSION = v0.8.3.1 |
2 | CGIT_SCRIPT_NAME = cgit.cgi | 2 | CGIT_SCRIPT_NAME = cgit.cgi |
3 | CGIT_SCRIPT_PATH = /var/www/htdocs/cgit | 3 | CGIT_SCRIPT_PATH = /var/www/htdocs/cgit |
4 | CGIT_DATA_PATH = $(CGIT_SCRIPT_PATH) | 4 | CGIT_DATA_PATH = $(CGIT_SCRIPT_PATH) |
5 | CGIT_CONFIG = /etc/cgitrc | 5 | CGIT_CONFIG = /etc/cgitrc |
6 | CACHE_ROOT = /var/cache/cgit | 6 | CACHE_ROOT = /var/cache/cgit |
7 | SHA1_HEADER = <openssl/sha.h> | 7 | SHA1_HEADER = <openssl/sha.h> |
8 | GIT_VER = 1.6.4.3 | 8 | GIT_VER = 1.6.4.3 |
9 | GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2 | 9 | GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2 |
10 | INSTALL = install | 10 | INSTALL = install |
11 | 11 | ||
12 | # Define NO_STRCASESTR if you don't have strcasestr. | 12 | # Define NO_STRCASESTR if you don't have strcasestr. |
13 | # | 13 | # |
14 | # Define NO_OPENSSL to disable linking with OpenSSL and use bundled SHA1 | 14 | # Define NO_OPENSSL to disable linking with OpenSSL and use bundled SHA1 |
15 | # implementation (slower). | 15 | # implementation (slower). |
16 | # | 16 | # |
17 | # Define NEEDS_LIBICONV if linking with libc is not enough (eg. Darwin). | 17 | # Define NEEDS_LIBICONV if linking with libc is not enough (eg. Darwin). |
18 | # | 18 | # |
19 | 19 | ||
20 | #-include config.mak | 20 | #-include config.mak |
21 | 21 | ||
22 | # | 22 | # |
23 | # Platform specific tweaks | 23 | # Platform specific tweaks |
24 | # | 24 | # |
25 | 25 | ||
26 | uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not') | 26 | uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not') |
27 | uname_O := $(shell sh -c 'uname -o 2>/dev/null || echo not') | 27 | uname_O := $(shell sh -c 'uname -o 2>/dev/null || echo not') |
28 | uname_R := $(shell sh -c 'uname -r 2>/dev/null || echo not') | 28 | uname_R := $(shell sh -c 'uname -r 2>/dev/null || echo not') |
29 | 29 | ||
30 | ifeq ($(uname_O),Cygwin) | 30 | ifeq ($(uname_O),Cygwin) |
31 | NO_STRCASESTR = YesPlease | 31 | NO_STRCASESTR = YesPlease |
32 | NEEDS_LIBICONV = YesPlease | 32 | NEEDS_LIBICONV = YesPlease |
33 | endif | 33 | endif |
34 | 34 | ||
35 | # | 35 | # |
36 | # Let the user override the above settings. | 36 | # Let the user override the above settings. |
37 | # | 37 | # |
38 | -include cgit.conf | 38 | -include cgit.conf |
39 | 39 | ||
40 | # | 40 | # |
41 | # Define a way to invoke make in subdirs quietly, shamelessly ripped | 41 | # Define a way to invoke make in subdirs quietly, shamelessly ripped |
42 | # from git.git | 42 | # from git.git |
43 | # | 43 | # |
44 | QUIET_SUBDIR0 = +$(MAKE) -C # space to separate -C and subdir | 44 | QUIET_SUBDIR0 = +$(MAKE) -C # space to separate -C and subdir |
45 | QUIET_SUBDIR1 = | 45 | QUIET_SUBDIR1 = |
46 | 46 | ||
47 | ifneq ($(findstring $(MAKEFLAGS),w),w) | 47 | ifneq ($(findstring $(MAKEFLAGS),w),w) |
48 | PRINT_DIR = --no-print-directory | 48 | PRINT_DIR = --no-print-directory |
49 | else # "make -w" | 49 | else # "make -w" |
@@ -5,75 +5,75 @@ | |||
5 | * Licensed under GNU General Public License v2 | 5 | * Licensed under GNU General Public License v2 |
6 | * (see COPYING for full license text) | 6 | * (see COPYING for full license text) |
7 | */ | 7 | */ |
8 | 8 | ||
9 | #include "cgit.h" | 9 | #include "cgit.h" |
10 | #include "html.h" | 10 | #include "html.h" |
11 | #include "ui-shared.h" | 11 | #include "ui-shared.h" |
12 | 12 | ||
13 | static char *match_path; | 13 | static char *match_path; |
14 | static unsigned char *matched_sha1; | 14 | static unsigned char *matched_sha1; |
15 | 15 | ||
16 | static int walk_tree(const unsigned char *sha1, const char *base,int baselen, | 16 | static int walk_tree(const unsigned char *sha1, const char *base,int baselen, |
17 | const char *pathname, unsigned mode, int stage, void *cbdata) { | 17 | const char *pathname, unsigned mode, int stage, void *cbdata) { |
18 | if(strncmp(base,match_path,baselen) | 18 | if(strncmp(base,match_path,baselen) |
19 | || strcmp(match_path+baselen,pathname) ) | 19 | || strcmp(match_path+baselen,pathname) ) |
20 | return READ_TREE_RECURSIVE; | 20 | return READ_TREE_RECURSIVE; |
21 | memmove(matched_sha1,sha1,20); | 21 | memmove(matched_sha1,sha1,20); |
22 | return 0; | 22 | return 0; |
23 | } | 23 | } |
24 | 24 | ||
25 | void cgit_print_blob(const char *hex, char *path, const char *head) | 25 | void cgit_print_blob(const char *hex, char *path, const char *head) |
26 | { | 26 | { |
27 | 27 | ||
28 | unsigned char sha1[20]; | 28 | unsigned char sha1[20]; |
29 | enum object_type type; | 29 | enum object_type type; |
30 | char *buf; | 30 | char *buf; |
31 | unsigned long size; | 31 | unsigned long size; |
32 | struct commit *commit; | 32 | struct commit *commit; |
33 | const char *paths[] = {path, NULL}; | 33 | const char *paths[] = {path, NULL}; |
34 | 34 | ||
35 | if (hex) { | 35 | if (hex) { |
36 | if (get_sha1_hex(hex, sha1)){ | 36 | if (get_sha1_hex(hex, sha1)){ |
37 | cgit_print_error(fmt("Bad hex value: %s", hex)); | 37 | cgit_print_error(fmt("Bad hex value: %s", hex)); |
38 | return; | 38 | return; |
39 | } | 39 | } |
40 | } else { | 40 | } else { |
41 | if (get_sha1(head,sha1)) { | 41 | if (get_sha1(head,sha1)) { |
42 | cgit_print_error(fmt("Bad ref: %s", head)); | 42 | cgit_print_error(fmt("Bad ref: %s", head)); |
43 | return; | 43 | return; |
44 | } | 44 | } |
45 | } | 45 | } |
46 | 46 | ||
47 | type = sha1_object_info(sha1, &size); | 47 | type = sha1_object_info(sha1, &size); |
48 | 48 | ||
49 | if((!hex) && type == OBJ_COMMIT && path) { | 49 | if((!hex) && type == OBJ_COMMIT && path) { |
50 | commit = lookup_commit_reference(sha1); | 50 | commit = lookup_commit_reference(sha1); |
51 | match_path = path; | 51 | match_path = path; |
52 | matched_sha1 = sha1; | 52 | matched_sha1 = sha1; |
53 | read_tree_recursive(commit->tree, NULL, 0, 0, paths, walk_tree, NULL); | 53 | read_tree_recursive(commit->tree, "", 0, 0, paths, walk_tree, NULL); |
54 | type = sha1_object_info(sha1,&size); | 54 | type = sha1_object_info(sha1,&size); |
55 | } | 55 | } |
56 | 56 | ||
57 | if (type == OBJ_BAD) { | 57 | if (type == OBJ_BAD) { |
58 | cgit_print_error(fmt("Bad object name: %s", hex)); | 58 | cgit_print_error(fmt("Bad object name: %s", hex)); |
59 | return; | 59 | return; |
60 | } | 60 | } |
61 | 61 | ||
62 | buf = read_sha1_file(sha1, &type, &size); | 62 | buf = read_sha1_file(sha1, &type, &size); |
63 | if (!buf) { | 63 | if (!buf) { |
64 | cgit_print_error(fmt("Error reading object %s", hex)); | 64 | cgit_print_error(fmt("Error reading object %s", hex)); |
65 | return; | 65 | return; |
66 | } | 66 | } |
67 | 67 | ||
68 | buf[size] = '\0'; | 68 | buf[size] = '\0'; |
69 | ctx.page.mimetype = ctx.qry.mimetype; | 69 | ctx.page.mimetype = ctx.qry.mimetype; |
70 | if (!ctx.page.mimetype) { | 70 | if (!ctx.page.mimetype) { |
71 | if (buffer_is_binary(buf, size)) | 71 | if (buffer_is_binary(buf, size)) |
72 | ctx.page.mimetype = "application/octet-stream"; | 72 | ctx.page.mimetype = "application/octet-stream"; |
73 | else | 73 | else |
74 | ctx.page.mimetype = "text/plain"; | 74 | ctx.page.mimetype = "text/plain"; |
75 | } | 75 | } |
76 | ctx.page.filename = path; | 76 | ctx.page.filename = path; |
77 | cgit_print_http_headers(&ctx); | 77 | cgit_print_http_headers(&ctx); |
78 | write(htmlfd, buf, size); | 78 | write(htmlfd, buf, size); |
79 | } | 79 | } |
@@ -43,52 +43,52 @@ static void print_object(const unsigned char *sha1, const char *path) | |||
43 | if (buffer_is_binary(buf, size)) | 43 | if (buffer_is_binary(buf, size)) |
44 | ctx.page.mimetype = "application/octet-stream"; | 44 | ctx.page.mimetype = "application/octet-stream"; |
45 | else | 45 | else |
46 | ctx.page.mimetype = "text/plain"; | 46 | ctx.page.mimetype = "text/plain"; |
47 | } | 47 | } |
48 | ctx.page.filename = fmt("%s", path); | 48 | ctx.page.filename = fmt("%s", path); |
49 | ctx.page.size = size; | 49 | ctx.page.size = size; |
50 | ctx.page.etag = sha1_to_hex(sha1); | 50 | ctx.page.etag = sha1_to_hex(sha1); |
51 | cgit_print_http_headers(&ctx); | 51 | cgit_print_http_headers(&ctx); |
52 | html_raw(buf, size); | 52 | html_raw(buf, size); |
53 | match = 1; | 53 | match = 1; |
54 | } | 54 | } |
55 | 55 | ||
56 | static int walk_tree(const unsigned char *sha1, const char *base, int baselen, | 56 | static int walk_tree(const unsigned char *sha1, const char *base, int baselen, |
57 | const char *pathname, unsigned mode, int stage, | 57 | const char *pathname, unsigned mode, int stage, |
58 | void *cbdata) | 58 | void *cbdata) |
59 | { | 59 | { |
60 | if (S_ISDIR(mode)) | 60 | if (S_ISDIR(mode)) |
61 | return READ_TREE_RECURSIVE; | 61 | return READ_TREE_RECURSIVE; |
62 | 62 | ||
63 | if (S_ISREG(mode) && !strncmp(base, match_path, baselen) && | 63 | if (S_ISREG(mode) && !strncmp(base, match_path, baselen) && |
64 | !strcmp(pathname, match_path + baselen)) | 64 | !strcmp(pathname, match_path + baselen)) |
65 | print_object(sha1, pathname); | 65 | print_object(sha1, pathname); |
66 | 66 | ||
67 | return 0; | 67 | return 0; |
68 | } | 68 | } |
69 | 69 | ||
70 | void cgit_print_plain(struct cgit_context *ctx) | 70 | void cgit_print_plain(struct cgit_context *ctx) |
71 | { | 71 | { |
72 | const char *rev = ctx->qry.sha1; | 72 | const char *rev = ctx->qry.sha1; |
73 | unsigned char sha1[20]; | 73 | unsigned char sha1[20]; |
74 | struct commit *commit; | 74 | struct commit *commit; |
75 | const char *paths[] = {ctx->qry.path, NULL}; | 75 | const char *paths[] = {ctx->qry.path, NULL}; |
76 | 76 | ||
77 | if (!rev) | 77 | if (!rev) |
78 | rev = ctx->qry.head; | 78 | rev = ctx->qry.head; |
79 | 79 | ||
80 | curr_rev = xstrdup(rev); | 80 | curr_rev = xstrdup(rev); |
81 | if (get_sha1(rev, sha1)) { | 81 | if (get_sha1(rev, sha1)) { |
82 | html_status(404, "Not found", 0); | 82 | html_status(404, "Not found", 0); |
83 | return; | 83 | return; |
84 | } | 84 | } |
85 | commit = lookup_commit_reference(sha1); | 85 | commit = lookup_commit_reference(sha1); |
86 | if (!commit || parse_commit(commit)) { | 86 | if (!commit || parse_commit(commit)) { |
87 | html_status(404, "Not found", 0); | 87 | html_status(404, "Not found", 0); |
88 | return; | 88 | return; |
89 | } | 89 | } |
90 | match_path = ctx->qry.path; | 90 | match_path = ctx->qry.path; |
91 | read_tree_recursive(commit->tree, NULL, 0, 0, paths, walk_tree, NULL); | 91 | read_tree_recursive(commit->tree, "", 0, 0, paths, walk_tree, NULL); |
92 | if (!match) | 92 | if (!match) |
93 | html_status(404, "Not found", 0); | 93 | html_status(404, "Not found", 0); |
94 | } | 94 | } |
@@ -241,51 +241,51 @@ static int walk_tree(const unsigned char *sha1, const char *base, int baselen, | |||
241 | state = 1; | 241 | state = 1; |
242 | ls_head(); | 242 | ls_head(); |
243 | return READ_TREE_RECURSIVE; | 243 | return READ_TREE_RECURSIVE; |
244 | } else { | 244 | } else { |
245 | print_object(sha1, buffer, pathname); | 245 | print_object(sha1, buffer, pathname); |
246 | return 0; | 246 | return 0; |
247 | } | 247 | } |
248 | } | 248 | } |
249 | ls_item(sha1, base, baselen, pathname, mode, stage, NULL); | 249 | ls_item(sha1, base, baselen, pathname, mode, stage, NULL); |
250 | return 0; | 250 | return 0; |
251 | } | 251 | } |
252 | 252 | ||
253 | 253 | ||
254 | /* | 254 | /* |
255 | * Show a tree or a blob | 255 | * Show a tree or a blob |
256 | * rev: the commit pointing at the root tree object | 256 | * rev: the commit pointing at the root tree object |
257 | * path: path to tree or blob | 257 | * path: path to tree or blob |
258 | */ | 258 | */ |
259 | void cgit_print_tree(const char *rev, char *path) | 259 | void cgit_print_tree(const char *rev, char *path) |
260 | { | 260 | { |
261 | unsigned char sha1[20]; | 261 | unsigned char sha1[20]; |
262 | struct commit *commit; | 262 | struct commit *commit; |
263 | const char *paths[] = {path, NULL}; | 263 | const char *paths[] = {path, NULL}; |
264 | 264 | ||
265 | if (!rev) | 265 | if (!rev) |
266 | rev = ctx.qry.head; | 266 | rev = ctx.qry.head; |
267 | 267 | ||
268 | curr_rev = xstrdup(rev); | 268 | curr_rev = xstrdup(rev); |
269 | if (get_sha1(rev, sha1)) { | 269 | if (get_sha1(rev, sha1)) { |
270 | cgit_print_error(fmt("Invalid revision name: %s", rev)); | 270 | cgit_print_error(fmt("Invalid revision name: %s", rev)); |
271 | return; | 271 | return; |
272 | } | 272 | } |
273 | commit = lookup_commit_reference(sha1); | 273 | commit = lookup_commit_reference(sha1); |
274 | if (!commit || parse_commit(commit)) { | 274 | if (!commit || parse_commit(commit)) { |
275 | cgit_print_error(fmt("Invalid commit reference: %s", rev)); | 275 | cgit_print_error(fmt("Invalid commit reference: %s", rev)); |
276 | return; | 276 | return; |
277 | } | 277 | } |
278 | 278 | ||
279 | html("path: <a href='"); | 279 | html("path: <a href='"); |
280 | html_attr(cgit_pageurl(ctx.qry.repo, "tree", fmt("h=%s", rev))); | 280 | html_attr(cgit_pageurl(ctx.qry.repo, "tree", fmt("h=%s", rev))); |
281 | html("'>root</a>"); | 281 | html("'>root</a>"); |
282 | 282 | ||
283 | if (path == NULL) { | 283 | if (path == NULL) { |
284 | ls_tree(commit->tree->object.sha1, NULL); | 284 | ls_tree(commit->tree->object.sha1, NULL); |
285 | return; | 285 | return; |
286 | } | 286 | } |
287 | 287 | ||
288 | match_path = path; | 288 | match_path = path; |
289 | read_tree_recursive(commit->tree, NULL, 0, 0, paths, walk_tree, NULL); | 289 | read_tree_recursive(commit->tree, "", 0, 0, paths, walk_tree, NULL); |
290 | ls_tail(); | 290 | ls_tail(); |
291 | } | 291 | } |