-rw-r--r-- | Makefile | 1 | ||||
-rw-r--r-- | cmd.c | 19 | ||||
-rw-r--r-- | html.c | 7 | ||||
-rw-r--r-- | html.h | 1 | ||||
-rw-r--r-- | ui-clone.c | 104 | ||||
-rw-r--r-- | ui-clone.h | 8 |
6 files changed, 140 insertions, 0 deletions
@@ -48,24 +48,25 @@ endif | |||
48 | 48 | ||
49 | EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto | 49 | EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto |
50 | OBJECTS = | 50 | OBJECTS = |
51 | OBJECTS += cache.o | 51 | OBJECTS += cache.o |
52 | OBJECTS += cgit.o | 52 | OBJECTS += cgit.o |
53 | OBJECTS += cmd.o | 53 | OBJECTS += cmd.o |
54 | OBJECTS += configfile.o | 54 | OBJECTS += configfile.o |
55 | OBJECTS += html.o | 55 | OBJECTS += html.o |
56 | OBJECTS += parsing.o | 56 | OBJECTS += parsing.o |
57 | OBJECTS += shared.o | 57 | OBJECTS += shared.o |
58 | OBJECTS += ui-atom.o | 58 | OBJECTS += ui-atom.o |
59 | OBJECTS += ui-blob.o | 59 | OBJECTS += ui-blob.o |
60 | OBJECTS += ui-clone.o | ||
60 | OBJECTS += ui-commit.o | 61 | OBJECTS += ui-commit.o |
61 | OBJECTS += ui-diff.o | 62 | OBJECTS += ui-diff.o |
62 | OBJECTS += ui-log.o | 63 | OBJECTS += ui-log.o |
63 | OBJECTS += ui-patch.o | 64 | OBJECTS += ui-patch.o |
64 | OBJECTS += ui-refs.o | 65 | OBJECTS += ui-refs.o |
65 | OBJECTS += ui-repolist.o | 66 | OBJECTS += ui-repolist.o |
66 | OBJECTS += ui-shared.o | 67 | OBJECTS += ui-shared.o |
67 | OBJECTS += ui-snapshot.o | 68 | OBJECTS += ui-snapshot.o |
68 | OBJECTS += ui-summary.o | 69 | OBJECTS += ui-summary.o |
69 | OBJECTS += ui-tag.o | 70 | OBJECTS += ui-tag.o |
70 | OBJECTS += ui-tree.o | 71 | OBJECTS += ui-tree.o |
71 | 72 | ||
@@ -3,35 +3,41 @@ | |||
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 "cmd.h" | 10 | #include "cmd.h" |
11 | #include "cache.h" | 11 | #include "cache.h" |
12 | #include "ui-shared.h" | 12 | #include "ui-shared.h" |
13 | #include "ui-atom.h" | 13 | #include "ui-atom.h" |
14 | #include "ui-blob.h" | 14 | #include "ui-blob.h" |
15 | #include "ui-clone.h" | ||
15 | #include "ui-commit.h" | 16 | #include "ui-commit.h" |
16 | #include "ui-diff.h" | 17 | #include "ui-diff.h" |
17 | #include "ui-log.h" | 18 | #include "ui-log.h" |
18 | #include "ui-patch.h" | 19 | #include "ui-patch.h" |
19 | #include "ui-refs.h" | 20 | #include "ui-refs.h" |
20 | #include "ui-repolist.h" | 21 | #include "ui-repolist.h" |
21 | #include "ui-snapshot.h" | 22 | #include "ui-snapshot.h" |
22 | #include "ui-summary.h" | 23 | #include "ui-summary.h" |
23 | #include "ui-tag.h" | 24 | #include "ui-tag.h" |
24 | #include "ui-tree.h" | 25 | #include "ui-tree.h" |
25 | 26 | ||
27 | static void HEAD_fn(struct cgit_context *ctx) | ||
28 | { | ||
29 | cgit_clone_head(ctx); | ||
30 | } | ||
31 | |||
26 | static void atom_fn(struct cgit_context *ctx) | 32 | static void atom_fn(struct cgit_context *ctx) |
27 | { | 33 | { |
28 | cgit_print_atom(ctx->qry.head, ctx->qry.path, 10); | 34 | cgit_print_atom(ctx->qry.head, ctx->qry.path, 10); |
29 | } | 35 | } |
30 | 36 | ||
31 | static void about_fn(struct cgit_context *ctx) | 37 | static void about_fn(struct cgit_context *ctx) |
32 | { | 38 | { |
33 | if (ctx->repo) | 39 | if (ctx->repo) |
34 | cgit_print_repo_readme(); | 40 | cgit_print_repo_readme(); |
35 | else | 41 | else |
36 | cgit_print_site_readme(); | 42 | cgit_print_site_readme(); |
37 | } | 43 | } |
@@ -42,38 +48,48 @@ static void blob_fn(struct cgit_context *ctx) | |||
42 | } | 48 | } |
43 | 49 | ||
44 | static void commit_fn(struct cgit_context *ctx) | 50 | static void commit_fn(struct cgit_context *ctx) |
45 | { | 51 | { |
46 | cgit_print_commit(ctx->qry.sha1); | 52 | cgit_print_commit(ctx->qry.sha1); |
47 | } | 53 | } |
48 | 54 | ||
49 | static void diff_fn(struct cgit_context *ctx) | 55 | static void diff_fn(struct cgit_context *ctx) |
50 | { | 56 | { |
51 | cgit_print_diff(ctx->qry.sha1, ctx->qry.sha2, ctx->qry.path); | 57 | cgit_print_diff(ctx->qry.sha1, ctx->qry.sha2, ctx->qry.path); |
52 | } | 58 | } |
53 | 59 | ||
60 | static void info_fn(struct cgit_context *ctx) | ||
61 | { | ||
62 | cgit_clone_info(ctx); | ||
63 | } | ||
64 | |||
54 | static void log_fn(struct cgit_context *ctx) | 65 | static void log_fn(struct cgit_context *ctx) |
55 | { | 66 | { |
56 | cgit_print_log(ctx->qry.sha1, ctx->qry.ofs, ctx->cfg.max_commit_count, | 67 | cgit_print_log(ctx->qry.sha1, ctx->qry.ofs, ctx->cfg.max_commit_count, |
57 | ctx->qry.grep, ctx->qry.search, ctx->qry.path, 1); | 68 | ctx->qry.grep, ctx->qry.search, ctx->qry.path, 1); |
58 | } | 69 | } |
59 | 70 | ||
60 | static void ls_cache_fn(struct cgit_context *ctx) | 71 | static void ls_cache_fn(struct cgit_context *ctx) |
61 | { | 72 | { |
62 | ctx->page.mimetype = "text/plain"; | 73 | ctx->page.mimetype = "text/plain"; |
63 | ctx->page.filename = "ls-cache.txt"; | 74 | ctx->page.filename = "ls-cache.txt"; |
64 | cgit_print_http_headers(ctx); | 75 | cgit_print_http_headers(ctx); |
65 | cache_ls(ctx->cfg.cache_root); | 76 | cache_ls(ctx->cfg.cache_root); |
66 | } | 77 | } |
67 | 78 | ||
79 | static void objects_fn(struct cgit_context *ctx) | ||
80 | { | ||
81 | cgit_clone_objects(ctx); | ||
82 | } | ||
83 | |||
68 | static void repolist_fn(struct cgit_context *ctx) | 84 | static void repolist_fn(struct cgit_context *ctx) |
69 | { | 85 | { |
70 | cgit_print_repolist(); | 86 | cgit_print_repolist(); |
71 | } | 87 | } |
72 | 88 | ||
73 | static void patch_fn(struct cgit_context *ctx) | 89 | static void patch_fn(struct cgit_context *ctx) |
74 | { | 90 | { |
75 | cgit_print_patch(ctx->qry.sha1); | 91 | cgit_print_patch(ctx->qry.sha1); |
76 | } | 92 | } |
77 | 93 | ||
78 | static void refs_fn(struct cgit_context *ctx) | 94 | static void refs_fn(struct cgit_context *ctx) |
79 | { | 95 | { |
@@ -99,31 +115,34 @@ static void tag_fn(struct cgit_context *ctx) | |||
99 | 115 | ||
100 | static void tree_fn(struct cgit_context *ctx) | 116 | static void tree_fn(struct cgit_context *ctx) |
101 | { | 117 | { |
102 | cgit_print_tree(ctx->qry.sha1, ctx->qry.path); | 118 | cgit_print_tree(ctx->qry.sha1, ctx->qry.path); |
103 | } | 119 | } |
104 | 120 | ||
105 | #define def_cmd(name, want_repo, want_layout) \ | 121 | #define def_cmd(name, want_repo, want_layout) \ |
106 | {#name, name##_fn, want_repo, want_layout} | 122 | {#name, name##_fn, want_repo, want_layout} |
107 | 123 | ||
108 | struct cgit_cmd *cgit_get_cmd(struct cgit_context *ctx) | 124 | struct cgit_cmd *cgit_get_cmd(struct cgit_context *ctx) |
109 | { | 125 | { |
110 | static struct cgit_cmd cmds[] = { | 126 | static struct cgit_cmd cmds[] = { |
127 | def_cmd(HEAD, 1, 0), | ||
111 | def_cmd(atom, 1, 0), | 128 | def_cmd(atom, 1, 0), |
112 | def_cmd(about, 0, 1), | 129 | def_cmd(about, 0, 1), |
113 | def_cmd(blob, 1, 0), | 130 | def_cmd(blob, 1, 0), |
114 | def_cmd(commit, 1, 1), | 131 | def_cmd(commit, 1, 1), |
115 | def_cmd(diff, 1, 1), | 132 | def_cmd(diff, 1, 1), |
133 | def_cmd(info, 1, 0), | ||
116 | def_cmd(log, 1, 1), | 134 | def_cmd(log, 1, 1), |
117 | def_cmd(ls_cache, 0, 0), | 135 | def_cmd(ls_cache, 0, 0), |
136 | def_cmd(objects, 1, 0), | ||
118 | def_cmd(patch, 1, 0), | 137 | def_cmd(patch, 1, 0), |
119 | def_cmd(refs, 1, 1), | 138 | def_cmd(refs, 1, 1), |
120 | def_cmd(repolist, 0, 0), | 139 | def_cmd(repolist, 0, 0), |
121 | def_cmd(snapshot, 1, 0), | 140 | def_cmd(snapshot, 1, 0), |
122 | def_cmd(summary, 1, 1), | 141 | def_cmd(summary, 1, 1), |
123 | def_cmd(tag, 1, 1), | 142 | def_cmd(tag, 1, 1), |
124 | def_cmd(tree, 1, 1), | 143 | def_cmd(tree, 1, 1), |
125 | }; | 144 | }; |
126 | int i; | 145 | int i; |
127 | 146 | ||
128 | if (ctx->qry.page == NULL) { | 147 | if (ctx->qry.page == NULL) { |
129 | if (ctx->repo) | 148 | if (ctx->repo) |
@@ -42,24 +42,31 @@ void html(const char *txt) | |||
42 | 42 | ||
43 | void htmlf(const char *format, ...) | 43 | void htmlf(const char *format, ...) |
44 | { | 44 | { |
45 | static char buf[65536]; | 45 | static char buf[65536]; |
46 | va_list args; | 46 | va_list args; |
47 | 47 | ||
48 | va_start(args, format); | 48 | va_start(args, format); |
49 | vsnprintf(buf, sizeof(buf), format, args); | 49 | vsnprintf(buf, sizeof(buf), format, args); |
50 | va_end(args); | 50 | va_end(args); |
51 | html(buf); | 51 | html(buf); |
52 | } | 52 | } |
53 | 53 | ||
54 | void html_status(int code, int more_headers) | ||
55 | { | ||
56 | htmlf("Status: %d\n", code); | ||
57 | if (!more_headers) | ||
58 | html("\n"); | ||
59 | } | ||
60 | |||
54 | void html_txt(char *txt) | 61 | void html_txt(char *txt) |
55 | { | 62 | { |
56 | char *t = txt; | 63 | char *t = txt; |
57 | while(t && *t){ | 64 | while(t && *t){ |
58 | int c = *t; | 65 | int c = *t; |
59 | if (c=='<' || c=='>' || c=='&') { | 66 | if (c=='<' || c=='>' || c=='&') { |
60 | write(htmlfd, txt, t - txt); | 67 | write(htmlfd, txt, t - txt); |
61 | if (c=='>') | 68 | if (c=='>') |
62 | html(">"); | 69 | html(">"); |
63 | else if (c=='<') | 70 | else if (c=='<') |
64 | html("<"); | 71 | html("<"); |
65 | else if (c=='&') | 72 | else if (c=='&') |
@@ -1,19 +1,20 @@ | |||
1 | #ifndef HTML_H | 1 | #ifndef HTML_H |
2 | #define HTML_H | 2 | #define HTML_H |
3 | 3 | ||
4 | extern int htmlfd; | 4 | extern int htmlfd; |
5 | 5 | ||
6 | extern void html(const char *txt); | 6 | extern void html(const char *txt); |
7 | extern void htmlf(const char *format,...); | 7 | extern void htmlf(const char *format,...); |
8 | extern void html_status(int code, int more_headers); | ||
8 | extern void html_txt(char *txt); | 9 | extern void html_txt(char *txt); |
9 | extern void html_ntxt(int len, char *txt); | 10 | extern void html_ntxt(int len, char *txt); |
10 | extern void html_attr(char *txt); | 11 | extern void html_attr(char *txt); |
11 | extern void html_hidden(char *name, char *value); | 12 | extern void html_hidden(char *name, char *value); |
12 | extern void html_option(char *value, char *text, char *selected_value); | 13 | extern void html_option(char *value, char *text, char *selected_value); |
13 | extern void html_link_open(char *url, char *title, char *class); | 14 | extern void html_link_open(char *url, char *title, char *class); |
14 | extern void html_link_close(void); | 15 | extern void html_link_close(void); |
15 | extern void html_fileperm(unsigned short mode); | 16 | extern void html_fileperm(unsigned short mode); |
16 | extern int html_include(const char *filename); | 17 | extern int html_include(const char *filename); |
17 | 18 | ||
18 | extern int http_parse_querystring(char *txt, void (*fn)(const char *name, const char *value)); | 19 | extern int http_parse_querystring(char *txt, void (*fn)(const char *name, const char *value)); |
19 | 20 | ||
diff --git a/ui-clone.c b/ui-clone.c new file mode 100644 index 0000000..3a037ad --- a/dev/null +++ b/ui-clone.c | |||
@@ -0,0 +1,104 @@ | |||
1 | /* ui-clone.c: functions for http cloning, based on | ||
2 | * git's http-backend.c by Shawn O. Pearce | ||
3 | * | ||
4 | * Copyright (C) 2008 Lars Hjemli | ||
5 | * | ||
6 | * Licensed under GNU General Public License v2 | ||
7 | * (see COPYING for full license text) | ||
8 | */ | ||
9 | |||
10 | #include "cgit.h" | ||
11 | #include "html.h" | ||
12 | #include "ui-shared.h" | ||
13 | |||
14 | static int print_ref_info(const char *refname, const unsigned char *sha1, | ||
15 | int flags, void *cb_data) | ||
16 | { | ||
17 | struct object *obj; | ||
18 | |||
19 | if (!(obj = parse_object(sha1))) | ||
20 | return 0; | ||
21 | |||
22 | if (!strcmp(refname, "HEAD") || !prefixcmp(refname, "refs/heads/")) | ||
23 | htmlf("%s\t%s\n", sha1_to_hex(sha1), refname); | ||
24 | else if (!prefixcmp(refname, "refs/tags") && obj->type == OBJ_TAG) { | ||
25 | if (!(obj = deref_tag(obj, refname, 0))) | ||
26 | return 0; | ||
27 | htmlf("%s\t%s\n", sha1_to_hex(sha1), refname); | ||
28 | htmlf("%s\t%s^{}\n", sha1_to_hex(obj->sha1), refname); | ||
29 | } | ||
30 | return 0; | ||
31 | } | ||
32 | |||
33 | static void print_pack_info(struct cgit_context *ctx) | ||
34 | { | ||
35 | struct packed_git *pack; | ||
36 | int ofs; | ||
37 | |||
38 | ctx->page.mimetype = "text/plain"; | ||
39 | ctx->page.filename = "objects/info/packs"; | ||
40 | cgit_print_http_headers(ctx); | ||
41 | ofs = strlen(ctx->repo->path) + strlen("/objects/pack/"); | ||
42 | prepare_packed_git(); | ||
43 | for (pack = packed_git; pack; pack = pack->next) | ||
44 | if (pack->pack_local) | ||
45 | htmlf("P %s\n", pack->pack_name + ofs); | ||
46 | } | ||
47 | |||
48 | static void send_file(struct cgit_context *ctx, char *path) | ||
49 | { | ||
50 | struct stat st; | ||
51 | int err; | ||
52 | |||
53 | if (stat(path, &st)) { | ||
54 | switch (errno) { | ||
55 | case ENOENT: | ||
56 | err = 404; | ||
57 | break; | ||
58 | case EACCES: | ||
59 | err = 403; | ||
60 | break; | ||
61 | default: | ||
62 | err = 400; | ||
63 | } | ||
64 | html_status(err, 0); | ||
65 | return; | ||
66 | } | ||
67 | ctx->page.mimetype = "application/octet-stream"; | ||
68 | ctx->page.filename = path; | ||
69 | if (prefixcmp(ctx->repo->path, path)) | ||
70 | ctx->page.filename += strlen(ctx->repo->path) + 1; | ||
71 | cgit_print_http_headers(ctx); | ||
72 | html_include(path); | ||
73 | } | ||
74 | |||
75 | void cgit_clone_info(struct cgit_context *ctx) | ||
76 | { | ||
77 | if (!ctx->qry.path || strcmp(ctx->qry.path, "refs")) | ||
78 | return; | ||
79 | |||
80 | ctx->page.mimetype = "text/plain"; | ||
81 | ctx->page.filename = "info/refs"; | ||
82 | cgit_print_http_headers(ctx); | ||
83 | for_each_ref(print_ref_info, ctx); | ||
84 | } | ||
85 | |||
86 | void cgit_clone_objects(struct cgit_context *ctx) | ||
87 | { | ||
88 | if (!ctx->qry.path) { | ||
89 | html_status(400, 0); | ||
90 | return; | ||
91 | } | ||
92 | |||
93 | if (!strcmp(ctx->qry.path, "info/packs")) { | ||
94 | print_pack_info(ctx); | ||
95 | return; | ||
96 | } | ||
97 | |||
98 | send_file(ctx, git_path("objects/%s", ctx->qry.path)); | ||
99 | } | ||
100 | |||
101 | void cgit_clone_head(struct cgit_context *ctx) | ||
102 | { | ||
103 | send_file(ctx, git_path("%s", "HEAD")); | ||
104 | } | ||
diff --git a/ui-clone.h b/ui-clone.h new file mode 100644 index 0000000..89cd4f1 --- a/dev/null +++ b/ui-clone.h | |||
@@ -0,0 +1,8 @@ | |||
1 | #ifndef UI_CLONE_H | ||
2 | #define UI_CLONE_H | ||
3 | |||
4 | void cgit_clone_info(struct cgit_context *ctx); | ||
5 | void cgit_clone_objects(struct cgit_context *ctx); | ||
6 | void cgit_clone_head(struct cgit_context *ctx); | ||
7 | |||
8 | #endif /* UI_CLONE_H */ | ||