summaryrefslogtreecommitdiffabout
authorMark Lodato <lodatom@gmail.com>2010-01-31 04:54:16 (UTC)
committer Mark Lodato <lodatom@gmail.com>2010-01-31 04:54:39 (UTC)
commit89082346d50ec283a16d3127677f30b427781b6a (patch) (unidiff)
tree64396b134f4a3c68a1f68e3fe1e77083cac09b8a
parent547a64fbd65de293c290f4e18bbeae958d54aaa7 (diff)
downloadcgit-89082346d50ec283a16d3127677f30b427781b6a.zip
cgit-89082346d50ec283a16d3127677f30b427781b6a.tar.gz
cgit-89082346d50ec283a16d3127677f30b427781b6a.tar.bz2
ui-plain: remove unused curr_rev variable
Signed-off-by: Mark Lodato <lodatom@gmail.com>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--ui-plain.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/ui-plain.c b/ui-plain.c
index 66cb19c..98e6908 100644
--- a/ui-plain.c
+++ b/ui-plain.c
@@ -1,94 +1,92 @@
1/* ui-plain.c: functions for output of plain blobs by path 1/* ui-plain.c: functions for output of plain blobs by path
2 * 2 *
3 * Copyright (C) 2008 Lars Hjemli 3 * Copyright (C) 2008 Lars Hjemli
4 * 4 *
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
13char *curr_rev;
14char *match_path; 13char *match_path;
15int match; 14int match;
16 15
17static void print_object(const unsigned char *sha1, const char *path) 16static void print_object(const unsigned char *sha1, const char *path)
18{ 17{
19 enum object_type type; 18 enum object_type type;
20 char *buf, *ext; 19 char *buf, *ext;
21 unsigned long size; 20 unsigned long size;
22 struct string_list_item *mime; 21 struct string_list_item *mime;
23 22
24 type = sha1_object_info(sha1, &size); 23 type = sha1_object_info(sha1, &size);
25 if (type == OBJ_BAD) { 24 if (type == OBJ_BAD) {
26 html_status(404, "Not found", 0); 25 html_status(404, "Not found", 0);
27 return; 26 return;
28 } 27 }
29 28
30 buf = read_sha1_file(sha1, &type, &size); 29 buf = read_sha1_file(sha1, &type, &size);
31 if (!buf) { 30 if (!buf) {
32 html_status(404, "Not found", 0); 31 html_status(404, "Not found", 0);
33 return; 32 return;
34 } 33 }
35 ctx.page.mimetype = NULL; 34 ctx.page.mimetype = NULL;
36 ext = strrchr(path, '.'); 35 ext = strrchr(path, '.');
37 if (ext && *(++ext)) { 36 if (ext && *(++ext)) {
38 mime = string_list_lookup(ext, &ctx.cfg.mimetypes); 37 mime = string_list_lookup(ext, &ctx.cfg.mimetypes);
39 if (mime) 38 if (mime)
40 ctx.page.mimetype = (char *)mime->util; 39 ctx.page.mimetype = (char *)mime->util;
41 } 40 }
42 if (!ctx.page.mimetype) { 41 if (!ctx.page.mimetype) {
43 if (buffer_is_binary(buf, size)) 42 if (buffer_is_binary(buf, size))
44 ctx.page.mimetype = "application/octet-stream"; 43 ctx.page.mimetype = "application/octet-stream";
45 else 44 else
46 ctx.page.mimetype = "text/plain"; 45 ctx.page.mimetype = "text/plain";
47 } 46 }
48 ctx.page.filename = fmt("%s", path); 47 ctx.page.filename = fmt("%s", path);
49 ctx.page.size = size; 48 ctx.page.size = size;
50 ctx.page.etag = sha1_to_hex(sha1); 49 ctx.page.etag = sha1_to_hex(sha1);
51 cgit_print_http_headers(&ctx); 50 cgit_print_http_headers(&ctx);
52 html_raw(buf, size); 51 html_raw(buf, size);
53 match = 1; 52 match = 1;
54} 53}
55 54
56static int walk_tree(const unsigned char *sha1, const char *base, int baselen, 55static int walk_tree(const unsigned char *sha1, const char *base, int baselen,
57 const char *pathname, unsigned mode, int stage, 56 const char *pathname, unsigned mode, int stage,
58 void *cbdata) 57 void *cbdata)
59{ 58{
60 if (S_ISDIR(mode)) 59 if (S_ISDIR(mode))
61 return READ_TREE_RECURSIVE; 60 return READ_TREE_RECURSIVE;
62 61
63 if (S_ISREG(mode) && !strncmp(base, match_path, baselen) && 62 if (S_ISREG(mode) && !strncmp(base, match_path, baselen) &&
64 !strcmp(pathname, match_path + baselen)) 63 !strcmp(pathname, match_path + baselen))
65 print_object(sha1, pathname); 64 print_object(sha1, pathname);
66 65
67 return 0; 66 return 0;
68} 67}
69 68
70void cgit_print_plain(struct cgit_context *ctx) 69void cgit_print_plain(struct cgit_context *ctx)
71{ 70{
72 const char *rev = ctx->qry.sha1; 71 const char *rev = ctx->qry.sha1;
73 unsigned char sha1[20]; 72 unsigned char sha1[20];
74 struct commit *commit; 73 struct commit *commit;
75 const char *paths[] = {ctx->qry.path, NULL}; 74 const char *paths[] = {ctx->qry.path, NULL};
76 75
77 if (!rev) 76 if (!rev)
78 rev = ctx->qry.head; 77 rev = ctx->qry.head;
79 78
80 curr_rev = xstrdup(rev);
81 if (get_sha1(rev, sha1)) { 79 if (get_sha1(rev, sha1)) {
82 html_status(404, "Not found", 0); 80 html_status(404, "Not found", 0);
83 return; 81 return;
84 } 82 }
85 commit = lookup_commit_reference(sha1); 83 commit = lookup_commit_reference(sha1);
86 if (!commit || parse_commit(commit)) { 84 if (!commit || parse_commit(commit)) {
87 html_status(404, "Not found", 0); 85 html_status(404, "Not found", 0);
88 return; 86 return;
89 } 87 }
90 match_path = ctx->qry.path; 88 match_path = ctx->qry.path;
91 read_tree_recursive(commit->tree, "", 0, 0, paths, walk_tree, NULL); 89 read_tree_recursive(commit->tree, "", 0, 0, paths, walk_tree, NULL);
92 if (!match) 90 if (!match)
93 html_status(404, "Not found", 0); 91 html_status(404, "Not found", 0);
94} 92}