summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--cgit.c1
-rw-r--r--cgit.h32
-rw-r--r--ui-blob.c1
-rw-r--r--ui-commit.c1
-rw-r--r--ui-diff.c1
-rw-r--r--ui-log.c1
-rw-r--r--ui-patch.c1
-rw-r--r--ui-refs.c1
-rw-r--r--ui-repolist.c1
-rw-r--r--ui-shared.h36
-rw-r--r--ui-snapshot.c1
-rw-r--r--ui-tag.c1
-rw-r--r--ui-tree.c1
13 files changed, 47 insertions, 32 deletions
diff --git a/cgit.c b/cgit.c
index 79e0e43..dbb023e 100644
--- a/cgit.c
+++ b/cgit.c
@@ -5,12 +5,13 @@
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 "ui-shared.h"
11 12
12static int cgit_prepare_cache(struct cacheitem *item) 13static int cgit_prepare_cache(struct cacheitem *item)
13{ 14{
14 if (!ctx.repo && ctx.qry.repo) { 15 if (!ctx.repo && ctx.qry.repo) {
15 ctx.page.title = fmt("%s - %s", ctx.cfg.root_title, 16 ctx.page.title = fmt("%s - %s", ctx.cfg.root_title,
16 "Bad request"); 17 "Bad request");
diff --git a/cgit.h b/cgit.h
index 1b23369..c1a231d 100644
--- a/cgit.h
+++ b/cgit.h
@@ -234,43 +234,11 @@ extern char *cache_safe_filename(const char *unsafe);
234extern int cache_lock(struct cacheitem *item); 234extern int cache_lock(struct cacheitem *item);
235extern int cache_unlock(struct cacheitem *item); 235extern int cache_unlock(struct cacheitem *item);
236extern int cache_cancel_lock(struct cacheitem *item); 236extern int cache_cancel_lock(struct cacheitem *item);
237extern int cache_exist(struct cacheitem *item); 237extern int cache_exist(struct cacheitem *item);
238extern int cache_expired(struct cacheitem *item); 238extern int cache_expired(struct cacheitem *item);
239 239
240extern char *cgit_repourl(const char *reponame);
241extern char *cgit_fileurl(const char *reponame, const char *pagename,
242 const char *filename, const char *query);
243extern char *cgit_pageurl(const char *reponame, const char *pagename,
244 const char *query);
245
246extern const char *cgit_repobasename(const char *reponame); 240extern const char *cgit_repobasename(const char *reponame);
247 241
248extern void cgit_tree_link(char *name, char *title, char *class, char *head,
249 char *rev, char *path);
250extern void cgit_log_link(char *name, char *title, char *class, char *head,
251 char *rev, char *path, int ofs, char *grep,
252 char *pattern);
253extern void cgit_commit_link(char *name, char *title, char *class, char *head,
254 char *rev);
255extern void cgit_refs_link(char *name, char *title, char *class, char *head,
256 char *rev, char *path);
257extern void cgit_snapshot_link(char *name, char *title, char *class,
258 char *head, char *rev, char *archivename);
259extern void cgit_diff_link(char *name, char *title, char *class, char *head,
260 char *new_rev, char *old_rev, char *path);
261
262extern void cgit_object_link(struct object *obj);
263
264extern void cgit_print_error(char *msg);
265extern void cgit_print_date(time_t secs, char *format);
266extern void cgit_print_age(time_t t, time_t max_relative, char *format);
267extern void cgit_print_http_headers(struct cgit_context *ctx);
268extern void cgit_print_docstart(struct cgit_context *ctx);
269extern void cgit_print_docend();
270extern void cgit_print_pageheader(struct cgit_context *ctx);
271extern void cgit_print_filemode(unsigned short mode);
272extern void cgit_print_snapshot_links(const char *repo, const char *head,
273 const char *hex, int snapshots);
274extern int cgit_parse_snapshots_mask(const char *str); 242extern int cgit_parse_snapshots_mask(const char *str);
275 243
276#endif /* CGIT_H */ 244#endif /* CGIT_H */
diff --git a/ui-blob.c b/ui-blob.c
index 3b29132..11589db 100644
--- a/ui-blob.c
+++ b/ui-blob.c
@@ -5,12 +5,13 @@
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 12
12void cgit_print_blob(const char *hex, char *path) 13void cgit_print_blob(const char *hex, char *path)
13{ 14{
14 15
15 unsigned char sha1[20]; 16 unsigned char sha1[20];
16 enum object_type type; 17 enum object_type type;
diff --git a/ui-commit.c b/ui-commit.c
index ed25824..8019e36 100644
--- a/ui-commit.c
+++ b/ui-commit.c
@@ -5,12 +5,13 @@
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 12
12static int files, slots; 13static int files, slots;
13static int total_adds, total_rems, max_changes; 14static int total_adds, total_rems, max_changes;
14static int lines_added, lines_removed; 15static int lines_added, lines_removed;
15static char *curr_rev; 16static char *curr_rev;
16 17
diff --git a/ui-diff.c b/ui-diff.c
index 5c3bc98..2a22009 100644
--- a/ui-diff.c
+++ b/ui-diff.c
@@ -5,12 +5,13 @@
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 12
12unsigned char old_rev_sha1[20]; 13unsigned char old_rev_sha1[20];
13unsigned char new_rev_sha1[20]; 14unsigned char new_rev_sha1[20];
14 15
15/* 16/*
16 * print a single line returned from xdiff 17 * print a single line returned from xdiff
diff --git a/ui-log.c b/ui-log.c
index e1d324d..60c9269 100644
--- a/ui-log.c
+++ b/ui-log.c
@@ -5,12 +5,13 @@
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 12
12int files, add_lines, rem_lines; 13int files, add_lines, rem_lines;
13 14
14void count_lines(char *line, int size) 15void count_lines(char *line, int size)
15{ 16{
16 if (size <= 0) 17 if (size <= 0)
diff --git a/ui-patch.c b/ui-patch.c
index 68ebb15..36bfae4 100644
--- a/ui-patch.c
+++ b/ui-patch.c
@@ -5,12 +5,13 @@
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 12
12static void print_line(char *line, int len) 13static void print_line(char *line, int len)
13{ 14{
14 char c = line[len-1]; 15 char c = line[len-1];
15 16
16 line[len-1] = '\0'; 17 line[len-1] = '\0';
diff --git a/ui-refs.c b/ui-refs.c
index fc82ca7..12533cd 100644
--- a/ui-refs.c
+++ b/ui-refs.c
@@ -5,12 +5,13 @@
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 12
12static int header; 13static int header;
13 14
14static int cmp_age(int age1, int age2) 15static int cmp_age(int age1, int age2)
15{ 16{
16 if (age1 != 0 && age2 != 0) 17 if (age1 != 0 && age2 != 0)
diff --git a/ui-repolist.c b/ui-repolist.c
index ad9b1bc..eeeaf3d 100644
--- a/ui-repolist.c
+++ b/ui-repolist.c
@@ -7,12 +7,13 @@
7 */ 7 */
8 8
9#include <time.h> 9#include <time.h>
10 10
11#include "cgit.h" 11#include "cgit.h"
12#include "html.h" 12#include "html.h"
13#include "ui-shared.h"
13 14
14time_t read_agefile(char *path) 15time_t read_agefile(char *path)
15{ 16{
16 FILE *f; 17 FILE *f;
17 static char buf[64], buf2[64]; 18 static char buf[64], buf2[64];
18 19
diff --git a/ui-shared.h b/ui-shared.h
new file mode 100644
index 0000000..94de884
--- a/dev/null
+++ b/ui-shared.h
@@ -0,0 +1,36 @@
1#ifndef UI_SHARED_H
2#define UI_SHARED_H
3
4extern char *cgit_repourl(const char *reponame);
5extern char *cgit_fileurl(const char *reponame, const char *pagename,
6 const char *filename, const char *query);
7extern char *cgit_pageurl(const char *reponame, const char *pagename,
8 const char *query);
9
10extern void cgit_tree_link(char *name, char *title, char *class, char *head,
11 char *rev, char *path);
12extern void cgit_log_link(char *name, char *title, char *class, char *head,
13 char *rev, char *path, int ofs, char *grep,
14 char *pattern);
15extern void cgit_commit_link(char *name, char *title, char *class, char *head,
16 char *rev);
17extern void cgit_refs_link(char *name, char *title, char *class, char *head,
18 char *rev, char *path);
19extern void cgit_snapshot_link(char *name, char *title, char *class,
20 char *head, char *rev, char *archivename);
21extern void cgit_diff_link(char *name, char *title, char *class, char *head,
22 char *new_rev, char *old_rev, char *path);
23extern void cgit_object_link(struct object *obj);
24
25extern void cgit_print_error(char *msg);
26extern void cgit_print_date(time_t secs, char *format);
27extern void cgit_print_age(time_t t, time_t max_relative, char *format);
28extern void cgit_print_http_headers(struct cgit_context *ctx);
29extern void cgit_print_docstart(struct cgit_context *ctx);
30extern void cgit_print_docend();
31extern void cgit_print_pageheader(struct cgit_context *ctx);
32extern void cgit_print_filemode(unsigned short mode);
33extern void cgit_print_snapshot_links(const char *repo, const char *head,
34 const char *hex, int snapshots);
35
36#endif /* UI_SHARED_H */
diff --git a/ui-snapshot.c b/ui-snapshot.c
index 512fcd2..966a140 100644
--- a/ui-snapshot.c
+++ b/ui-snapshot.c
@@ -5,12 +5,13 @@
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 12
12static int write_compressed_tar_archive(struct archiver_args *args,const char *filter) 13static int write_compressed_tar_archive(struct archiver_args *args,const char *filter)
13{ 14{
14 int rw[2]; 15 int rw[2];
15 pid_t gzpid; 16 pid_t gzpid;
16 int stdout2; 17 int stdout2;
diff --git a/ui-tag.c b/ui-tag.c
index 2998d02..ab2c66d 100644
--- a/ui-tag.c
+++ b/ui-tag.c
@@ -5,12 +5,13 @@
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 12
12static void print_tag_content(char *buf) 13static void print_tag_content(char *buf)
13{ 14{
14 char *p; 15 char *p;
15 16
16 if (!buf) 17 if (!buf)
diff --git a/ui-tree.c b/ui-tree.c
index 7912784..9be3140 100644
--- a/ui-tree.c
+++ b/ui-tree.c
@@ -5,12 +5,13 @@
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 12
12char *curr_rev; 13char *curr_rev;
13char *match_path; 14char *match_path;
14int header = 0; 15int header = 0;
15 16
16static void print_object(const unsigned char *sha1, char *path) 17static void print_object(const unsigned char *sha1, char *path)