xfnw/stagit
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fix: add "fattr" pledge for chmod(2) for cachefile

Browse source 
improve checks for when head is NULL (empty repo)
This commit is contained in:
Hiltjo Posthuma 2017-11-19 14:52:04 +01:00
parent 6662b8ee42
commit 2ff0c0d6c0
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
stagit.c
View file

@ -1003,7 +1003,7 @@ main(int argc, char *argv[])
size_t n;
int i, fd;
if (pledge("stdio rpath wpath cpath", NULL) == -1)
if (pledge("stdio rpath wpath cpath fattr", NULL) == -1)
err(1, "pledge");
for (i = 1; i < argc; i++) {
@ -1017,6 +1017,8 @@ main(int argc, char *argv[])
cachefile = argv[++i];
}
}
if (!cachefile && pledge("stdio rpath wpath cpath", NULL) == -1)
err(1, "pledge");
if (!repodir)
usage(argv[0]);
@ -1037,10 +1039,6 @@ main(int argc, char *argv[])
head = git_object_id(obj);
git_object_free(obj);
/* don't cache if there is no HEAD */
if (!head)
cachefile = NULL;
/* use directory name as name */
if ((name = strrchr(repodirabs, '/')))
name++;
@ -1104,7 +1102,7 @@ main(int argc, char *argv[])
"<td class=\"num\" align=\"right\"><b>+</b></td>"
"<td class=\"num\" align=\"right\"><b>-</b></td></tr>\n</thead><tbody>\n", fp);
if (cachefile) {
if (cachefile && head) {
/* read from cache file (does not need to exist) */
if ((rcachefp = fopen(cachefile, "r"))) {
if (!fgets(lastoidstr, sizeof(lastoidstr), rcachefp))
@ -1167,7 +1165,7 @@ main(int argc, char *argv[])
fclose(fp);
/* rename new cache file on success */
if (cachefile) {
if (cachefile && head) {
if (rename(tmppath, cachefile))
err(1, "rename: '%s' to '%s'", tmppath, cachefile);
umask((mask = umask(0)));