Make git_pageurl handle NULL querystrings

[ps-cgit] / ui-repolist.c

diff --git a/ui-repolist.c b/ui-repolist.c
index 7090c127c46b7edcaaaf04404cb464a34295f9ad..2ce0d6a62a885a83e700fb885e8dc357bc282e10 100644 (file)
--- a/ui-repolist.c
+++ b/ui-repolist.c
@@ -10,54 +10,30 @@
 
 void cgit_print_repolist(struct cacheitem *item)
 {
 
 void cgit_print_repolist(struct cacheitem *item)
 {

-       DIR *d;
-       struct dirent *de;
-       struct stat st;
-       char *name;
+       struct repoinfo *repo;
+       int i;

 
 

-       chdir(cgit_root);

        cgit_print_docstart(cgit_root_title, item);
        cgit_print_docstart(cgit_root_title, item);

-       cgit_print_pageheader(cgit_root_title);
+       cgit_print_pageheader(cgit_root_title, 0);

 
 

-       if (!(d = opendir("."))) {
-               cgit_print_error(fmt("Unable to scan repository directory: %s",
-                                    strerror(errno)));
-               cgit_print_docend();
-               return;
-       }
-
-       html("<h2>Repositories</h2>\n");

        html("<table class='list nowrap'>");
        html("<table class='list nowrap'>");

-       html("<tr>"
+       html("<tr class='nohover'>"

             "<th class='left'>Name</th>"
             "<th class='left'>Description</th>"
             "<th class='left'>Owner</th></tr>\n");
             "<th class='left'>Name</th>"
             "<th class='left'>Description</th>"
             "<th class='left'>Owner</th></tr>\n");

-       while ((de = readdir(d)) != NULL) {
-               if (de->d_name[0] == '.')
-                       continue;
-               if (stat(de->d_name, &st) < 0)
-                       continue;
-               if (!S_ISDIR(st.st_mode))
-                       continue;
-
-               cgit_repo_name = cgit_repo_desc = cgit_repo_owner = NULL;
-               name = fmt("%s/info/cgit", de->d_name);
-               if (cgit_read_config(name, cgit_repo_config_cb))
-                       continue;

 
 

+       for (i=0; i<cgit_repolist.count; i++) {
+               repo = &cgit_repolist.repos[i];

                html("<tr><td>");
                html("<tr><td>");

-               html_link_open(cgit_repourl(de->d_name), NULL, NULL);
-               html_txt(cgit_repo_name);
+               html_link_open(cgit_repourl(repo->url), NULL, NULL);
+               html_txt(repo->name);

                html_link_close();
                html("</td><td>");
                html_link_close();
                html("</td><td>");

-               html_txt(cgit_repo_desc);
+               html_txt(repo->desc);

                html("</td><td>");
                html("</td><td>");

-               html_txt(cgit_repo_owner);
+               html_txt(repo->owner);

                html("</td></tr>\n");
        }
                html("</td></tr>\n");
        }

-       closedir(d);

        html("</table>");
        cgit_print_docend();
 }
        html("</table>");
        cgit_print_docend();
 }

-
-