*/
#include "cgit.h"
+#include "ui-shared.h"
#include "cmd.h"
#include "html.h"
"Jul", "Aug", "Sep", "Oct", "Nov", "Dec"};
struct tm *tm = gmtime(&t);
return fmt("%s, %02d %s %04d %02d:%02d:%02d GMT", day[tm->tm_wday],
- tm->tm_mday, month[tm->tm_mon], 1900+tm->tm_year,
+ tm->tm_mday, month[tm->tm_mon], 1900 + tm->tm_year,
tm->tm_hour, tm->tm_min, tm->tm_sec);
}
-void cgit_print_error(const char *msg)
+void cgit_print_error(const char *fmt, ...)
{
+ va_list ap;
+ va_start(ap, fmt);
+ cgit_vprint_error(fmt, ap);
+ va_end(ap);
+}
+
+void cgit_vprint_error(const char *fmt, va_list ap)
+{
+ va_list cp;
html("<div class='error'>");
- html_txt(msg);
+ va_copy(cp, ap);
+ html_vtxtf(fmt, cp);
+ va_end(cp);
html("</div>\n");
}
-char *cgit_httpscheme()
+const char *cgit_httpscheme()
{
if (ctx.env.https && !strcmp(ctx.env.https, "on"))
return "https://";
return "http://";
}
-char *cgit_hosturl()
+const char *cgit_hosturl()
{
if (ctx.env.http_host)
return ctx.env.http_host;
return xstrdup(fmt("%s:%s", ctx.env.server_name, ctx.env.server_port));
}
-char *cgit_rooturl()
+const char *cgit_rooturl()
{
if (ctx.cfg.virtual_root)
- return fmt("%s/", ctx.cfg.virtual_root);
+ return ctx.cfg.virtual_root;
else
return ctx.cfg.script_name;
}
char *cgit_repourl(const char *reponame)
{
if (ctx.cfg.virtual_root) {
- return fmt("%s/%s/", ctx.cfg.virtual_root, reponame);
+ return fmt("%s%s/", ctx.cfg.virtual_root, reponame);
} else {
return fmt("?r=%s", reponame);
}
char *delim;
if (ctx.cfg.virtual_root) {
- tmp = fmt("%s/%s/%s/%s", ctx.cfg.virtual_root, reponame,
+ tmp = fmt("%s%s/%s/%s", ctx.cfg.virtual_root, reponame,
pagename, (filename ? filename:""));
delim = "?";
} else {
tmp = fmt("?url=%s/%s/%s", reponame, pagename,
(filename ? filename : ""));
- delim = "&";
+ delim = "&";
}
if (query)
tmp = fmt("%s%s%s", tmp, delim, query);
char *cgit_pageurl(const char *reponame, const char *pagename,
const char *query)
{
- return cgit_fileurl(reponame,pagename,0,query);
+ return cgit_fileurl(reponame, pagename, 0, query);
}
const char *cgit_repobasename(const char *reponame)
static char rvbuf[1024];
int p;
const char *rv;
- strncpy(rvbuf,reponame,sizeof(rvbuf));
- if(rvbuf[sizeof(rvbuf)-1])
+ strncpy(rvbuf, reponame, sizeof(rvbuf));
+ if (rvbuf[sizeof(rvbuf)-1])
die("cgit_repobasename: truncated repository name '%s'", reponame);
p = strlen(rvbuf)-1;
/* strip trailing slashes */
- while(p && rvbuf[p]=='/') rvbuf[p--]=0;
+ while (p && rvbuf[p] == '/') rvbuf[p--] = 0;
/* strip trailing .git */
- if(p>=3 && !strncmp(&rvbuf[p-3],".git",4)) {
+ if (p >= 3 && !strncmp(&rvbuf[p-3], ".git", 4)) {
p -= 3; rvbuf[p--] = 0;
}
/* strip more trailing slashes if any */
- while( p && rvbuf[p]=='/') rvbuf[p--]=0;
+ while ( p && rvbuf[p] == '/') rvbuf[p--] = 0;
/* find last slash in the remaining string */
rv = strrchr(rvbuf,'/');
- if(rv)
+ if (rv)
return ++rv;
return rvbuf;
}
-char *cgit_currurl()
-{
- if (!ctx.cfg.virtual_root)
- return ctx.cfg.script_name;
- else if (ctx.qry.page)
- return fmt("%s/%s/%s/", ctx.cfg.virtual_root, ctx.qry.repo, ctx.qry.page);
- else if (ctx.qry.repo)
- return fmt("%s/%s/", ctx.cfg.virtual_root, ctx.qry.repo);
- else
- return fmt("%s/", ctx.cfg.virtual_root);
-}
-
-static void site_url(const char *page, const char *search, int ofs)
+static void site_url(const char *page, const char *search, const char *sort, int ofs)
{
char *delim = "?";
- if (ctx.cfg.virtual_root) {
+ if (ctx.cfg.virtual_root)
html_attr(ctx.cfg.virtual_root);
- if (ctx.cfg.virtual_root[strlen(ctx.cfg.virtual_root) - 1] != '/')
- html("/");
- } else
+ else
html(ctx.cfg.script_name);
if (page) {
htmlf("?p=%s", page);
- delim = "&";
+ delim = "&";
}
if (search) {
html(delim);
html("q=");
html_attr(search);
- delim = "&";
+ delim = "&";
+ }
+ if (sort) {
+ html(delim);
+ html("s=");
+ html_attr(sort);
+ delim = "&";
}
if (ofs) {
html(delim);
}
static void site_link(const char *page, const char *name, const char *title,
- const char *class, const char *search, int ofs)
+ const char *class, const char *search, const char *sort, int ofs)
{
html("<a");
if (title) {
html("'");
}
html(" href='");
- site_url(page, search, ofs);
+ site_url(page, search, sort, ofs);
html("'>");
html_txt(name);
html("</a>");
}
void cgit_index_link(const char *name, const char *title, const char *class,
- const char *pattern, int ofs)
+ const char *pattern, const char *sort, int ofs)
{
- site_link(NULL, name, title, class, pattern, ofs);
+ site_link(NULL, name, title, class, pattern, sort, ofs);
}
static char *repolink(const char *title, const char *class, const char *page,
html(" href='");
if (ctx.cfg.virtual_root) {
html_url_path(ctx.cfg.virtual_root);
- if (ctx.cfg.virtual_root[strlen(ctx.cfg.virtual_root) - 1] != '/')
- html("/");
html_url_path(ctx.repo->url);
if (ctx.repo->url[strlen(ctx.repo->url) - 1] != '/')
html("/");
char *delim;
delim = repolink(title, class, "log", head, path);
- if (rev && strcmp(rev, ctx.qry.head)) {
+ if (rev && ctx.qry.head && strcmp(rev, ctx.qry.head)) {
html(delim);
html("id=");
html_url_arg(rev);
- delim = "&";
+ delim = "&";
}
if (grep && pattern) {
html(delim);
html("qt=");
html_url_arg(grep);
- delim = "&";
+ delim = "&";
html(delim);
html("q=");
html_url_arg(pattern);
html(delim);
html("ofs=");
htmlf("%d", ofs);
- delim = "&";
+ delim = "&";
}
if (showmsg) {
html(delim);
char *delim;
delim = repolink(title, class, "commit", head, path);
- if (rev && strcmp(rev, ctx.qry.head)) {
+ if (rev && ctx.qry.head && strcmp(rev, ctx.qry.head)) {
html(delim);
html("id=");
html_url_arg(rev);
delim = "&";
}
html("'>");
- html_txt(name);
+ if (name[0] != '\0')
+ html_txt(name);
+ else
+ html_txt("(no commit message)");
html("</a>");
}
reporevlink("stats", name, title, class, head, NULL, path);
}
-void cgit_self_link(char *name, const char *title, const char *class,
- struct cgit_context *ctx)
+static void cgit_self_link(char *name, const char *title, const char *class,
+ struct cgit_context *ctx)
{
if (!strcmp(ctx->qry.page, "repolist"))
- return cgit_index_link(name, title, class, ctx->qry.search,
- ctx->qry.ofs);
+ cgit_index_link(name, title, class, ctx->qry.search, ctx->qry.sort,
+ ctx->qry.ofs);
else if (!strcmp(ctx->qry.page, "summary"))
- return cgit_summary_link(name, title, class, ctx->qry.head);
+ cgit_summary_link(name, title, class, ctx->qry.head);
else if (!strcmp(ctx->qry.page, "tag"))
- return cgit_tag_link(name, title, class, ctx->qry.head,
- ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL);
+ cgit_tag_link(name, title, class, ctx->qry.head,
+ ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL);
else if (!strcmp(ctx->qry.page, "tree"))
- return cgit_tree_link(name, title, class, ctx->qry.head,
- ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL,
- ctx->qry.path);
+ cgit_tree_link(name, title, class, ctx->qry.head,
+ ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL,
+ ctx->qry.path);
else if (!strcmp(ctx->qry.page, "plain"))
- return cgit_plain_link(name, title, class, ctx->qry.head,
- ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL,
- ctx->qry.path);
+ cgit_plain_link(name, title, class, ctx->qry.head,
+ ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL,
+ ctx->qry.path);
else if (!strcmp(ctx->qry.page, "log"))
- return cgit_log_link(name, title, class, ctx->qry.head,
- ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL,
- ctx->qry.path, ctx->qry.ofs,
- ctx->qry.grep, ctx->qry.search,
- ctx->qry.showmsg);
+ cgit_log_link(name, title, class, ctx->qry.head,
+ ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL,
+ ctx->qry.path, ctx->qry.ofs,
+ ctx->qry.grep, ctx->qry.search,
+ ctx->qry.showmsg);
else if (!strcmp(ctx->qry.page, "commit"))
- return cgit_commit_link(name, title, class, ctx->qry.head,
- ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL,
- ctx->qry.path, 0);
+ cgit_commit_link(name, title, class, ctx->qry.head,
+ ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL,
+ ctx->qry.path, 0);
else if (!strcmp(ctx->qry.page, "patch"))
- return cgit_patch_link(name, title, class, ctx->qry.head,
- ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL,
- ctx->qry.path);
+ cgit_patch_link(name, title, class, ctx->qry.head,
+ ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL,
+ ctx->qry.path);
else if (!strcmp(ctx->qry.page, "refs"))
- return cgit_refs_link(name, title, class, ctx->qry.head,
- ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL,
- ctx->qry.path);
+ cgit_refs_link(name, title, class, ctx->qry.head,
+ ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL,
+ ctx->qry.path);
else if (!strcmp(ctx->qry.page, "snapshot"))
- return cgit_snapshot_link(name, title, class, ctx->qry.head,
- ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL,
- ctx->qry.path);
+ cgit_snapshot_link(name, title, class, ctx->qry.head,
+ ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL,
+ ctx->qry.path);
else if (!strcmp(ctx->qry.page, "diff"))
- return cgit_diff_link(name, title, class, ctx->qry.head,
- ctx->qry.sha1, ctx->qry.sha2,
- ctx->qry.path, 0);
+ cgit_diff_link(name, title, class, ctx->qry.head,
+ ctx->qry.sha1, ctx->qry.sha2,
+ ctx->qry.path, 0);
else if (!strcmp(ctx->qry.page, "stats"))
- return cgit_stats_link(name, title, class, ctx->qry.head,
- ctx->qry.path);
-
- /* Don't known how to make link for this page */
- repolink(title, class, ctx->qry.page, ctx->qry.head, ctx->qry.path);
- html("><!-- cgit_self_link() doesn't know how to make link for page '");
- html_txt(ctx->qry.page);
- html("' -->");
- html_txt(name);
- html("</a>");
+ cgit_stats_link(name, title, class, ctx->qry.head,
+ ctx->qry.path);
+ else {
+ /* Don't known how to make link for this page */
+ repolink(title, class, ctx->qry.page, ctx->qry.head, ctx->qry.path);
+ html("><!-- cgit_self_link() doesn't know how to make link for page '");
+ html_txt(ctx->qry.page);
+ html("' -->");
+ html_txt(name);
+ html("</a>");
+ }
}
void cgit_object_link(struct object *obj)
shortrev = xstrdup(fullrev);
shortrev[10] = '\0';
if (obj->type == OBJ_COMMIT) {
- cgit_commit_link(fmt("commit %s...", shortrev), NULL, NULL,
+ cgit_commit_link(fmt("commit %s...", shortrev), NULL, NULL,
ctx.qry.head, fullrev, NULL, 0);
return;
} else if (obj->type == OBJ_TREE)
reporevlink(page, name, NULL, NULL, ctx.qry.head, fullrev, NULL);
}
-struct string_list_item *lookup_path(struct string_list *list,
- const char *path)
+static struct string_list_item *lookup_path(struct string_list *list,
+ const char *path)
{
struct string_list_item *item;
char tail, *dir;
size_t len;
+ len = 0;
tail = 0;
list = &ctx.repo->submodules;
item = lookup_path(list, path);
html("'>");
html_txt(path);
html("</a>");
+ html_txt(fmt(" @ %.7s", rev));
if (item && tail)
path[len - 1] = tail;
}
if (!secs)
return;
- if(local_time)
+ if (local_time)
time = localtime(&secs);
else
time = gmtime(&secs);
return;
}
- char *host = cgit_hosturl();
+ const char *host = cgit_hosturl();
html(cgit_doctype);
html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n");
html("<head>\n");
html_attr(ctx->cfg.favicon);
html("'/>\n");
}
- if (host && ctx->repo) {
+ if (host && ctx->repo && ctx->qry.head) {
html("<link rel='alternate' title='Atom feed' href='");
html(cgit_httpscheme());
html_attr(cgit_hosturl());
html("</body>\n</html>\n");
}
-int print_branch_option(const char *refname, const unsigned char *sha1,
- int flags, void *cb_data)
+static int print_branch_option(const char *refname, const unsigned char *sha1,
+ int flags, void *cb_data)
{
char *name = (char *)refname;
html_option(name, name, ctx.qry.head);
return 0;
}
-int print_archive_ref(const char *refname, const unsigned char *sha1,
- int flags, void *cb_data)
-{
- struct tag *tag;
- struct taginfo *info;
- struct object *obj;
- char buf[256], *url;
- unsigned char fileid[20];
- int *header = (int *)cb_data;
-
- if (prefixcmp(refname, "refs/archives"))
- return 0;
- strncpy(buf, refname+14, sizeof(buf));
- obj = parse_object(sha1);
- if (!obj)
- return 1;
- if (obj->type == OBJ_TAG) {
- tag = lookup_tag(sha1);
- if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag)))
- return 0;
- hashcpy(fileid, tag->tagged->sha1);
- } else if (obj->type != OBJ_BLOB) {
- return 0;
- } else {
- hashcpy(fileid, sha1);
- }
- if (!*header) {
- html("<h1>download</h1>\n");
- *header = 1;
- }
- url = cgit_pageurl(ctx.qry.repo, "blob",
- fmt("id=%s&path=%s", sha1_to_hex(fileid),
- buf));
- html_link_open(url, NULL, "menu");
- html_txt(strlpart(buf, 20));
- html_link_close();
- return 0;
-}
-
void cgit_add_hidden_formfields(int incl_head, int incl_search,
const char *page)
{
html("<td class='main'>");
if (ctx->repo) {
- cgit_index_link("index", NULL, NULL, NULL, 0);
+ cgit_index_link("index", NULL, NULL, NULL, NULL, 0);
html(" : ");
cgit_summary_link(ctx->repo->name, ctx->repo->name, NULL, NULL);
html("</td><td class='form'>");
html("<input type='submit' value='search'/>\n");
html("</form>\n");
} else {
- site_link(NULL, "index", NULL, hc(ctx, "repolist"), NULL, 0);
+ site_link(NULL, "index", NULL, hc(ctx, "repolist"), NULL, NULL, 0);
if (ctx->cfg.root_readme)
site_link("about", "about", NULL, hc(ctx, "about"),
- NULL, 0);
+ NULL, NULL, 0);
html("</td><td class='form'>");
html("<form method='get' action='");
html_attr(cgit_rooturl());
{
const struct cgit_snapshot_format* f;
char *prefix;
- char *filename;
+ char *filename;
unsigned char sha1[20];
if (get_sha1(fmt("refs/tags/%s", hex), sha1) == 0 &&
cgit_snapshot_link(filename, NULL, NULL, NULL, NULL, filename);
html("<br/>");
}
+ free(prefix);
}
projects / ps-cgit / blobdiff