ui-repolist: sort null values last

When sorting on e.g. owner, it's not interesting to get all repos
without owner at the top of the list.

Signed-off-by: Lars Hjemli <hjemli@gmail.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/ui-repolist.c b/ui-repolist.c
index 0de328b..cf27cb3 100644
--- a/ui-repolist.c
+++ b/ui-repolist.c
@@ -55,131 +55,131 @@ static void print_modtime(struct cgit_repo *repo)
 }
 
 int is_match(struct cgit_repo *repo)
 {
         if (!ctx.qry.search)
                 return 1;
         if (repo->url && strcasestr(repo->url, ctx.qry.search))
                 return 1;
         if (repo->name && strcasestr(repo->name, ctx.qry.search))
                 return 1;
         if (repo->desc && strcasestr(repo->desc, ctx.qry.search))
                 return 1;
         if (repo->owner && strcasestr(repo->owner, ctx.qry.search))
                 return 1;
         return 0;
 }
 
 int is_in_url(struct cgit_repo *repo)
 {
         if (!ctx.qry.url)
                 return 1;
         if (repo->url && !prefixcmp(repo->url, ctx.qry.url))
                 return 1;
         return 0;
 }
 
 void print_sort_header(const char *title, const char *sort)
 {
         htmlf("<th class='left'><a href='./?s=%s", sort);
         if (ctx.qry.search) {
                 html("&q=");
                 html_url_arg(ctx.qry.search);
         }
         htmlf("'>%s</a></th>", title);
 }
 
 void print_header(int columns)
 {
         html("<tr class='nohover'>");
         print_sort_header("Name", "name");
         print_sort_header("Description", "desc");
         print_sort_header("Owner", "owner");
         print_sort_header("Idle", "idle");
         if (ctx.cfg.enable_index_links)
                 html("<th class='left'>Links</th>");
         html("</tr>\n");
 }
 
 
 void print_pager(int items, int pagelen, char *search)
 {
         int i;
         html("<div class='pager'>");
         for(i = 0; i * pagelen < items; i++)
                 cgit_index_link(fmt("[%d]", i+1), fmt("Page %d", i+1), NULL,
                                 search, i * pagelen);
         html("</div>");
 }
 
 static int cmp(const char *s1, const char *s2)
 {
         if (s1 && s2)
                 return strcmp(s1, s2);
         if (s1 && !s2)
-                return 1;
-        if (s2 && !s1)
                 return -1;
+        if (s2 && !s1)
+                return 1;
         return 0;
 }
 
 static int sort_name(const void *a, const void *b)
 {
         const struct cgit_repo *r1 = a;
         const struct cgit_repo *r2 = b;
 
         return cmp(r1->name, r2->name);
 }
 
 static int sort_desc(const void *a, const void *b)
 {
         const struct cgit_repo *r1 = a;
         const struct cgit_repo *r2 = b;
 
         return cmp(r1->desc, r2->desc);
 }
 
 static int sort_owner(const void *a, const void *b)
 {
         const struct cgit_repo *r1 = a;
         const struct cgit_repo *r2 = b;
 
         return cmp(r1->owner, r2->owner);
 }
 
 static int sort_idle(const void *a, const void *b)
 {
         const struct cgit_repo *r1 = a;
         const struct cgit_repo *r2 = b;
         time_t t1, t2;
 
         t1 = t2 = 0;
         get_repo_modtime(r1, &t1);
         get_repo_modtime(r2, &t2);
         return t2 - t1;
 }
 
 struct sortcolumn {
         const char *name;
         int (*fn)(const void *a, const void *b);
 };
 
 struct sortcolumn sortcolumn[] = {
         {"name", sort_name},
         {"desc", sort_desc},
         {"owner", sort_owner},
         {"idle", sort_idle},
         {NULL, NULL}
 };
 
 int sort_repolist(char *field)
 {
         struct sortcolumn *column;
 
         for (column = &sortcolumn[0]; column->name; column++) {
                 if (strcmp(field, column->name))
                         continue;
                 qsort(cgit_repolist.repos, cgit_repolist.count,
                         sizeof(struct cgit_repo), column->fn);
                 return 1;
         }
         return 0;