3 files changed, 13 insertions, 0 deletions

diff --git a/cgit.c b/cgit.c
index 64d95f9..2aef44d 100644
--- a/cgit.c
+++ b/cgit.c
@@ -26,96 +26,98 @@ void config_cb(const char *name, const char *value)
         else if (!strcmp(name, "root-readme"))
                 ctx.cfg.root_readme = xstrdup(value);
         else if (!strcmp(name, "css"))
                 ctx.cfg.css = xstrdup(value);
         else if (!strcmp(name, "favicon"))
                 ctx.cfg.favicon = xstrdup(value);
         else if (!strcmp(name, "footer"))
                 ctx.cfg.footer = xstrdup(value);
         else if (!strcmp(name, "header"))
                 ctx.cfg.header = xstrdup(value);
         else if (!strcmp(name, "logo"))
                 ctx.cfg.logo = xstrdup(value);
         else if (!strcmp(name, "index-header"))
                 ctx.cfg.index_header = xstrdup(value);
         else if (!strcmp(name, "index-info"))
                 ctx.cfg.index_info = xstrdup(value);
         else if (!strcmp(name, "logo-link"))
                 ctx.cfg.logo_link = xstrdup(value);
         else if (!strcmp(name, "module-link"))
                 ctx.cfg.module_link = xstrdup(value);
         else if (!strcmp(name, "virtual-root")) {
                 ctx.cfg.virtual_root = trim_end(value, '/');
                 if (!ctx.cfg.virtual_root && (!strcmp(value, "/")))
                         ctx.cfg.virtual_root = "";
         } else if (!strcmp(name, "nocache"))
                 ctx.cfg.nocache = atoi(value);
         else if (!strcmp(name, "snapshots"))
                 ctx.cfg.snapshots = cgit_parse_snapshots_mask(value);
         else if (!strcmp(name, "enable-index-links"))
                 ctx.cfg.enable_index_links = atoi(value);
         else if (!strcmp(name, "enable-log-filecount"))
                 ctx.cfg.enable_log_filecount = atoi(value);
         else if (!strcmp(name, "enable-log-linecount"))
                 ctx.cfg.enable_log_linecount = atoi(value);
         else if (!strcmp(name, "max-stats"))
                 ctx.cfg.max_stats = cgit_find_stats_period(value, NULL);
         else if (!strcmp(name, "cache-size"))
                 ctx.cfg.cache_size = atoi(value);
         else if (!strcmp(name, "cache-root"))
                 ctx.cfg.cache_root = xstrdup(value);
         else if (!strcmp(name, "cache-root-ttl"))
                 ctx.cfg.cache_root_ttl = atoi(value);
         else if (!strcmp(name, "cache-repo-ttl"))
                 ctx.cfg.cache_repo_ttl = atoi(value);
         else if (!strcmp(name, "cache-static-ttl"))
                 ctx.cfg.cache_static_ttl = atoi(value);
         else if (!strcmp(name, "cache-dynamic-ttl"))
                 ctx.cfg.cache_dynamic_ttl = atoi(value);
