author | Johan Herland <johan@herland.net> | 2010-06-09 23:09:26 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2010-06-19 08:40:22 (UTC) |
commit | 0ff143df7043b7dd87c31c50fa875bc96d1a7779 (patch) (unidiff) | |
tree | d1625ba2aafed1ddfebc429921abdbb0d692042f /cgit.h | |
parent | 0e34c6d1ef32ea8f69019272fe72dbf2aeaba392 (diff) | |
download | cgit-0ff143df7043b7dd87c31c50fa875bc96d1a7779.zip cgit-0ff143df7043b7dd87c31c50fa875bc96d1a7779.tar.gz cgit-0ff143df7043b7dd87c31c50fa875bc96d1a7779.tar.bz2 |
struct cgit_cmd: Differentiate between various usages of ctx.qry.path
For many commands/pages (e.g. 'tree', 'diff', 'plain', etc.), the
ctx.qry.path argument is interpreted as a path within the "virtual" project
directory structure. However, for some other commands (notably 'refs', and
the clone-related commands) ctx.qry.path is used in a different context (as
a more or less "real" path within the '.git' directory).
This patch differentiates between these two usages of ctx.qry.path, by
introducing a new variable - ctx.qry.vpath - which is equal to ctx.qry.path
in the former case, and NULL in the latter.
This will become useful in future patches when we want various pages and the
links between them to preserve existing in-project paths.
Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | cgit.h | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -100,96 +100,97 @@ struct commitinfo { | |||
100 | char *subject; | 100 | char *subject; |
101 | char *msg; | 101 | char *msg; |
102 | char *msg_encoding; | 102 | char *msg_encoding; |
103 | }; | 103 | }; |
104 | 104 | ||
105 | struct taginfo { | 105 | struct taginfo { |
106 | char *tagger; | 106 | char *tagger; |
107 | char *tagger_email; | 107 | char *tagger_email; |
108 | unsigned long tagger_date; | 108 | unsigned long tagger_date; |
109 | char *msg; | 109 | char *msg; |
110 | }; | 110 | }; |
111 | 111 | ||
112 | struct refinfo { | 112 | struct refinfo { |
113 | const char *refname; | 113 | const char *refname; |
114 | struct object *object; | 114 | struct object *object; |
115 | union { | 115 | union { |
116 | struct taginfo *tag; | 116 | struct taginfo *tag; |
117 | struct commitinfo *commit; | 117 | struct commitinfo *commit; |
118 | }; | 118 | }; |
119 | }; | 119 | }; |
120 | 120 | ||
121 | struct reflist { | 121 | struct reflist { |
122 | struct refinfo **refs; | 122 | struct refinfo **refs; |
123 | int alloc; | 123 | int alloc; |
124 | int count; | 124 | int count; |
125 | }; | 125 | }; |
126 | 126 | ||
127 | struct cgit_query { | 127 | struct cgit_query { |
128 | int has_symref; | 128 | int has_symref; |
129 | int has_sha1; | 129 | int has_sha1; |
130 | char *raw; | 130 | char *raw; |
131 | char *repo; | 131 | char *repo; |
132 | char *page; | 132 | char *page; |
133 | char *search; | 133 | char *search; |
134 | char *grep; | 134 | char *grep; |
135 | char *head; | 135 | char *head; |
136 | char *sha1; | 136 | char *sha1; |
137 | char *sha2; | 137 | char *sha2; |
138 | char *path; | 138 | char *path; |
139 | char *name; | 139 | char *name; |
140 | char *mimetype; | 140 | char *mimetype; |
141 | char *url; | 141 | char *url; |
142 | char *period; | 142 | char *period; |
143 | int ofs; | 143 | int ofs; |
144 | int nohead; | 144 | int nohead; |
145 | char *sort; | 145 | char *sort; |
146 | int showmsg; | 146 | int showmsg; |
147 | int ssdiff; | 147 | int ssdiff; |
148 | char *vpath; | ||
148 | }; | 149 | }; |
149 | 150 | ||
150 | struct cgit_config { | 151 | struct cgit_config { |
151 | char *agefile; | 152 | char *agefile; |
152 | char *cache_root; | 153 | char *cache_root; |
153 | char *clone_prefix; | 154 | char *clone_prefix; |
154 | char *css; | 155 | char *css; |
155 | char *favicon; | 156 | char *favicon; |
156 | char *footer; | 157 | char *footer; |
157 | char *head_include; | 158 | char *head_include; |
158 | char *header; | 159 | char *header; |
159 | char *index_header; | 160 | char *index_header; |
160 | char *index_info; | 161 | char *index_info; |
161 | char *logo; | 162 | char *logo; |
162 | char *logo_link; | 163 | char *logo_link; |
163 | char *module_link; | 164 | char *module_link; |
164 | char *robots; | 165 | char *robots; |
165 | char *root_title; | 166 | char *root_title; |
166 | char *root_desc; | 167 | char *root_desc; |
167 | char *root_readme; | 168 | char *root_readme; |
168 | char *script_name; | 169 | char *script_name; |
169 | char *section; | 170 | char *section; |
170 | char *virtual_root; | 171 | char *virtual_root; |
171 | int cache_size; | 172 | int cache_size; |
172 | int cache_dynamic_ttl; | 173 | int cache_dynamic_ttl; |
173 | int cache_max_create_time; | 174 | int cache_max_create_time; |
174 | int cache_repo_ttl; | 175 | int cache_repo_ttl; |
175 | int cache_root_ttl; | 176 | int cache_root_ttl; |
176 | int cache_scanrc_ttl; | 177 | int cache_scanrc_ttl; |
177 | int cache_static_ttl; | 178 | int cache_static_ttl; |
178 | int embedded; | 179 | int embedded; |
179 | int enable_filter_overrides; | 180 | int enable_filter_overrides; |
180 | int enable_index_links; | 181 | int enable_index_links; |
181 | int enable_log_filecount; | 182 | int enable_log_filecount; |
182 | int enable_log_linecount; | 183 | int enable_log_linecount; |
183 | int enable_remote_branches; | 184 | int enable_remote_branches; |
184 | int enable_tree_linenumbers; | 185 | int enable_tree_linenumbers; |
185 | int local_time; | 186 | int local_time; |
186 | int max_repo_count; | 187 | int max_repo_count; |
187 | int max_commit_count; | 188 | int max_commit_count; |
188 | int max_lock_attempts; | 189 | int max_lock_attempts; |
189 | int max_msg_len; | 190 | int max_msg_len; |
190 | int max_repodesc_len; | 191 | int max_repodesc_len; |
191 | int max_blob_size; | 192 | int max_blob_size; |
192 | int max_stats; | 193 | int max_stats; |
193 | int nocache; | 194 | int nocache; |
194 | int noplainemail; | 195 | int noplainemail; |
195 | int noheader; | 196 | int noheader; |