Bump version

[cgit.git] / ui-atom.c

diff --git a/ui-atom.c b/ui-atom.c
index a6ea3eecf58ec6fd0db3aab018522ecca5e98acd..e2b39ee1d1c51cb109e69dc65b26feefe866d76d 100644 (file)
--- 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;
@@ -24,7 +25,7 @@ void add_entry(struct commit *commit, char *host)
        html_txt(info->subject);
        html("</title>\n");
        html("<updated>");
-       cgit_print_date(info->author_date, FMT_ATOMDATE, ctx.cfg.local_time);
+       cgit_print_date(info->committer_date, FMT_ATOMDATE, 0);
        html("</updated>\n");
        html("<author>\n");
        if (info->author) {
@@ -32,7 +33,7 @@ void add_entry(struct commit *commit, char *host)
                html_txt(info->author);
                html("</name>\n");
        }
-       if (info->author_email) {
+       if (info->author_email && !ctx.cfg.noplainemail) {
                mail = xstrdup(info->author_email);
                t = strchr(mail, '<');
                if (t)
@@ -49,10 +50,11 @@ void add_entry(struct commit *commit, char *host)
        }
        html("</author>\n");
        html("<published>");
-       cgit_print_date(info->author_date, FMT_ATOMDATE, ctx.cfg.local_time);
+       cgit_print_date(info->author_date, FMT_ATOMDATE, 0);
        html("</published>\n");
        if (host) {
-               html("<link rel='alternate' type='text/html' href='http://");
+               html("<link rel='alternate' type='text/html' href='");
+               html(cgit_httpscheme());
                html_attr(host);
                html_attr(cgit_pageurl(ctx.repo->url, "commit", NULL));
                if (ctx.cfg.virtual_root)
@@ -78,13 +80,15 @@ void add_entry(struct commit *commit, char *host)
 
 void cgit_print_atom(char *tip, char *path, int max_count)
 {
-       char *host;
+       const char *host;
        const char *argv[] = {NULL, tip, NULL, NULL, NULL};
        struct commit *commit;
        struct rev_info rev;
        int argc = 2;
 
-       if (!tip)
+       if (ctx.qry.show_all)
+               argv[1] = "--all";
+       else if (!tip)
                argv[1] = ctx.qry.head;
 
        if (path) {
@@ -104,24 +108,32 @@ 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) {
-               html("<link rel='alternate' type='text/html' href='http://");
+               html("<link rel='alternate' type='text/html' href='");
+               html(cgit_httpscheme());
                html_attr(host);
                html_attr(cgit_repourl(ctx.repo->url));
                html("'/>\n");
        }
        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;
        }