do not write outside heap buffer

[ps-cgit] / ui-repolist.c

diff --git a/ui-repolist.c b/ui-repolist.c
index d946f32cd5354021c45637a0af24e1a7653dff92..943eaab77995bc9ef8c8fd3c59e1503b0c210aae 100644 (file)
--- a/ui-repolist.c
+++ b/ui-repolist.c
@@ -1,6 +1,7 @@
 /* ui-repolist.c: functions for generating the repolist page
  *
  * Copyright (C) 2006 Lars Hjemli
+ * Copyright (C) 2012 Jason A. Donenfeld <Jason@zx2c4.com>
  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)
@@ -9,6 +10,7 @@
 #include "cgit.h"
 #include "html.h"
 #include "ui-shared.h"
+#include <strings.h>
 
 time_t read_agefile(char *path)
 {
@@ -131,8 +133,12 @@ void print_pager(int items, int pagelen, char *search, char *sort)
 
 static int cmp(const char *s1, const char *s2)
 {
-       if (s1 && s2)
-               return strcmp(s1, s2);
+       if (s1 && s2) {
+               if (ctx.cfg.case_sensitive_sort)
+                       return strcmp(s1, s2);
+               else
+                       return strcasecmp(s1, s2);
+       }
        if (s1 && !s2)
                return -1;
        if (s2 && !s1)
@@ -145,10 +151,19 @@ static int sort_section(const void *a, const void *b)
        const struct cgit_repo *r1 = a;
        const struct cgit_repo *r2 = b;
        int result;
+       time_t t;
 
        result = cmp(r1->section, r2->section);
-       if (!result)
-               result = cmp(r1->name, r2->name);
+       if (!result) {
+               if (!strcmp(ctx.cfg.section_sort, "age")) {
+                       // get_repo_modtime caches the value in r->mtime, so we don't
+                       // have to worry about inefficiencies here.
+                       if (get_repo_modtime(r1, &t) && get_repo_modtime(r2, &t))
+                               result = r2->mtime - r1->mtime;
+               }
+               if (!result)
+                       result = cmp(r1->name, r2->name);
+       }
        return result;
 }