]> git.armaanb.net Git - stagit.git/blobdiff - stagit-index.c
projects / stagit.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Redirect stdout to correct file.
[stagit.git] / stagit-index.c
diff --git a/stagit-index.c b/stagit-index.c
index 067dc30fd6cab577fa3439c5d3c0e8302e2cd05d..2b243ec15660ba042313d4317b2d33810f9300a3 100644 (file)
--- a/stagit-index.c
+++ b/stagit-index.c
@@ -1,18 +1,13 @@
-#include <sys/stat.h>
-
 #include <err.h>
-#include <errno.h>
-#include <inttypes.h>
 #include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <time.h>
 #include <unistd.h>
 
 #include <git2.h>
 
-#include "compat.h"
-
 static git_repository *repo;
 
 static const char *relpath = "";
@@ -21,10 +16,6 @@ static char description[255] = "Repositories";
 static char *name = "";
 static char owner[255];
 
-#ifndef USE_PLEDGE
-#define pledge(p1,p2) 0
-#endif
-
 void
 joinpath(char *buf, size_t bufsiz, const char *path, const char *path2)
 {
@@ -32,7 +23,7 @@ joinpath(char *buf, size_t bufsiz, const char *path, const char *path2)
 
        r = snprintf(buf, bufsiz, "%s%s%s",
                path, path[0] && path[strlen(path) - 1] != '/' ? "/" : "", path2);
-       if (r == -1 || (size_t)r >= bufsiz)
+       if (r < 0 || (size_t)r >= bufsiz)
                errx(1, "path truncated: '%s%s%s'",
                        path, path[0] && path[strlen(path) - 1] != '/' ? "/" : "", path2);
 }
@@ -47,7 +38,7 @@ xmlencode(FILE *fp, const char *s, size_t len)
                switch(*s) {
                case '<':  fputs("&lt;",   fp); break;
                case '>':  fputs("&gt;",   fp); break;
-               case '\'': fputs("&apos;", fp); break;
+               case '\'': fputs("&#39;" , fp); break;
                case '&':  fputs("&amp;",  fp); break;
                case '"':  fputs("&quot;", fp); break;
                default:   fputc(*s, fp);
@@ -73,20 +64,22 @@ void
 writeheader(FILE *fp)
 {
        fputs("<!DOCTYPE html>\n"
-               "<html dir=\"ltr\" lang=\"en\">\n<head>\n"
+               "<html>\n<head>\n"
                "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n"
-               "<meta http-equiv=\"Content-Language\" content=\"en\" />\n<title>", fp);
+               "<title>", fp);
        xmlencode(fp, description, strlen(description));
        fprintf(fp, "</title>\n<link rel=\"icon\" type=\"image/png\" href=\"%sfavicon.png\" />\n", relpath);
        fprintf(fp, "<link rel=\"stylesheet\" type=\"text/css\" href=\"%sstyle.css\" />\n", relpath);
        fputs("</head>\n<body>\n", fp);
        fprintf(fp, "<table>\n<tr><td><img src=\"%slogo.png\" alt=\"\" width=\"32\" height=\"32\" /></td>\n"
-               "<td><h1>%s</h1><span class=\"desc\">%s</span></td></tr><tr><td></td><td>\n",
-               relpath, name, description);
-       fputs("</td></tr>\n</table>\n<hr/>\n<div id=\"content\">\n"
-             "<table id=\"index\"><thead>\n"
-             "<tr><td>Name</td><td>Description</td><td>Owner</td><td>Last commit</td></tr>"
-             "</thead><tbody>\n", fp);
+               "<td><span class=\"desc\">", relpath);
+       xmlencode(fp, description, strlen(description));
+       fputs("</span></td></tr><tr><td></td><td>\n"
+               "</td></tr>\n</table>\n<hr/>\n<div id=\"content\">\n"
+               "<table id=\"index\"><thead>\n"
+               "<tr><td><b>Name</b></td><td><b>Description</b></td><td><b>Owner</b></td>"
+               "<td><b>Last commit</b></td></tr>"
+               "</thead><tbody>\n", fp);
 }
 
 void
@@ -107,7 +100,6 @@ writelog(FILE *fp)
 
        git_revwalk_new(&w, repo);
        git_revwalk_push_head(w);
-       git_revwalk_sorting(w, GIT_SORT_TIME);
        git_revwalk_simplify_first_parent(w);
 
        if (git_revwalk_next(&id, w) ||
@@ -149,21 +141,27 @@ err:
 int
 main(int argc, char *argv[])
 {
-       const git_error *e = NULL;
        FILE *fp;
        char path[PATH_MAX], repodirabs[PATH_MAX + 1];
        const char *repodir;
        int i, ret = 0;
 
-       if (pledge("stdio rpath", NULL) == -1)
-               err(1, "pledge");
-
        if (argc < 2) {
                fprintf(stderr, "%s [repodir...]\n", argv[0]);
                return 1;
        }
+
        git_libgit2_init();
 
+#ifdef __OpenBSD__
+       for (i = 1; i < argc; i++)
+               if (unveil(argv[i], "r") == -1)
+                       err(1, "unveil: %s", argv[i]);
+
+       if (pledge("stdio rpath", NULL) == -1)
+               err(1, "pledge");
+#endif
+
        writeheader(stdout);
 
        for (i = 1; i < argc; i++) {
@@ -173,8 +171,7 @@ main(int argc, char *argv[])
 
                if (git_repository_open_ext(&repo, repodir,
                    GIT_REPOSITORY_OPEN_NO_SEARCH, NULL)) {
-                       e = giterr_last();
-                       fprintf(stderr, "%s: %s\n", argv[0], e->message);
+                       fprintf(stderr, "%s: cannot open repository\n", argv[0]);
                        ret = 1;
                        continue;
                }
Personal fork of stagit