Update to neutral logo and favicon.

[stagit.git] / stagit-index.c

diff --git a/stagit-index.c b/stagit-index.c
index e019793a3c566aa2f1839d38684511b6be23c0eb..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 = "";
@@ -28,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);
 }
@@ -105,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) ||
@@ -147,7 +141,6 @@ 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;
@@ -161,6 +154,10 @@ main(int argc, char *argv[])
        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
@@ -174,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;
                }