-rw-r--r-- | Makefile | 2 | ||||
-rw-r--r-- | cgit.c | 34 | ||||
-rw-r--r-- | cgit.h | 1 | ||||
-rw-r--r-- | ui-view.c | 40 |
4 files changed, 43 insertions, 34 deletions
@@ -5,9 +5,9 @@ INSTALL_CSS = /var/www/htdocs/cgit.css | |||
5 | CACHE_ROOT = /var/cache/cgit | 5 | CACHE_ROOT = /var/cache/cgit |
6 | 6 | ||
7 | EXTLIBS = ../git/libgit.a ../git/xdiff/lib.a -lz -lcrypto | 7 | EXTLIBS = ../git/libgit.a ../git/xdiff/lib.a -lz -lcrypto |
8 | OBJECTS = cache.o parsing.o html.o ui-shared.o ui-repolist.o ui-summary.o \ | 8 | OBJECTS = cache.o parsing.o html.o ui-shared.o ui-repolist.o ui-summary.o \ |
9 | ui-log.o | 9 | ui-log.o ui-view.c |
10 | 10 | ||
11 | CFLAGS += -Wall | 11 | CFLAGS += -Wall |
12 | 12 | ||
13 | all: cgit | 13 | all: cgit |
@@ -83,40 +83,8 @@ void cgit_querystring_cb(const char *name, const char *value) | |||
83 | cgit_query_has_sha1 = 1; | 83 | cgit_query_has_sha1 = 1; |
84 | } | 84 | } |
85 | } | 85 | } |
86 | 86 | ||
87 | static void cgit_print_object(char *hex) | ||
88 | { | ||
89 | unsigned char sha1[20]; | ||
90 | //struct object *object; | ||
91 | char type[20]; | ||
92 | unsigned char *buf; | ||
93 | unsigned long size; | ||
94 | |||
95 | if (get_sha1_hex(hex, sha1)){ | ||
96 | cgit_print_error(fmt("Bad hex value: %s", hex)); | ||
97 | return; | ||
98 | } | ||
99 | |||
100 | if (sha1_object_info(sha1, type, NULL)){ | ||
101 | cgit_print_error("Bad object name"); | ||
102 | return; | ||
103 | } | ||
104 | |||
105 | buf = read_sha1_file(sha1, type, &size); | ||
106 | if (!buf) { | ||
107 | cgit_print_error("Error reading object"); | ||
108 | return; | ||
109 | } | ||
110 | |||
111 | buf[size] = '\0'; | ||
112 | html("<h2>Object view</h2>"); | ||
113 | htmlf("sha1=%s<br/>type=%s<br/>size=%i<br/>", hex, type, size); | ||
114 | html("<pre>"); | ||
115 | html_txt(buf); | ||
116 | html("</pre>"); | ||
117 | } | ||
118 | |||
119 | static void cgit_print_repo_page(struct cacheitem *item) | 87 | static void cgit_print_repo_page(struct cacheitem *item) |
120 | { | 88 | { |
121 | if (chdir(fmt("%s/%s", cgit_root, cgit_query_repo)) || | 89 | if (chdir(fmt("%s/%s", cgit_root, cgit_query_repo)) || |
122 | cgit_read_config("info/cgit", cgit_repo_config_cb)) { | 90 | cgit_read_config("info/cgit", cgit_repo_config_cb)) { |
@@ -136,9 +104,9 @@ static void cgit_print_repo_page(struct cacheitem *item) | |||
136 | cgit_print_summary(); | 104 | cgit_print_summary(); |
137 | else if (!strcmp(cgit_query_page, "log")) { | 105 | else if (!strcmp(cgit_query_page, "log")) { |
138 | cgit_print_log(cgit_query_head, 0, 100); | 106 | cgit_print_log(cgit_query_head, 0, 100); |
139 | } else if (!strcmp(cgit_query_page, "view")) { | 107 | } else if (!strcmp(cgit_query_page, "view")) { |
140 | cgit_print_object(cgit_query_sha1); | 108 | cgit_print_view(cgit_query_sha1); |
141 | } | 109 | } |
142 | cgit_print_docend(); | 110 | cgit_print_docend(); |
143 | } | 111 | } |
144 | 112 | ||
@@ -76,8 +76,9 @@ extern void cgit_print_pageheader(char *title); | |||
76 | 76 | ||
77 | extern void cgit_print_repolist(struct cacheitem *item); | 77 | extern void cgit_print_repolist(struct cacheitem *item); |
78 | extern void cgit_print_summary(); | 78 | extern void cgit_print_summary(); |
79 | extern void cgit_print_log(const char *tip, int ofs, int cnt); | 79 | extern void cgit_print_log(const char *tip, int ofs, int cnt); |
80 | extern void cgit_print_view(char *hex); | ||
80 | 81 | ||
81 | extern void cgit_repo_config_cb(const char *name, const char *value); | 82 | extern void cgit_repo_config_cb(const char *name, const char *value); |
82 | 83 | ||
83 | 84 | ||
diff --git a/ui-view.c b/ui-view.c new file mode 100644 index 0000000..193c685 --- a/dev/null +++ b/ui-view.c | |||
@@ -0,0 +1,40 @@ | |||
1 | /* ui-view.c: functions to output _any_ object, given it's sha1 | ||
2 | * | ||
3 | * Copyright (C) 2006 Lars Hjemli | ||
4 | * | ||
5 | * Licensed under GNU General Public License v2 | ||
6 | * (see COPYING for full license text) | ||
7 | */ | ||
8 | |||
9 | #include "cgit.h" | ||
10 | |||
11 | void cgit_print_view(char *hex) | ||
12 | { | ||
13 | unsigned char sha1[20]; | ||
14 | char type[20]; | ||
15 | unsigned char *buf; | ||
16 | unsigned long size; | ||
17 | |||
18 | if (get_sha1_hex(hex, sha1)){ | ||
19 | cgit_print_error(fmt("Bad hex value: %s", hex)); | ||
20 | return; | ||
21 | } | ||
22 | |||
23 | if (sha1_object_info(sha1, type, NULL)){ | ||
24 | cgit_print_error("Bad object name"); | ||
25 | return; | ||
26 | } | ||
27 | |||
28 | buf = read_sha1_file(sha1, type, &size); | ||
29 | if (!buf) { | ||
30 | cgit_print_error("Error reading object"); | ||
31 | return; | ||
32 | } | ||
33 | |||
34 | buf[size] = '\0'; | ||
35 | html("<h2>Object view</h2>"); | ||
36 | htmlf("sha1=%s<br/>type=%s<br/>size=%i<br/>", hex, type, size); | ||
37 | html("<pre>"); | ||
38 | html_txt(buf); | ||
39 | html("</pre>"); | ||
40 | } | ||