X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/eca95229acdc3c7c27fdcc1319f5c96da9e3b538..1c581a072651524f3b0d91f33e22a42c4166dd96:/ui-atom.c

diff --git a/ui-atom.c b/ui-atom.c
index 9331f74..11ea0c0 100644
--- a/ui-atom.c
+++ b/ui-atom.c
@@ -1,16 +1,17 @@
 /* ui-atom.c: functions for atom feeds
  *
- * Copyright (C) 2008 Lars Hjemli
+ * Copyright (C) 2006-2014 cgit Development Team <cgit@lists.zx2c4.com>
  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)
  */
 
 #include "cgit.h"
+#include "ui-atom.h"
 #include "html.h"
 #include "ui-shared.h"
 
-void add_entry(struct commit *commit, char *host)
+static void add_entry(struct commit *commit, const char *host)
 {
 	char delim = '&';
 	char *hex;
@@ -18,7 +19,7 @@ void add_entry(struct commit *commit, char *host)
 	struct commitinfo *info;
 
 	info = cgit_parse_commit(commit);
-	hex = sha1_to_hex(commit->object.sha1);
+	hex = oid_to_hex(&commit->object.oid);
 	html("<entry>\n");
 	html("<title>");
 	html_txt(info->subject);
@@ -52,14 +53,17 @@ void add_entry(struct commit *commit, char *host)
 	cgit_print_date(info->author_date, FMT_ATOMDATE, 0);
 	html("</published>\n");
 	if (host) {
+		char *pageurl;
 		html("<link rel='alternate' type='text/html' href='");
 		html(cgit_httpscheme());
 		html_attr(host);
-		html_attr(cgit_pageurl(ctx.repo->url, "commit", NULL));
+		pageurl = cgit_pageurl(ctx.repo->url, "commit", NULL);
+		html_attr(pageurl);
 		if (ctx.cfg.virtual_root)
 			delim = '?';
 		htmlf("%cid=%s", delim, hex);
 		html("'/>\n");
+		free(pageurl);
 	}
 	htmlf("<id>%s</id>\n", hex);
 	html("<content type='text'>\n");
@@ -107,27 +111,37 @@ void cgit_print_atom(char *tip, char *path, int max_count)
 	host = cgit_hosturl();
 	ctx.page.mimetype = "text/xml";
 	ctx.page.charset = "utf-8";
-	cgit_print_http_headers(&ctx);
+	cgit_print_http_headers();
 	html("<feed xmlns='http://www.w3.org/2005/Atom'>\n");
 	html("<title>");
 	html_txt(ctx.repo->name);
+	if (path) {
+		html("/");
+		html_txt(path);
+	}
+	if (tip && !ctx.qry.show_all) {
+		html(", branch ");
+		html_txt(tip);
+	}
 	html("</title>\n");
 	html("<subtitle>");
 	html_txt(ctx.repo->desc);
 	html("</subtitle>\n");
 	if (host) {
+		char *repourl = cgit_repourl(ctx.repo->url);
 		html("<link rel='alternate' type='text/html' href='");
 		html(cgit_httpscheme());
 		html_attr(host);
-		html_attr(cgit_repourl(ctx.repo->url));
+		html_attr(repourl);
 		html("'/>\n");
+		free(repourl);
 	}
 	while ((commit = get_revision(&rev)) != NULL) {
 		add_entry(commit, host);
-		free(commit->buffer);
-		commit->buffer = NULL;
+		free_commit_buffer(commit);
 		free_commit_list(commit->parents);
 		commit->parents = NULL;
 	}
 	html("</feed>\n");
+	free(host);
 }