+        else if (!strcmp(name, "embedded"))
+                ctx.cfg.embedded = atoi(value);
         else if (!strcmp(name, "max-message-length"))
                 ctx.cfg.max_msg_len = atoi(value);
         else if (!strcmp(name, "max-repodesc-length"))
                 ctx.cfg.max_repodesc_len = atoi(value);
         else if (!strcmp(name, "max-repo-count"))
                 ctx.cfg.max_repo_count = atoi(value);
         else if (!strcmp(name, "max-commit-count"))
                 ctx.cfg.max_commit_count = atoi(value);
         else if (!strcmp(name, "summary-log"))
                 ctx.cfg.summary_log = atoi(value);
         else if (!strcmp(name, "summary-branches"))
                 ctx.cfg.summary_branches = atoi(value);
         else if (!strcmp(name, "summary-tags"))
                 ctx.cfg.summary_tags = atoi(value);
         else if (!strcmp(name, "agefile"))
                 ctx.cfg.agefile = xstrdup(value);
         else if (!strcmp(name, "renamelimit"))
                 ctx.cfg.renamelimit = atoi(value);
         else if (!strcmp(name, "robots"))
                 ctx.cfg.robots = xstrdup(value);
         else if (!strcmp(name, "clone-prefix"))
                 ctx.cfg.clone_prefix = xstrdup(value);
         else if (!strcmp(name, "local-time"))
                 ctx.cfg.local_time = atoi(value);
         else if (!strcmp(name, "repo.group"))
                 ctx.cfg.repo_group = xstrdup(value);
         else if (!strcmp(name, "repo.url"))
                 ctx.repo = cgit_add_repo(value);
         else if (!strcmp(name, "repo.name"))
                 ctx.repo->name = xstrdup(value);
         else if (ctx.repo && !strcmp(name, "repo.path"))
                 ctx.repo->path = trim_end(value, '/');
         else if (ctx.repo && !strcmp(name, "repo.clone-url"))
                 ctx.repo->clone_url = xstrdup(value);
         else if (ctx.repo && !strcmp(name, "repo.desc"))
                 ctx.repo->desc = xstrdup(value);
         else if (ctx.repo && !strcmp(name, "repo.owner"))
                 ctx.repo->owner = xstrdup(value);
         else if (ctx.repo && !strcmp(name, "repo.defbranch"))
                 ctx.repo->defbranch = xstrdup(value);
         else if (ctx.repo && !strcmp(name, "repo.snapshots"))
                 ctx.repo->snapshots = ctx.cfg.snapshots & cgit_parse_snapshots_mask(value); /* XXX: &? */
         else if (ctx.repo && !strcmp(name, "repo.enable-log-filecount"))
                 ctx.repo->enable_log_filecount = ctx.cfg.enable_log_filecount * atoi(value);
         else if (ctx.repo && !strcmp(name, "repo.enable-log-linecount"))
                 ctx.repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value);
         else if (ctx.repo && !strcmp(name, "repo.max-stats"))
                 ctx.repo->max_stats = cgit_find_stats_period(value, NULL);
diff --git a/cgit.h b/cgit.h
index 5f7af51..73d7208 100644
--- a/cgit.h
+++ b/cgit.h
@@ -126,96 +126,97 @@ struct cgit_query {
         int   ofs;
         int nohead;
         char *sort;
         int showmsg;
 };
 
 struct cgit_config {
         char *agefile;
         char *cache_root;
         char *clone_prefix;
         char *css;
         char *favicon;
         char *footer;
         char *header;
         char *index_header;
         char *index_info;
         char *logo;
         char *logo_link;
         char *module_link;
         char *repo_group;
         char *robots;
         char *root_title;
         char *root_desc;
         char *root_readme;
         char *script_name;
         char *virtual_root;
         int cache_size;
         int cache_dynamic_ttl;
         int cache_max_create_time;
         int cache_repo_ttl;
         int cache_root_ttl;
         int cache_static_ttl;
         int enable_index_links;
         int enable_log_filecount;
         int enable_log_linecount;
         int local_time;
         int max_repo_count;
         int max_commit_count;
         int max_lock_attempts;
         int max_msg_len;
         int max_repodesc_len;
         int max_stats;
         int nocache;
         int renamelimit;
         int snapshots;
         int summary_branches;
         int summary_log;
         int summary_tags;
+        int embedded;
 };
 
 struct cgit_page {
         time_t modified;
         time_t expires;
         size_t size;
         char *mimetype;
         char *charset;
         char *filename;
         char *title;
 };
 
 struct cgit_context {
         struct cgit_query qry;
         struct cgit_config cfg;
         struct cgit_repo *repo;
         struct cgit_page page;
 };
 
 struct cgit_snapshot_format {
         const char *suffix;
         const char *mimetype;
         write_archive_fn_t write_func;
         int bit;
 };
 
 extern const char *cgit_version;
 
 extern struct cgit_repolist cgit_repolist;
 extern struct cgit_context ctx;
 extern const struct cgit_snapshot_format cgit_snapshot_formats[];
 
 extern struct cgit_repo *cgit_add_repo(const char *url);
 extern struct cgit_repo *cgit_get_repoinfo(const char *url);
 extern void cgit_repo_config_cb(const char *name, const char *value);
 
 extern int chk_zero(int result, char *msg);
 extern int chk_positive(int result, char *msg);
 extern int chk_non_negative(int result, char *msg);
 
 extern char *trim_end(const char *str, char c);
 extern char *strlpart(char *txt, int maxlen);
 extern char *strrpart(char *txt, int maxlen);
 
 extern void cgit_add_ref(struct reflist *list, struct refinfo *ref);
 extern int cgit_refs_cb(const char *refname, const unsigned char *sha1,
                         int flags, void *cb_data);
 
