author | Lars Hjemli <hjemli@gmail.com> | 2007-05-17 22:47:47 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2007-05-18 20:51:01 (UTC) |
commit | 305414df1246531baf0f2c959c2c61df4e93c526 (patch) (unidiff) | |
tree | 18f071e269f01b875fd0045723faab30345d93ae | |
parent | 08cc2e5f0e24773dad81d38bd6b689e36afe9dda (diff) | |
download | cgit-305414df1246531baf0f2c959c2c61df4e93c526.zip cgit-305414df1246531baf0f2c959c2c61df4e93c526.tar.gz cgit-305414df1246531baf0f2c959c2c61df4e93c526.tar.bz2 |
Move cgit_get_repoinfo into shared.c
This function will be usefull when parsing url arguments.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | cgit.c | 14 | ||||
-rw-r--r-- | cgit.h | 1 | ||||
-rw-r--r-- | shared.c | 13 |
3 files changed, 14 insertions, 14 deletions
@@ -2,38 +2,24 @@ | |||
2 | * | 2 | * |
3 | * Copyright (C) 2006 Lars Hjemli | 3 | * Copyright (C) 2006 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 | 10 | ||
11 | const char cgit_version[] = CGIT_VERSION; | 11 | const char cgit_version[] = CGIT_VERSION; |
12 | 12 | ||
13 | 13 | ||
14 | static struct repoinfo *cgit_get_repoinfo(char *url) | ||
15 | { | ||
16 | int i; | ||
17 | struct repoinfo *repo; | ||
18 | |||
19 | for (i=0; i<cgit_repolist.count; i++) { | ||
20 | repo = &cgit_repolist.repos[i]; | ||
21 | if (!strcmp(repo->url, url)) | ||
22 | return repo; | ||
23 | } | ||
24 | return NULL; | ||
25 | } | ||
26 | |||
27 | |||
28 | static int cgit_prepare_cache(struct cacheitem *item) | 14 | static int cgit_prepare_cache(struct cacheitem *item) |
29 | { | 15 | { |
30 | if (!cgit_query_repo) { | 16 | if (!cgit_query_repo) { |
31 | item->name = xstrdup(fmt("%s/index.html", cgit_cache_root)); | 17 | item->name = xstrdup(fmt("%s/index.html", cgit_cache_root)); |
32 | item->ttl = cgit_cache_root_ttl; | 18 | item->ttl = cgit_cache_root_ttl; |
33 | return 1; | 19 | return 1; |
34 | } | 20 | } |
35 | cgit_repo = cgit_get_repoinfo(cgit_query_repo); | 21 | cgit_repo = cgit_get_repoinfo(cgit_query_repo); |
36 | if (!cgit_repo) { | 22 | if (!cgit_repo) { |
37 | char *title = fmt("%s - %s", cgit_root_title, "Bad request"); | 23 | char *title = fmt("%s - %s", cgit_root_title, "Bad request"); |
38 | cgit_print_docstart(title, item); | 24 | cgit_print_docstart(title, item); |
39 | cgit_print_pageheader(title, 0); | 25 | cgit_print_pageheader(title, 0); |
@@ -103,24 +103,25 @@ extern char *cgit_querystring; | |||
103 | extern char *cgit_query_repo; | 103 | extern char *cgit_query_repo; |
104 | extern char *cgit_query_page; | 104 | extern char *cgit_query_page; |
105 | extern char *cgit_query_search; | 105 | extern char *cgit_query_search; |
106 | extern char *cgit_query_head; | 106 | extern char *cgit_query_head; |
107 | extern char *cgit_query_sha1; | 107 | extern char *cgit_query_sha1; |
108 | extern char *cgit_query_sha2; | 108 | extern char *cgit_query_sha2; |
109 | extern char *cgit_query_path; | 109 | extern char *cgit_query_path; |
110 | extern char *cgit_query_name; | 110 | extern char *cgit_query_name; |
111 | extern int cgit_query_ofs; | 111 | extern int cgit_query_ofs; |
112 | 112 | ||
113 | extern int htmlfd; | 113 | extern int htmlfd; |
114 | 114 | ||
115 | extern struct repoinfo *cgit_get_repoinfo(const char *url); | ||
115 | extern void cgit_global_config_cb(const char *name, const char *value); | 116 | extern void cgit_global_config_cb(const char *name, const char *value); |
116 | extern void cgit_repo_config_cb(const char *name, const char *value); | 117 | extern void cgit_repo_config_cb(const char *name, const char *value); |
117 | extern void cgit_querystring_cb(const char *name, const char *value); | 118 | extern void cgit_querystring_cb(const char *name, const char *value); |
118 | 119 | ||
119 | extern int chk_zero(int result, char *msg); | 120 | extern int chk_zero(int result, char *msg); |
120 | extern int chk_positive(int result, char *msg); | 121 | extern int chk_positive(int result, char *msg); |
121 | 122 | ||
122 | extern int hextoint(char c); | 123 | extern int hextoint(char c); |
123 | 124 | ||
124 | extern void *cgit_free_commitinfo(struct commitinfo *info); | 125 | extern void *cgit_free_commitinfo(struct commitinfo *info); |
125 | 126 | ||
126 | extern int cgit_diff_files(const unsigned char *old_sha1, | 127 | extern int cgit_diff_files(const unsigned char *old_sha1, |
@@ -84,24 +84,37 @@ struct repoinfo *add_repo(const char *url) | |||
84 | ret->name = ret->url; | 84 | ret->name = ret->url; |
85 | ret->path = NULL; | 85 | ret->path = NULL; |
86 | ret->desc = NULL; | 86 | ret->desc = NULL; |
87 | ret->owner = NULL; | 87 | ret->owner = NULL; |
88 | ret->defbranch = "master"; | 88 | ret->defbranch = "master"; |
89 | ret->snapshots = cgit_snapshots; | 89 | ret->snapshots = cgit_snapshots; |
90 | ret->enable_log_filecount = cgit_enable_log_filecount; | 90 | ret->enable_log_filecount = cgit_enable_log_filecount; |
91 | ret->enable_log_linecount = cgit_enable_log_linecount; | 91 | ret->enable_log_linecount = cgit_enable_log_linecount; |
92 | ret->module_link = cgit_module_link; | 92 | ret->module_link = cgit_module_link; |
93 | return ret; | 93 | return ret; |
94 | } | 94 | } |
95 | 95 | ||
96 | struct repoinfo *cgit_get_repoinfo(const char *url) | ||
97 | { | ||
98 | int i; | ||
99 | struct repoinfo *repo; | ||
100 | |||
101 | for (i=0; i<cgit_repolist.count; i++) { | ||
102 | repo = &cgit_repolist.repos[i]; | ||
103 | if (!strcmp(repo->url, url)) | ||
104 | return repo; | ||
105 | } | ||
106 | return NULL; | ||
107 | } | ||
108 | |||
96 | void cgit_global_config_cb(const char *name, const char *value) | 109 | void cgit_global_config_cb(const char *name, const char *value) |
97 | { | 110 | { |
98 | if (!strcmp(name, "root-title")) | 111 | if (!strcmp(name, "root-title")) |
99 | cgit_root_title = xstrdup(value); | 112 | cgit_root_title = xstrdup(value); |
100 | else if (!strcmp(name, "css")) | 113 | else if (!strcmp(name, "css")) |
101 | cgit_css = xstrdup(value); | 114 | cgit_css = xstrdup(value); |
102 | else if (!strcmp(name, "logo")) | 115 | else if (!strcmp(name, "logo")) |
103 | cgit_logo = xstrdup(value); | 116 | cgit_logo = xstrdup(value); |
104 | else if (!strcmp(name, "logo-link")) | 117 | else if (!strcmp(name, "logo-link")) |
105 | cgit_logo_link = xstrdup(value); | 118 | cgit_logo_link = xstrdup(value); |
106 | else if (!strcmp(name, "module-link")) | 119 | else if (!strcmp(name, "module-link")) |
107 | cgit_module_link = xstrdup(value); | 120 | cgit_module_link = xstrdup(value); |