diff --git a/ui-shared.c b/ui-shared.c
index de77bbf..f18b2c7 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -411,249 +411,259 @@ void cgit_print_date(time_t secs, char *format, int local_time)
         html_txt(buf);
 }
 
 void cgit_print_age(time_t t, time_t max_relative, char *format)
 {
         time_t now, secs;
 
         if (!t)
                 return;
         time(&now);
         secs = now - t;
 
         if (secs > max_relative && max_relative >= 0) {
                 cgit_print_date(t, format, ctx.cfg.local_time);
                 return;
         }
 
         if (secs < TM_HOUR * 2) {
                 htmlf("<span class='age-mins'>%.0f min.</span>",
                       secs * 1.0 / TM_MIN);
                 return;
         }
         if (secs < TM_DAY * 2) {
                 htmlf("<span class='age-hours'>%.0f hours</span>",
                       secs * 1.0 / TM_HOUR);
                 return;
         }
         if (secs < TM_WEEK * 2) {
                 htmlf("<span class='age-days'>%.0f days</span>",
                       secs * 1.0 / TM_DAY);
                 return;
         }
         if (secs < TM_MONTH * 2) {
                 htmlf("<span class='age-weeks'>%.0f weeks</span>",
                       secs * 1.0 / TM_WEEK);
                 return;
         }
         if (secs < TM_YEAR * 2) {
                 htmlf("<span class='age-months'>%.0f months</span>",
                       secs * 1.0 / TM_MONTH);
                 return;
         }
         htmlf("<span class='age-years'>%.0f years</span>",
               secs * 1.0 / TM_YEAR);
 }
 
 void cgit_print_http_headers(struct cgit_context *ctx)
 {
+        if (ctx->cfg.embedded)
+                return;
+
         if (ctx->page.mimetype && ctx->page.charset)
                 htmlf("Content-Type: %s; charset=%s\n", ctx->page.mimetype,
                       ctx->page.charset);
         else if (ctx->page.mimetype)
                 htmlf("Content-Type: %s\n", ctx->page.mimetype);
         if (ctx->page.size)
                 htmlf("Content-Length: %ld\n", ctx->page.size);
         if (ctx->page.filename)
                 htmlf("Content-Disposition: inline; filename=\"%s\"\n",
                       ctx->page.filename);
         htmlf("Last-Modified: %s\n", http_date(ctx->page.modified));
         htmlf("Expires: %s\n", http_date(ctx->page.expires));
         html("\n");
 }
 
 void cgit_print_docstart(struct cgit_context *ctx)
 {
+        if (ctx->cfg.embedded)
+                return;
+
         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("<title>");
         html_txt(ctx->page.title);
         html("</title>\n");
         htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version);
         if (ctx->cfg.robots && *ctx->cfg.robots)
                 htmlf("<meta name='robots' content='%s'/>\n", ctx->cfg.robots);
         html("<link rel='stylesheet' type='text/css' href='");
         html_attr(ctx->cfg.css);
         html("'/>\n");
         if (ctx->cfg.favicon) {
                 html("<link rel='shortcut icon' href='");
                 html_attr(ctx->cfg.favicon);
                 html("'/>\n");
         }
         if (host && ctx->repo) {
                 html("<link rel='alternate' title='Atom feed' href='http://");
                 html_attr(cgit_hosturl());
                 html_attr(cgit_fileurl(ctx->repo->url, "atom", ctx->qry.path,
                                        fmt("h=%s", ctx->qry.head)));
                 html("' type='application/atom+xml'/>");
         }
         html("</head>\n");
         html("<body>\n");
         if (ctx->cfg.header)
                 html_include(ctx->cfg.header);
 }
 
 void cgit_print_docend()
 {
         html("</div>");
         if (ctx.cfg.footer)
                 html_include(ctx.cfg.footer);
         else {
                 htmlf("<div class='footer'>generated  by cgit %s at ",
                         cgit_version);
                 cgit_print_date(time(NULL), FMT_LONGDATE, ctx.cfg.local_time);
                 html("</div>\n");
         }
+        html("</div>");
+        if (ctx.cfg.embedded)
+                return;
         html("</body>\n</html>\n");
 }
 
 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&amp;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, char *page)
 {
         char *url;
 
         if (!ctx.cfg.virtual_root) {
                 url = fmt("%s/%s", ctx.qry.repo, page);
                 if (ctx.qry.path)
                         url = fmt("%s/%s", url, ctx.qry.path);
                 html_hidden("url", url);
         }
 
         if (incl_head && ctx.qry.head && ctx.repo->defbranch &&
             strcmp(ctx.qry.head, ctx.repo->defbranch))
                 html_hidden("h", ctx.qry.head);
 
         if (ctx.qry.sha1)
                 html_hidden("id", ctx.qry.sha1);
         if (ctx.qry.sha2)
                 html_hidden("id2", ctx.qry.sha2);
         if (ctx.qry.showmsg)
                 html_hidden("showmsg", "1");
 
         if (incl_search) {
                 if (ctx.qry.grep)
                         html_hidden("qt", ctx.qry.grep);
                 if (ctx.qry.search)
                         html_hidden("q", ctx.qry.search);
         }
 }
 
 const char *fallback_cmd = "repolist";
 
 char *hc(struct cgit_cmd *cmd, const char *page)
 {
         return (strcmp(cmd ? cmd->name : fallback_cmd, page) ? NULL : "active");
 }
 
 void cgit_print_pageheader(struct cgit_context *ctx)
 {
         struct cgit_cmd *cmd = cgit_get_cmd(ctx);
 
         if (!cmd && ctx->repo)
                 fallback_cmd = "summary";
 
+        html("<div id='cgit'>");
         html("<table id='header'>\n");
         html("<tr>\n");
         html("<td class='logo' rowspan='2'><a href='");
         if (ctx->cfg.logo_link)
                 html_attr(ctx->cfg.logo_link);
         else
                 html_attr(cgit_rooturl());
         html("'><img src='");
         html_attr(ctx->cfg.logo);
         html("' alt='cgit logo'/></a></td>\n");
 
         html("<td class='main'>");
         if (ctx->repo) {
                 cgit_index_link("index", NULL, NULL, NULL, 0);
                 html(" : ");
                 cgit_summary_link(ctx->repo->name, ctx->repo->name, NULL, NULL);
                 html("</td><td class='form'>");
                 html("<form method='get' action=''>\n");
                 cgit_add_hidden_formfields(0, 1, ctx->qry.page);
                 html("<select name='h' onchange='this.form.submit();'>\n");
                 for_each_branch_ref(print_branch_option, ctx->qry.head);
                 html("</select> ");
                 html("<input type='submit' name='' value='switch'/>");
                 html("</form>");
         } else
                 html_txt(ctx->cfg.root_title);
         html("</td></tr>\n");
 
         html("<tr><td class='sub'>");
         if (ctx->repo) {
                 html_txt(ctx->repo->desc);
                 html("</td><td class='sub right'>");
                 html_txt(ctx->repo->owner);
         } else {
                 if (ctx->cfg.root_desc)
                         html_txt(ctx->cfg.root_desc);
                 else if (ctx->cfg.index_info)
                         html_include(ctx->cfg.index_info);
         }
         html("</td></tr></table>\n");
 
         html("<table class='tabs'><tr><td>\n");
         if (ctx->repo) {
                 cgit_summary_link("summary", NULL, hc(cmd, "summary"),
                                   ctx->qry.head);
                 cgit_refs_link("refs", NULL, hc(cmd, "refs"), ctx->qry.head,
                                ctx->qry.sha1, NULL);
                 cgit_log_link("log", NULL, hc(cmd, "log"), ctx->qry.head,