commit 23160609dca672c198101a46a012497a5d7baec4
parent fabdcdded4bc51d4305e0ed5f0eec48d5ad61fe1
Author: Pollux <pollux@pollux.codes>
Date: Sun, 13 Apr 2025 11:25:41 -0500
wip: add customized website header
Signed-off-by: Pollux <pollux@pollux.codes>
Diffstat:
| A | header.h | | | 13 | +++++++++++++ |
| M | stagit-index.c | | | 9 | +++++---- |
| M | stagit.c | | | 1096 | ++++++++++++++++++++++++++++++++++++++++++------------------------------------- |
3 files changed, 598 insertions(+), 520 deletions(-)
diff --git a/header.h b/header.h
@@ -0,0 +1,13 @@
+#define HEADER ""\
+ "<header class=\"header\">\n"\
+ "<a href=\"/\">home</a> |\n"\
+ "<a href=\"/blog\">blog</a> |\n"\
+ "<a href=\"/art\">art</a> |\n"\
+ "<a href=\"/git\">git</a>\n"\
+ "<span style=\"float:right\">\n"\
+ "<a href=\"/pollux.gpg\">gpg</a> |\n"\
+ "<a href=\"mailto:pollux@pollux.codes\">email</a> |\n"\
+ "<a href=\"/index.xml\" download>rss</a>\n"\
+ "</span>\n"\
+ "<hr>\n"\
+ "</header>\n"
diff --git a/stagit-index.c b/stagit-index.c
@@ -8,6 +8,8 @@
#include <git2.h>
+#include "header.h"
+
static git_repository *repo;
static const char *relpath = "";
@@ -103,11 +105,10 @@ writeheader(FILE *fp)
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><span class=\"desc\">", relpath);
+ fputs(HEADER, fp);
+ fprintf(fp, "<h1>", 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"
+ fputs("</h1><hr/>\n<div id=\"content\">\n"
"<table id=\"index\"><thead>\n"
"<tr><td><b>Name</b></td><td><b>Description</b></td>"
"<td><b>Last commit</b></td></tr>"
diff --git a/stagit.c b/stagit.c
@@ -20,38 +20,40 @@
#include "compat.h"
+#include "header.h"
+
#define LEN(s) (sizeof(s)/sizeof(*s))
struct deltainfo {
- git_patch *patch;
+ git_patch *patch;
- size_t addcount;
- size_t delcount;
+ size_t addcount;
+ size_t delcount;
};
struct commitinfo {
- const git_oid *id;
+ const git_oid *id;
- char oid[GIT_OID_HEXSZ + 1];
- char parentoid[GIT_OID_HEXSZ + 1];
+ char oid[GIT_OID_HEXSZ + 1];
+ char parentoid[GIT_OID_HEXSZ + 1];
const git_signature *author;
const git_signature *committer;
- const char *summary;
- const char *msg;
+ const char *summary;
+ const char *msg;
- git_diff *diff;
- git_commit *commit;
- git_commit *parent;
- git_tree *commit_tree;
- git_tree *parent_tree;
+ git_diff *diff;
+ git_commit *commit;
+ git_commit *parent;
+ git_tree *commit_tree;
+ git_tree *parent_tree;
- size_t addcount;
- size_t delcount;
- size_t filecount;
+ size_t addcount;
+ size_t delcount;
+ size_t filecount;
struct deltainfo **deltas;
- size_t ndeltas;
+ size_t ndeltas;
};
/* reference and associated data for sorting */
@@ -62,53 +64,52 @@ struct referenceinfo {
static git_repository *repo;
-static const char *baseurl = ""; /* base URL to make absolute RSS/Atom URI */
+static const char *baseurl = ""; /* base URL to make absolute RSS/Atom URI */
static const char *relpath = "";
static const char *repodir;
-static char *name = "";
-static char *strippedname = "";
-static char description[255];
-static char cloneurl[1024];
-static char *submodules;
-static char *licensefiles[] = { "HEAD:LICENSE", "HEAD:LICENSE.md", "HEAD:COPYING" };
-static char *license;
-static char *readmefiles[] = { "HEAD:README", "HEAD:README.md" };
-static char *readme;
-static long long nlogcommits = -1; /* -1 indicates not used */
+static char *name = "";
+static char *strippedname = "";
+static char description[255];
+static char cloneurl[1024];
+static char *submodules;
+static char *licensefiles[] =
+ { "HEAD:LICENSE", "HEAD:LICENSE.md", "HEAD:COPYING" };
+static char *license;
+static char *readmefiles[] = { "HEAD:README", "HEAD:README.md" };
+
+static char *readme;
+static long long nlogcommits = -1; /* -1 indicates not used */
/* cache */
-static git_oid lastoid;
-static char lastoidstr[GIT_OID_HEXSZ + 2]; /* id + newline + NUL byte */
-static FILE *rcachefp, *wcachefp;
+static git_oid lastoid;
+static char lastoidstr[GIT_OID_HEXSZ + 2]; /* id + newline + NUL byte */
+static FILE *rcachefp, *wcachefp;
static const char *cachefile;
/* Handle read or write errors for a FILE * stream */
void
-checkfileerror(FILE *fp, const char *name, int mode)
-{
- if (mode == 'r' && ferror(fp))
+checkfileerror(FILE *fp, const char *name, int mode) {
+ if(mode == 'r' && ferror(fp))
errx(1, "read error: %s", name);
- else if (mode == 'w' && (fflush(fp) || ferror(fp)))
+ else if(mode == 'w' && (fflush(fp) || ferror(fp)))
errx(1, "write error: %s", name);
}
void
-joinpath(char *buf, size_t bufsiz, const char *path, const char *path2)
-{
- int r;
-
- r = snprintf(buf, bufsiz, "%s%s%s",
- path, path[0] && path[strlen(path) - 1] != '/' ? "/" : "", path2);
- if (r < 0 || (size_t)r >= bufsiz)
- errx(1, "path truncated: '%s%s%s'",
- path, path[0] && path[strlen(path) - 1] != '/' ? "/" : "", path2);
+joinpath(char *buf, size_t bufsiz, const char *path, const char *path2) {
+ int r;
+
+ r = snprintf(buf, bufsiz, "%s%s%s", path, path[0]
+ && path[strlen(path) - 1] != '/' ? "/" : "", path2);
+ if(r < 0 || (size_t)r >= bufsiz)
+ errx(1, "path truncated: '%s%s%s'", path, path[0]
+ && path[strlen(path) - 1] != '/' ? "/" : "", path2);
}
void
-deltainfo_free(struct deltainfo *di)
-{
- if (!di)
+deltainfo_free(struct deltainfo *di) {
+ if(!di)
return;
git_patch_free(di->patch);
memset(di, 0, sizeof(*di));
@@ -116,51 +117,55 @@ deltainfo_free(struct deltainfo *di)
}
int
-commitinfo_getstats(struct commitinfo *ci)
-{
+commitinfo_getstats(struct commitinfo *ci) {
struct deltainfo *di;
git_diff_options opts;
git_diff_find_options fopts;
const git_diff_delta *delta;
const git_diff_hunk *hunk;
const git_diff_line *line;
- git_patch *patch = NULL;
- size_t ndeltas, nhunks, nhunklines;
- size_t i, j, k;
+ git_patch *patch = NULL;
+ size_t ndeltas, nhunks, nhunklines;
+ size_t i, j, k;
- if (git_tree_lookup(&(ci->commit_tree), repo, git_commit_tree_id(ci->commit)))
+ if(git_tree_lookup
+ (&(ci->commit_tree), repo, git_commit_tree_id(ci->commit)))
goto err;
- if (!git_commit_parent(&(ci->parent), ci->commit, 0)) {
- if (git_tree_lookup(&(ci->parent_tree), repo, git_commit_tree_id(ci->parent))) {
+ if(!git_commit_parent(&(ci->parent), ci->commit, 0)) {
+ if(git_tree_lookup
+ (&(ci->parent_tree), repo, git_commit_tree_id(ci->parent))) {
ci->parent = NULL;
ci->parent_tree = NULL;
}
}
git_diff_init_options(&opts, GIT_DIFF_OPTIONS_VERSION);
- opts.flags |= GIT_DIFF_DISABLE_PATHSPEC_MATCH |
- GIT_DIFF_IGNORE_SUBMODULES |
- GIT_DIFF_INCLUDE_TYPECHANGE;
- if (git_diff_tree_to_tree(&(ci->diff), repo, ci->parent_tree, ci->commit_tree, &opts))
+ opts.flags |=
+ GIT_DIFF_DISABLE_PATHSPEC_MATCH | GIT_DIFF_IGNORE_SUBMODULES |
+ GIT_DIFF_INCLUDE_TYPECHANGE;
+ if(git_diff_tree_to_tree
+ (&(ci->diff), repo, ci->parent_tree, ci->commit_tree, &opts))
goto err;
- if (git_diff_find_init_options(&fopts, GIT_DIFF_FIND_OPTIONS_VERSION))
+ if(git_diff_find_init_options(&fopts, GIT_DIFF_FIND_OPTIONS_VERSION))
goto err;
/* find renames and copies, exact matches (no heuristic) for renames. */
- fopts.flags |= GIT_DIFF_FIND_RENAMES | GIT_DIFF_FIND_COPIES |
- GIT_DIFF_FIND_EXACT_MATCH_ONLY;
- if (git_diff_find_similar(ci->diff, &fopts))
+ fopts.flags |=
+ GIT_DIFF_FIND_RENAMES | GIT_DIFF_FIND_COPIES |
+ GIT_DIFF_FIND_EXACT_MATCH_ONLY;
+ if(git_diff_find_similar(ci->diff, &fopts))
goto err;
ndeltas = git_diff_num_deltas(ci->diff);
- if (ndeltas && !(ci->deltas = calloc(ndeltas, sizeof(struct deltainfo *))))
+ if(ndeltas
+ && !(ci->deltas = calloc(ndeltas, sizeof(struct deltainfo *))))
err(1, "calloc");
- for (i = 0; i < ndeltas; i++) {
- if (git_patch_from_diff(&patch, ci->diff, i))
+ for(i = 0; i < ndeltas; i++) {
+ if(git_patch_from_diff(&patch, ci->diff, i))
goto err;
- if (!(di = calloc(1, sizeof(struct deltainfo))))
+ if(!(di = calloc(1, sizeof(struct deltainfo))))
err(1, "calloc");
di->patch = patch;
ci->deltas[i] = di;
@@ -168,20 +173,21 @@ commitinfo_getstats(struct commitinfo *ci)
delta = git_patch_get_delta(patch);
/* skip stats for binary data */
- if (delta->flags & GIT_DIFF_FLAG_BINARY)
+ if(delta->flags & GIT_DIFF_FLAG_BINARY)
continue;
nhunks = git_patch_num_hunks(patch);
- for (j = 0; j < nhunks; j++) {
- if (git_patch_get_hunk(&hunk, &nhunklines, patch, j))
+ for(j = 0; j < nhunks; j++) {
+ if(git_patch_get_hunk(&hunk, &nhunklines, patch, j))
break;
- for (k = 0; ; k++) {
- if (git_patch_get_line_in_hunk(&line, patch, j, k))
+ for(k = 0;; k++) {
+ if(git_patch_get_line_in_hunk
+ (&line, patch, j, k))
break;
- if (line->old_lineno == -1) {
+ if(line->old_lineno == -1) {
di->addcount++;
ci->addcount++;
- } else if (line->new_lineno == -1) {
+ } else if(line->new_lineno == -1) {
di->delcount++;
ci->delcount++;
}
@@ -193,7 +199,7 @@ commitinfo_getstats(struct commitinfo *ci)
return 0;
-err:
+ err:
git_diff_free(ci->diff);
ci->diff = NULL;
git_tree_free(ci->commit_tree);
@@ -203,8 +209,8 @@ err:
git_commit_free(ci->parent);
ci->parent = NULL;
- if (ci->deltas)
- for (i = 0; i < ci->ndeltas; i++)
+ if(ci->deltas)
+ for(i = 0; i < ci->ndeltas; i++)
deltainfo_free(ci->deltas[i]);
free(ci->deltas);
ci->deltas = NULL;
@@ -217,14 +223,13 @@ err:
}
void
-commitinfo_free(struct commitinfo *ci)
-{
- size_t i;
+commitinfo_free(struct commitinfo *ci) {
+ size_t i;
- if (!ci)
+ if(!ci)
return;
- if (ci->deltas)
- for (i = 0; i < ci->ndeltas; i++)
+ if(ci->deltas)
+ for(i = 0; i < ci->ndeltas; i++)
deltainfo_free(ci->deltas[i]);
free(ci->deltas);
@@ -238,19 +243,19 @@ commitinfo_free(struct commitinfo *ci)
}
struct commitinfo *
-commitinfo_getbyoid(const git_oid *id)
-{
+commitinfo_getbyoid(const git_oid *id) {
struct commitinfo *ci;
- if (!(ci = calloc(1, sizeof(struct commitinfo))))
+ if(!(ci = calloc(1, sizeof(struct commitinfo))))
err(1, "calloc");
- if (git_commit_lookup(&(ci->commit), repo, id))
+ if(git_commit_lookup(&(ci->commit), repo, id))
goto err;
ci->id = id;
git_oid_tostr(ci->oid, sizeof(ci->oid), git_commit_id(ci->commit));
- git_oid_tostr(ci->parentoid, sizeof(ci->parentoid), git_commit_parent_id(ci->commit, 0));
+ git_oid_tostr(ci->parentoid, sizeof(ci->parentoid),
+ git_commit_parent_id(ci->commit, 0));
ci->author = git_commit_author(ci->commit);
ci->committer = git_commit_committer(ci->commit);
@@ -259,25 +264,24 @@ commitinfo_getbyoid(const git_oid *id)
return ci;
-err:
+ err:
commitinfo_free(ci);
return NULL;
}
int
-refs_cmp(const void *v1, const void *v2)
-{
+refs_cmp(const void *v1, const void *v2) {
const struct referenceinfo *r1 = v1, *r2 = v2;
- time_t t1, t2;
- int r;
+ time_t t1, t2;
+ int r;
- if ((r = git_reference_is_tag(r1->ref) - git_reference_is_tag(r2->ref)))
+ if((r = git_reference_is_tag(r1->ref) - git_reference_is_tag(r2->ref)))
return r;
t1 = r1->ci->author ? r1->ci->author->when.time : 0;
t2 = r2->ci->author ? r2->ci->author->when.time : 0;
- if ((r = t1 > t2 ? -1 : (t1 == t2 ? 0 : 1)))
+ if((r = t1 > t2 ? -1 : (t1 == t2 ? 0 : 1)))
return r;
return strcmp(git_reference_shorthand(r1->ref),
@@ -285,24 +289,23 @@ refs_cmp(const void *v1, const void *v2)
}
int
-getrefs(struct referenceinfo **pris, size_t *prefcount)
-{
+getrefs(struct referenceinfo **pris, size_t *prefcount) {
struct referenceinfo *ris = NULL;
struct commitinfo *ci = NULL;
git_reference_iterator *it = NULL;
- const git_oid *id = NULL;
- git_object *obj = NULL;
- git_reference *dref = NULL, *r, *ref = NULL;
- size_t i, refcount;
+ const git_oid *id = NULL;
+ git_object *obj = NULL;
+ git_reference *dref = NULL, *r, *ref = NULL;
+ size_t i, refcount;
*pris = NULL;
*prefcount = 0;
- if (git_reference_iterator_new(&it, repo))
+ if(git_reference_iterator_new(&it, repo))
return -1;
- for (refcount = 0; !git_reference_next(&ref, it); ) {
- if (!git_reference_is_branch(ref) && !git_reference_is_tag(ref)) {
+ for(refcount = 0; !git_reference_next(&ref, it);) {
+ if(!git_reference_is_branch(ref) && !git_reference_is_tag(ref)) {
git_reference_free(ref);
ref = NULL;
continue;
@@ -310,7 +313,7 @@ getrefs(struct referenceinfo **pris, size_t *prefcount)
switch (git_reference_type(ref)) {
case GIT_REF_SYMBOLIC:
- if (git_reference_resolve(&dref, ref))
+ if(git_reference_resolve(&dref, ref))
goto err;
r = dref;
break;
@@ -320,15 +323,15 @@ getrefs(struct referenceinfo **pris, size_t *prefcount)
default:
continue;
}
- if (!git_reference_target(r) ||
- git_reference_peel(&obj, r, GIT_OBJ_ANY))
+ if(!git_reference_target(r)
+ || git_reference_peel(&obj, r, GIT_OBJ_ANY))
goto err;
- if (!(id = git_object_id(obj)))
+ if(!(id = git_object_id(obj)))
goto err;
- if (!(ci = commitinfo_getbyoid(id)))
+ if(!(ci = commitinfo_getbyoid(id)))
break;
- if (!(ris = reallocarray(ris, refcount + 1, sizeof(*ris))))
+ if(!(ris = reallocarray(ris, refcount + 1, sizeof(*ris))))
err(1, "realloc");
ris[refcount].ci = ci;
ris[refcount].ref = r;
@@ -349,11 +352,11 @@ getrefs(struct referenceinfo **pris, size_t *prefcount)
return 0;
-err:
+ err:
git_object_free(obj);
git_reference_free(dref);
commitinfo_free(ci);
- for (i = 0; i < refcount; i++) {
+ for(i = 0; i < refcount; i++) {
commitinfo_free(ris[i].ci);
git_reference_free(ris[i].ref);
}
@@ -362,12 +365,11 @@ err:
return -1;
}
-FILE *
-efopen(const char *filename, const char *flags)
-{
- FILE *fp;
+FILE *
+efopen(const char *filename, const char *flags) {
+ FILE *fp;
- if (!(fp = fopen(filename, flags)))
+ if(!(fp = fopen(filename, flags)))
err(1, "fopen: '%s'", filename);
return fp;
@@ -375,17 +377,16 @@ efopen(const char *filename, const char *flags)
/* Percent-encode, see RFC3986 section 2.1. */
void
-percentencode(FILE *fp, const char *s, size_t len)
-{
- static char tab[] = "0123456789ABCDEF";
- unsigned char uc;
- size_t i;
+percentencode(FILE *fp, const char *s, size_t len) {
+ static char tab[] = "0123456789ABCDEF";
+ unsigned char uc;
+ size_t i;
- for (i = 0; *s && i < len; s++, i++) {
+ for(i = 0; *s && i < len; s++, i++) {
uc = *s;
/* NOTE: do not encode '/' for paths or ",-." */
- if (uc < ',' || uc >= 127 || (uc >= ':' && uc <= '@') ||
- uc == '[' || uc == ']') {
+ if(uc < ',' || uc >= 127 || (uc >= ':' && uc <= '@')
+ || uc == '[' || uc == ']') {
putc('%', fp);
putc(tab[(uc >> 4) & 0x0f], fp);
putc(tab[uc & 0x0f], fp);
@@ -397,182 +398,203 @@ percentencode(FILE *fp, const char *s, size_t len)
/* Escape characters below as HTML 2.0 / XML 1.0. */
void
-xmlencode(FILE *fp, const char *s, size_t len)
-{
- size_t i;
-
- for (i = 0; *s && i < len; s++, i++) {
- switch(*s) {
- case '<': fputs("<", fp); break;
- case '>': fputs(">", fp); break;
- case '\'': fputs("'", fp); break;
- case '&': fputs("&", fp); break;
- case '"': fputs(""", fp); break;
- default: putc(*s, fp);
+xmlencode(FILE *fp, const char *s, size_t len) {
+ size_t i;
+
+ for(i = 0; *s && i < len; s++, i++) {
+ switch (*s) {
+ case '<':
+ fputs("<", fp);
+ break;
+ case '>':
+ fputs(">", fp);
+ break;
+ case '\'':
+ fputs("'", fp);
+ break;
+ case '&':
+ fputs("&", fp);
+ break;
+ case '"':
+ fputs(""", fp);
+ break;
+ default:
+ putc(*s, fp);
}
}
}
/* Escape characters below as HTML 2.0 / XML 1.0, ignore printing '\r', '\n' */
void
-xmlencodeline(FILE *fp, const char *s, size_t len)
-{
- size_t i;
-
- for (i = 0; *s && i < len; s++, i++) {
- switch(*s) {
- case '<': fputs("<", fp); break;
- case '>': fputs(">", fp); break;
- case '\'': fputs("'", fp); break;
- case '&': fputs("&", fp); break;
- case '"': fputs(""", fp); break;
- case '\r': break; /* ignore CR */
- case '\n': break; /* ignore LF */
- default: putc(*s, fp);
+xmlencodeline(FILE *fp, const char *s, size_t len) {
+ size_t i;
+
+ for(i = 0; *s && i < len; s++, i++) {
+ switch (*s) {
+ case '<':
+ fputs("<", fp);
+ break;
+ case '>':
+ fputs(">", fp);
+ break;
+ case '\'':
+ fputs("'", fp);
+ break;
+ case '&':
+ fputs("&", fp);
+ break;
+ case '"':
+ fputs(""", fp);
+ break;
+ case '\r':
+ break; /* ignore CR */
+ case '\n':
+ break; /* ignore LF */
+ default:
+ putc(*s, fp);
}
}
}
int
-mkdirp(const char *path)
-{
- char tmp[PATH_MAX], *p;
+mkdirp(const char *path) {
+ char tmp[PATH_MAX], *p;
- if (strlcpy(tmp, path, sizeof(tmp)) >= sizeof(tmp))
+ if(strlcpy(tmp, path, sizeof(tmp)) >= sizeof(tmp))
errx(1, "path truncated: '%s'", path);
- for (p = tmp + (tmp[0] == '/'); *p; p++) {
- if (*p != '/')
+ for(p = tmp + (tmp[0] == '/'); *p; p++) {
+ if(*p != '/')
continue;
*p = '\0';
- if (mkdir(tmp, S_IRWXU | S_IRWXG | S_IRWXO) < 0 && errno != EEXIST)
+ if(mkdir(tmp, S_IRWXU | S_IRWXG | S_IRWXO) < 0
+ && errno != EEXIST)
return -1;
*p = '/';
}
- if (mkdir(tmp, S_IRWXU | S_IRWXG | S_IRWXO) < 0 && errno != EEXIST)
+ if(mkdir(tmp, S_IRWXU | S_IRWXG | S_IRWXO) < 0 && errno != EEXIST)
return -1;
return 0;
}
void
-printtimez(FILE *fp, const git_time *intime)
-{
- struct tm *intm;
- time_t t;
- char out[32];
-
- t = (time_t)intime->time;
- if (!(intm = gmtime(&t)))
+printtimez(FILE *fp, const git_time *intime) {
+ struct tm *intm;
+ time_t t;
+ char out[32];
+
+ t = (time_t) intime->time;
+ if(!(intm = gmtime(&t)))
return;
strftime(out, sizeof(out), "%Y-%m-%dT%H:%M:%SZ", intm);
fputs(out, fp);
}
void
-printtime(FILE *fp, const git_time *intime)
-{
- struct tm *intm;
- time_t t;
- char out[32];
-
- t = (time_t)intime->time + (intime->offset * 60);
- if (!(intm = gmtime(&t)))
+printtime(FILE *fp, const git_time *intime) {
+ struct tm *intm;
+ time_t t;
+ char out[32];
+
+ t = (time_t) intime->time + (intime->offset * 60);
+ if(!(intm = gmtime(&t)))
return;
strftime(out, sizeof(out), "%a, %e %b %Y %H:%M:%S", intm);
- if (intime->offset < 0)
- fprintf(fp, "%s -%02d%02d", out,
- -(intime->offset) / 60, -(intime->offset) % 60);
+ if(intime->offset < 0)
+ fprintf(fp, "%s -%02d%02d", out, -(intime->offset) / 60,
+ -(intime->offset) % 60);
else
- fprintf(fp, "%s +%02d%02d", out,
- intime->offset / 60, intime->offset % 60);
+ fprintf(fp, "%s +%02d%02d", out, intime->offset / 60,
+ intime->offset % 60);
}
void
-printtimeshort(FILE *fp, const git_time *intime)
-{
- struct tm *intm;
- time_t t;
- char out[32];
-
- t = (time_t)intime->time;
- if (!(intm = gmtime(&t)))
+printtimeshort(FILE *fp, const git_time *intime) {
+ struct tm *intm;
+ time_t t;
+ char out[32];
+
+ t = (time_t) intime->time;
+ if(!(intm = gmtime(&t)))
return;
strftime(out, sizeof(out), "%Y-%m-%d %H:%M", intm);
fputs(out, fp);
}
void
-writeheader(FILE *fp, const char *title)
-{
- fputs("<!DOCTYPE html>\n"
- "<html>\n<head>\n"
- "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n"
- "<meta name=\"viewport\" content=\"width=device-width, initial-scale=1\" />\n"
- "<title>", fp);
+writeheader(FILE *fp, const char *title) {
+ fputs("<!DOCTYPE html>\n" "<html>\n<head>\n"
+ "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n"
+ "<meta name=\"viewport\" content=\"width=device-width, initial-scale=1\" />\n"
+ "<title>", fp);
xmlencode(fp, title, strlen(title));
- if (title[0] && strippedname[0])
+ if(title[0] && strippedname[0])
fputs(" - ", fp);
xmlencode(fp, strippedname, strlen(strippedname));
- if (description[0])
+ if(description[0])
fputs(" - ", fp);
xmlencode(fp, description, strlen(description));
- fprintf(fp, "</title>\n<link rel=\"icon\" type=\"image/png\" href=\"%sfavicon.png\" />\n", relpath);
- fputs("<link rel=\"alternate\" type=\"application/atom+xml\" title=\"", fp);
+ fprintf(fp,
+ "</title>\n<link rel=\"icon\" type=\"image/png\" href=\"%sfavicon.png\" />\n",
+ relpath);
+ fputs("<link rel=\"alternate\" type=\"application/atom+xml\" title=\"",
+ fp);
xmlencode(fp, name, strlen(name));
fprintf(fp, " Atom Feed\" href=\"%satom.xml\" />\n", relpath);
- fputs("<link rel=\"alternate\" type=\"application/atom+xml\" title=\"", fp);
+ fputs("<link rel=\"alternate\" type=\"application/atom+xml\" title=\"",
+ fp);
xmlencode(fp, name, strlen(name));
fprintf(fp, " Atom Feed (tags)\" href=\"%stags.xml\" />\n", relpath);
- fprintf(fp, "<link rel=\"stylesheet\" type=\"text/css\" href=\"%sstyle.css\" />\n", relpath);
- fputs("</head>\n<body>\n<table><tr><td>", fp);
- fprintf(fp, "<a href=\"../%s\"><img src=\"%slogo.png\" alt=\"\" width=\"32\" height=\"32\" /></a>",
- relpath, relpath);
- fputs("</td><td><h1>", fp);
+ fprintf(fp,
+ "<link rel=\"stylesheet\" type=\"text/css\" href=\"%sstyle.css\" />\n",
+ relpath);
+ fputs("</head>", fp);
+ fputs(HEADER, fp);
+ fputs("</head>\n<body>\n", fp);
+ fputs("<h1>", fp);
xmlencode(fp, strippedname, strlen(strippedname));
fputs("</h1><span class=\"desc\">", fp);
xmlencode(fp, description, strlen(description));
- fputs("</span></td></tr>", fp);
- if (cloneurl[0]) {
- fputs("<tr class=\"url\"><td></td><td>git clone <a href=\"", fp);
- xmlencode(fp, cloneurl, strlen(cloneurl)); /* not percent-encoded */
+ fputs("</span><br>", fp);
+ if(cloneurl[0]) {
+ fputs("<span class=\"url\">git clone <a href=\"", fp);
+ xmlencode(fp, cloneurl, strlen(cloneurl)); /* not percent-encoded */
fputs("\">", fp);
xmlencode(fp, cloneurl, strlen(cloneurl));
- fputs("</a></td></tr>", fp);
+ fputs("</a></span><br>", fp);
}
- fputs("<tr><td></td><td>\n", fp);
fprintf(fp, "<a href=\"%slog.html\">Log</a> | ", relpath);
fprintf(fp, "<a href=\"%sfiles.html\">Files</a> | ", relpath);
fprintf(fp, "<a href=\"%srefs.html\">Refs</a>", relpath);
- if (submodules)
+ if(submodules)
fprintf(fp, " | <a href=\"%sfile/%s.html\">Submodules</a>",
- relpath, submodules);
- if (readme)
- fprintf(fp, " | <a href=\"%sfile/%s.html\">README</a>",
- relpath, readme);
- if (license)
+ relpath, submodules);
+ if(readme)
+ fprintf(fp, " | <a href=\"%sfile/%s.html\">README</a>", relpath,
+ readme);
+ if(license)
fprintf(fp, " | <a href=\"%sfile/%s.html\">LICENSE</a>",
- relpath, license);
+ relpath, license);
fputs("</td></tr></table>\n<hr/>\n<div id=\"content\">\n", fp);
}
void
-writefooter(FILE *fp)
-{
+writefooter(FILE *fp) {
fputs("</div>\n</body>\n</html>\n", fp);
}
size_t
-writeblobhtml(FILE *fp, const git_blob *blob)
-{
- size_t n = 0, i, len, prev;
- const char *nfmt = "<a href=\"#l%zu\" class=\"line\" id=\"l%zu\">%7zu</a> ";
- const char *s = git_blob_rawcontent(blob);
+writeblobhtml(FILE *fp, const git_blob *blob) {
+ size_t n = 0, i, len, prev;
+ const char *nfmt =
+ "<a href=\"#l%zu\" class=\"line\" id=\"l%zu\">%7zu</a> ";
+ const char *s = git_blob_rawcontent(blob);
len = git_blob_rawsize(blob);
fputs("<pre id=\"blob\">\n", fp);
- if (len > 0) {
- for (i = 0, prev = 0; i < len; i++) {
- if (s[i] != '\n')
+ if(len > 0) {
+ for(i = 0, prev = 0; i < len; i++) {
+ if(s[i] != '\n')
continue;
n++;
fprintf(fp, nfmt, n, n, n);
@@ -581,7 +603,7 @@ writeblobhtml(FILE *fp, const git_blob *blob)
prev = i + 1;
}
/* trailing data */
- if ((len - prev) > 0) {
+ if((len - prev) > 0) {
n++;
fprintf(fp, nfmt, n, n, n);
xmlencodeline(fp, &s[prev], len - prev);
@@ -594,27 +616,27 @@ writeblobhtml(FILE *fp, const git_blob *blob)
}
void
-printcommit(FILE *fp, struct commitinfo *ci)
-{
+printcommit(FILE *fp, struct commitinfo *ci) {
fprintf(fp, "<b>commit</b> <a href=\"%scommit/%s.html\">%s</a>\n",
- relpath, ci->oid, ci->oid);
+ relpath, ci->oid, ci->oid);
- if (ci->parentoid[0])
- fprintf(fp, "<b>parent</b> <a href=\"%scommit/%s.html\">%s</a>\n",
- relpath, ci->parentoid, ci->parentoid);
+ if(ci->parentoid[0])
+ fprintf(fp,
+ "<b>parent</b> <a href=\"%scommit/%s.html\">%s</a>\n",
+ relpath, ci->parentoid, ci->parentoid);
- if (ci->author) {
+ if(ci->author) {
fputs("<b>Author:</b> ", fp);
xmlencode(fp, ci->author->name, strlen(ci->author->name));
fputs(" <<a href=\"mailto:", fp);
- xmlencode(fp, ci->author->email, strlen(ci->author->email)); /* not percent-encoded */
+ xmlencode(fp, ci->author->email, strlen(ci->author->email)); /* not percent-encoded */
fputs("\">", fp);
xmlencode(fp, ci->author->email, strlen(ci->author->email));
fputs("</a>>\n<b>Date:</b> ", fp);
printtime(fp, &(ci->author->when));
putc('\n', fp);
}
- if (ci->msg) {
+ if(ci->msg) {
putc('\n', fp);
xmlencode(fp, ci->msg, strlen(ci->msg));
putc('\n', fp);
@@ -622,124 +644,151 @@ printcommit(FILE *fp, struct commitinfo *ci)
}
void
-printshowfile(FILE *fp, struct commitinfo *ci)
-{
+printshowfile(FILE *fp, struct commitinfo *ci) {
const git_diff_delta *delta;
const git_diff_hunk *hunk;
const git_diff_line *line;
- git_patch *patch;
- size_t nhunks, nhunklines, changed, add, del, total, i, j, k;
- char linestr[80];
- int c;
+ git_patch *patch;
+ size_t nhunks, nhunklines, changed, add, del, total, i, j, k;
+ char linestr[80];
+ int c;
printcommit(fp, ci);
- if (!ci->deltas)
+ if(!ci->deltas)
return;
- if (ci->filecount > 1000 ||
- ci->ndeltas > 1000 ||
- ci->addcount > 100000 ||
- ci->delcount > 100000) {
+ if(ci->filecount > 1000 || ci->ndeltas > 1000 || ci->addcount > 100000
+ || ci->delcount > 100000) {
fputs("Diff is too large, output suppressed.\n", fp);
return;
}
/* diff stat */
fputs("<b>Diffstat:</b>\n<table>", fp);
- for (i = 0; i < ci->ndeltas; i++) {
+ for(i = 0; i < ci->ndeltas; i++) {
delta = git_patch_get_delta(ci->deltas[i]->patch);
switch (delta->status) {
- case GIT_DELTA_ADDED: c = 'A'; break;
- case GIT_DELTA_COPIED: c = 'C'; break;
- case GIT_DELTA_DELETED: c = 'D'; break;
- case GIT_DELTA_MODIFIED: c = 'M'; break;
- case GIT_DELTA_RENAMED: c = 'R'; break;
- case GIT_DELTA_TYPECHANGE: c = 'T'; break;
- default: c = ' '; break;
+ case GIT_DELTA_ADDED:
+ c = 'A';
+ break;
+ case GIT_DELTA_COPIED:
+ c = 'C';
+ break;
+ case GIT_DELTA_DELETED:
+ c = 'D';
+ break;
+ case GIT_DELTA_MODIFIED:
+ c = 'M';
+ break;
+ case GIT_DELTA_RENAMED:
+ c = 'R';
+ break;
+ case GIT_DELTA_TYPECHANGE:
+ c = 'T';
+ break;
+ default:
+ c = ' ';
+ break;
}
- if (c == ' ')
+ if(c == ' ')
fprintf(fp, "<tr><td>%c", c);
else
fprintf(fp, "<tr><td class=\"%c\">%c", c, c);
fprintf(fp, "</td><td><a href=\"#h%zu\">", i);
- xmlencode(fp, delta->old_file.path, strlen(delta->old_file.path));
- if (strcmp(delta->old_file.path, delta->new_file.path)) {
+ xmlencode(fp, delta->old_file.path,
+ strlen(delta->old_file.path));
+ if(strcmp(delta->old_file.path, delta->new_file.path)) {
fputs(" -> ", fp);
- xmlencode(fp, delta->new_file.path, strlen(delta->new_file.path));
+ xmlencode(fp, delta->new_file.path,
+ strlen(delta->new_file.path));
}
add = ci->deltas[i]->addcount;
del = ci->deltas[i]->delcount;
changed = add + del;
total = sizeof(linestr) - 2;
- if (changed > total) {
- if (add)
+ if(changed > total) {
+ if(add)
add = ((float)total / changed * add) + 1;
- if (del)
+ if(del)
del = ((float)total / changed * del) + 1;
}
memset(&linestr, '+', add);
memset(&linestr[add], '-', del);
- fprintf(fp, "</a></td><td> | </td><td class=\"num\">%zu</td><td><span class=\"i\">",
+ fprintf(fp,
+ "</a></td><td> | </td><td class=\"num\">%zu</td><td><span class=\"i\">",
ci->deltas[i]->addcount + ci->deltas[i]->delcount);
fwrite(&linestr, 1, add, fp);
fputs("</span><span class=\"d\">", fp);
fwrite(&linestr[add], 1, del, fp);
fputs("</span></td></tr>\n", fp);
}
- fprintf(fp, "</table></pre><pre>%zu file%s changed, %zu insertion%s(+), %zu deletion%s(-)\n",
- ci->filecount, ci->filecount == 1 ? "" : "s",
- ci->addcount, ci->addcount == 1 ? "" : "s",
- ci->delcount, ci->delcount == 1 ? "" : "s");
+ fprintf(fp,
+ "</table></pre><pre>%zu file%s changed, %zu insertion%s(+), %zu deletion%s(-)\n",
+ ci->filecount, ci->filecount == 1 ? "" : "s", ci->addcount,
+ ci->addcount == 1 ? "" : "s", ci->delcount,
+ ci->delcount == 1 ? "" : "s");
fputs("<hr/>", fp);
- for (i = 0; i < ci->ndeltas; i++) {
+ for(i = 0; i < ci->ndeltas; i++) {
patch = ci->deltas[i]->patch;
delta = git_patch_get_delta(patch);
- fprintf(fp, "<b>diff --git a/<a id=\"h%zu\" href=\"%sfile/", i, relpath);
- percentencode(fp, delta->old_file.path, strlen(delta->old_file.path));
+ fprintf(fp, "<b>diff --git a/<a id=\"h%zu\" href=\"%sfile/", i,
+ relpath);
+ percentencode(fp, delta->old_file.path,
+ strlen(delta->old_file.path));
fputs(".html\">", fp);
- xmlencode(fp, delta->old_file.path, strlen(delta->old_file.path));
+ xmlencode(fp, delta->old_file.path,
+ strlen(delta->old_file.path));
fprintf(fp, "</a> b/<a href=\"%sfile/", relpath);
- percentencode(fp, delta->new_file.path, strlen(delta->new_file.path));
+ percentencode(fp, delta->new_file.path,
+ strlen(delta->new_file.path));
fprintf(fp, ".html\">");
- xmlencode(fp, delta->new_file.path, strlen(delta->new_file.path));
+ xmlencode(fp, delta->new_file.path,
+ strlen(delta->new_file.path));
fprintf(fp, "</a></b>\n");
/* check binary data */
- if (delta->flags & GIT_DIFF_FLAG_BINARY) {
+ if(delta->flags & GIT_DIFF_FLAG_BINARY) {
fputs("Binary files differ.\n", fp);
continue;
}
nhunks = git_patch_num_hunks(patch);
- for (j = 0; j < nhunks; j++) {
- if (git_patch_get_hunk(&hunk, &nhunklines, patch, j))
+ for(j = 0; j < nhunks; j++) {
+ if(git_patch_get_hunk(&hunk, &nhunklines, patch, j))
break;
- fprintf(fp, "<a href=\"#h%zu-%zu\" id=\"h%zu-%zu\" class=\"h\">", i, j, i, j);
+ fprintf(fp,
+ "<a href=\"#h%zu-%zu\" id=\"h%zu-%zu\" class=\"h\">",
+ i, j, i, j);
xmlencode(fp, hunk->header, hunk->header_len);
fputs("</a>", fp);
- for (k = 0; ; k++) {
- if (git_patch_get_line_in_hunk(&line, patch, j, k))
+ for(k = 0;; k++) {
+ if(git_patch_get_line_in_hunk
+ (&line, patch, j, k))
break;
- if (line->old_lineno == -1)
- fprintf(fp, "<a href=\"#h%zu-%zu-%zu\" id=\"h%zu-%zu-%zu\" class=\"i\">+",
- i, j, k, i, j, k);
- else if (line->new_lineno == -1)
- fprintf(fp, "<a href=\"#h%zu-%zu-%zu\" id=\"h%zu-%zu-%zu\" class=\"d\">-",
- i, j, k, i, j, k);
+ if(line->old_lineno == -1)
+ fprintf(fp,
+ "<a href=\"#h%zu-%zu-%zu\" id=\"h%zu-%zu-%zu\" class=\"i\">+",
+ i, j, k, i, j, k);
+ else if(line->new_lineno == -1)
+ fprintf(fp,
+ "<a href=\"#h%zu-%zu-%zu\" id=\"h%zu-%zu-%zu\" class=\"d\">-",
+ i, j, k, i, j, k);
else
putc(' ', fp);
- xmlencodeline(fp, line->content, line->content_len);
+ xmlencodeline(fp, line->content,
+ line->content_len);
putc('\n', fp);
- if (line->old_lineno == -1 || line->new_lineno == -1)
+ if(line->old_lineno == -1
+ || line->new_lineno == -1)
fputs("</a>", fp);
}
}
@@ -747,19 +796,18 @@ printshowfile(FILE *fp, struct commitinfo *ci)
}
void
-writelogline(FILE *fp, struct commitinfo *ci)
-{
+writelogline(FILE *fp, struct commitinfo *ci) {
fputs("<tr><td>", fp);
- if (ci->author)
+ if(ci->author)
printtimeshort(fp, &(ci->author->when));
fputs("</td><td>", fp);
- if (ci->summary) {
+ if(ci->summary) {
fprintf(fp, "<a href=\"%scommit/%s.html\">", relpath, ci->oid);
xmlencode(fp, ci->summary, strlen(ci->summary));
fputs("</a>", fp);
}
fputs("</td><td>", fp);
- if (ci->author)
+ if(ci->author)
xmlencode(fp, ci->author->name, strlen(ci->author->name));
fputs("</td><td class=\"num\" align=\"right\">", fp);
fprintf(fp, "%zu", ci->filecount);
@@ -771,56 +819,55 @@ writelogline(FILE *fp, struct commitinfo *ci)
}
int
-writelog(FILE *fp, const git_oid *oid)
-{
+writelog(FILE *fp, const git_oid *oid) {
struct commitinfo *ci;
- git_revwalk *w = NULL;
- git_oid id;
- char path[PATH_MAX], oidstr[GIT_OID_HEXSZ + 1];
- FILE *fpfile;
- size_t remcommits = 0;
- int r;
+ git_revwalk *w = NULL;
+ git_oid id;
+ char path[PATH_MAX], oidstr[GIT_OID_HEXSZ + 1];
+ FILE *fpfile;
+ size_t remcommits = 0;
+ int r;
git_revwalk_new(&w, repo);
git_revwalk_push(w, oid);
- while (!git_revwalk_next(&id, w)) {
+ while(!git_revwalk_next(&id, w)) {
relpath = "";
- if (cachefile && !memcmp(&id, &lastoid, sizeof(id)))
+ if(cachefile && !memcmp(&id, &lastoid, sizeof(id)))
break;
git_oid_tostr(oidstr, sizeof(oidstr), &id);
r = snprintf(path, sizeof(path), "commit/%s.html", oidstr);
- if (r < 0 || (size_t)r >= sizeof(path))
+ if(r < 0 || (size_t)r >= sizeof(path))
errx(1, "path truncated: 'commit/%s.html'", oidstr);
r = access(path, F_OK);
/* optimization: if there are no log lines to write and
the commit file already exists: skip the diffstat */
- if (!nlogcommits) {
+ if(!nlogcommits) {
remcommits++;
- if (!r)
+ if(!r)
continue;
}
- if (!(ci = commitinfo_getbyoid(&id)))
+ if(!(ci = commitinfo_getbyoid(&id)))
break;
/* diffstat: for stagit HTML required for the log.html line */
- if (commitinfo_getstats(ci) == -1)
+ if(commitinfo_getstats(ci) == -1)
goto err;
- if (nlogcommits != 0) {
+ if(nlogcommits != 0) {
writelogline(fp, ci);
- if (nlogcommits > 0)
+ if(nlogcommits > 0)
nlogcommits--;
}
- if (cachefile)
+ if(cachefile)
writelogline(wcachefp, ci);
/* check if file exists if so skip it */
- if (r) {
+ if(r) {
relpath = "../";
fpfile = efopen(path, "w");
writeheader(fpfile, ci->summary);
@@ -831,13 +878,14 @@ writelog(FILE *fp, const git_oid *oid)
checkfileerror(fpfile, path, 'w');
fclose(fpfile);
}
-err:
+ err:
commitinfo_free(ci);
}
git_revwalk_free(w);
- if (nlogcommits == 0 && remcommits != 0) {
- fprintf(fp, "<tr><td></td><td colspan=\"5\">"
+ if(nlogcommits == 0 && remcommits != 0) {
+ fprintf(fp,
+ "<tr><td></td><td colspan=\"5\">"
"%zu more commits remaining, fetch the repository"
"</td></tr>\n", remcommits);
}
@@ -848,24 +896,23 @@ err:
}
void
-printcommitatom(FILE *fp, struct commitinfo *ci, const char *tag)
-{
+printcommitatom(FILE *fp, struct commitinfo *ci, const char *tag) {
fputs("<entry>\n", fp);
fprintf(fp, "<id>%s</id>\n", ci->oid);
- if (ci->author) {
+ if(ci->author) {
fputs("<published>", fp);
printtimez(fp, &(ci->author->when));
fputs("</published>\n", fp);
}
- if (ci->committer) {
+ if(ci->committer) {
fputs("<updated>", fp);
printtimez(fp, &(ci->committer->when));
fputs("</updated>\n", fp);
}
- if (ci->summary) {
+ if(ci->summary) {
fputs("<title type=\"text\">", fp);
- if (tag && tag[0]) {
+ if(tag && tag[0]) {
fputs("[", fp);
xmlencode(fp, tag, strlen(tag));
fputs("] ", fp);
@@ -873,10 +920,11 @@ printcommitatom(FILE *fp, struct commitinfo *ci, const char *tag)
xmlencode(fp, ci->summary, strlen(ci->summary));
fputs("</title>\n", fp);
}
- fprintf(fp, "<link rel=\"alternate\" type=\"text/html\" href=\"%scommit/%s.html\" />\n",
+ fprintf(fp,
+ "<link rel=\"alternate\" type=\"text/html\" href=\"%scommit/%s.html\" />\n",
baseurl, ci->oid);
- if (ci->author) {
+ if(ci->author) {
fputs("<author>\n<name>", fp);
xmlencode(fp, ci->author->name, strlen(ci->author->name));
fputs("</name>\n<email>", fp);
@@ -886,9 +934,9 @@ printcommitatom(FILE *fp, struct commitinfo *ci, const char *tag)
fputs("<content type=\"text\">", fp);
fprintf(fp, "commit %s\n", ci->oid);
- if (ci->parentoid[0])
+ if(ci->parentoid[0])
fprintf(fp, "parent %s\n", ci->parentoid);
- if (ci->author) {
+ if(ci->author) {
fputs("Author: ", fp);
xmlencode(fp, ci->author->name, strlen(ci->author->name));
fputs(" <", fp);
@@ -897,7 +945,7 @@ printcommitatom(FILE *fp, struct commitinfo *ci, const char *tag)
printtime(fp, &(ci->author->when));
putc('\n', fp);
}
- if (ci->msg) {
+ if(ci->msg) {
putc('\n', fp);
xmlencode(fp, ci->msg, strlen(ci->msg));
}
@@ -905,14 +953,13 @@ printcommitatom(FILE *fp, struct commitinfo *ci, const char *tag)
}
int
-writeatom(FILE *fp, int all)
-{
+writeatom(FILE *fp, int all) {
struct referenceinfo *ris = NULL;
- size_t refcount = 0;
+ size_t refcount = 0;
struct commitinfo *ci;
- git_revwalk *w = NULL;
- git_oid id;
- size_t i, m = 100; /* last 'm' commits */
+ git_revwalk *w = NULL;
+ git_oid id;
+ size_t i, m = 100; /* last 'm' commits */
fputs("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
"<feed xmlns=\"http://www.w3.org/2005/Atom\">\n<title>", fp);
@@ -922,22 +969,23 @@ writeatom(FILE *fp, int all)
fputs("</subtitle>\n", fp);
/* all commits or only tags? */
- if (all) {
+ if(all) {
git_revwalk_new(&w, repo);
git_revwalk_push_head(w);
- for (i = 0; i < m && !git_revwalk_next(&id, w); i++) {
- if (!(ci = commitinfo_getbyoid(&id)))
+ for(i = 0; i < m && !git_revwalk_next(&id, w); i++) {
+ if(!(ci = commitinfo_getbyoid(&id)))
break;
printcommitatom(fp, ci, "");
commitinfo_free(ci);
}
git_revwalk_free(w);
- } else if (getrefs(&ris, &refcount) != -1) {
+ } else if(getrefs(&ris, &refcount) != -1) {
/* references: tags */
- for (i = 0; i < refcount; i++) {
- if (git_reference_is_tag(ris[i].ref))
+ for(i = 0; i < refcount; i++) {
+ if(git_reference_is_tag(ris[i].ref))
printcommitatom(fp, ris[i].ci,
- git_reference_shorthand(ris[i].ref));
+ git_reference_shorthand(ris[i].
+ ref));
commitinfo_free(ris[i].ci);
git_reference_free(ris[i].ref);
@@ -951,18 +999,19 @@ writeatom(FILE *fp, int all)
}
int
-writemarkdownblob(FILE *fp, git_blob *blob)
-{
- char *buf;
- size_t bufsz;
+writemarkdownblob(FILE *fp, git_blob *blob) {
+ char *buf;
+ size_t bufsz;
+
struct lowdown_opts opt = {
.type = LOWDOWN_HTML,
- .feat = LOWDOWN_DEFINITION|LOWDOWN_FENCED|LOWDOWN_FOOTNOTES|
- LOWDOWN_METADATA|LOWDOWN_STRIKE|LOWDOWN_SUPER|LOWDOWN_TABLES,
+ .feat = LOWDOWN_DEFINITION | LOWDOWN_FENCED | LOWDOWN_FOOTNOTES
+ | LOWDOWN_METADATA | LOWDOWN_STRIKE | LOWDOWN_SUPER |
+ LOWDOWN_TABLES,
};
lowdown_buf(&opt, git_blob_rawcontent(blob), git_blob_rawsize(blob),
- &buf, &bufsz, NULL);
+ &buf, &bufsz, NULL);
fwrite(buf, 1, bufsz, fp);
free(buf);
@@ -970,9 +1019,9 @@ writemarkdownblob(FILE *fp, git_blob *blob)
return 0;
}
-void writerawblob(git_blob *blob, const char *fpath)
-{
- FILE *fp;
+void
+writerawblob(git_blob *blob, const char *fpath) {
+ FILE *fp;
fp = efopen(fpath, "w");
@@ -984,23 +1033,23 @@ void writerawblob(git_blob *blob, const char *fpath)
}
size_t
-writeblob(git_object *obj, const char *fpath, const char *filename, size_t filesize)
-{
- char tmp[PATH_MAX] = "", *d;
- char rawpath[PATH_MAX] = "";
- const char *p;
- size_t lc = 0;
- FILE *fp;
-
- if (strlcpy(tmp, fpath, sizeof(tmp)) >= sizeof(tmp))
+writeblob(git_object *obj, const char *fpath, const char *filename,
+ size_t filesize) {
+ char tmp[PATH_MAX] = "", *d;
+ char rawpath[PATH_MAX] = "";
+ const char *p;
+ size_t lc = 0;
+ FILE *fp;
+
+ if(strlcpy(tmp, fpath, sizeof(tmp)) >= sizeof(tmp))
errx(1, "path truncated: '%s'", fpath);
- if (!(d = dirname(tmp)))
+ if(!(d = dirname(tmp)))
err(1, "dirname");
- if (mkdirp(d))
+ if(mkdirp(d))
return -1;
- for (p = fpath, tmp[0] = '\0'; *p; p++) {
- if (*p == '/' && strlcat(tmp, "../", sizeof(tmp)) >= sizeof(tmp))
+ for(p = fpath, tmp[0] = '\0'; *p; p++) {
+ if(*p == '/' && strlcat(tmp, "../", sizeof(tmp)) >= sizeof(tmp))
errx(1, "path truncated: '../%s'", tmp);
}
relpath = tmp;
@@ -1012,14 +1061,15 @@ writeblob(git_object *obj, const char *fpath, const char *filename, size_t files
fprintf(fp, " (%zuB)", filesize);
fputs("</p><hr/>", fp);
- if (git_blob_is_binary((git_blob *)obj)) {
+ if(git_blob_is_binary((git_blob *) obj)) {
fputs("<p>Binary file.</p>\n", fp);
memcpy(rawpath, fpath, strlen(fpath) - 5);
- writerawblob((git_blob *)obj, rawpath);
- } else if (strlen(filename) >= 3 && !strcmp(filename + strlen(filename) - 3, ".md")) {
- lc = writemarkdownblob(fp, (git_blob *)obj);
+ writerawblob((git_blob *) obj, rawpath);
+ } else if(strlen(filename) >= 3
+ && !strcmp(filename + strlen(filename) - 3, ".md")) {
+ lc = writemarkdownblob(fp, (git_blob *) obj);
} else
- lc = writeblobhtml(fp, (git_blob *)obj);
+ lc = writeblobhtml(fp, (git_blob *) obj);
writefooter(fp);
checkfileerror(fp, fpath, 'w');
@@ -1030,80 +1080,90 @@ writeblob(git_object *obj, const char *fpath, const char *filename, size_t files
return lc;
}
-const char *
-filemode(git_filemode_t m)
-{
- static char mode[11];
+const char *
+filemode(git_filemode_t m) {
+ static char mode[11];
memset(mode, '-', sizeof(mode) - 1);
mode[10] = '\0';
- if (S_ISREG(m))
+ if(S_ISREG(m))
mode[0] = '-';
- else if (S_ISBLK(m))
+ else if(S_ISBLK(m))
mode[0] = 'b';
- else if (S_ISCHR(m))
+ else if(S_ISCHR(m))
mode[0] = 'c';
- else if (S_ISDIR(m))
+ else if(S_ISDIR(m))
mode[0] = 'd';
- else if (S_ISFIFO(m))
+ else if(S_ISFIFO(m))
mode[0] = 'p';
- else if (S_ISLNK(m))
+ else if(S_ISLNK(m))
mode[0] = 'l';
- else if (S_ISSOCK(m))
+ else if(S_ISSOCK(m))
mode[0] = 's';
else
mode[0] = '?';
- if (m & S_IRUSR) mode[1] = 'r';
- if (m & S_IWUSR) mode[2] = 'w';
- if (m & S_IXUSR) mode[3] = 'x';
- if (m & S_IRGRP) mode[4] = 'r';
- if (m & S_IWGRP) mode[5] = 'w';
- if (m & S_IXGRP) mode[6] = 'x';
- if (m & S_IROTH) mode[7] = 'r';
- if (m & S_IWOTH) mode[8] = 'w';
- if (m & S_IXOTH) mode[9] = 'x';
-
- if (m & S_ISUID) mode[3] = (mode[3] == 'x') ? 's' : 'S';
- if (m & S_ISGID) mode[6] = (mode[6] == 'x') ? 's' : 'S';
- if (m & S_ISVTX) mode[9] = (mode[9] == 'x') ? 't' : 'T';
+ if(m & S_IRUSR)
+ mode[1] = 'r';
+ if(m & S_IWUSR)
+ mode[2] = 'w';
+ if(m & S_IXUSR)
+ mode[3] = 'x';
+ if(m & S_IRGRP)
+ mode[4] = 'r';
+ if(m & S_IWGRP)
+ mode[5] = 'w';
+ if(m & S_IXGRP)
+ mode[6] = 'x';
+ if(m & S_IROTH)
+ mode[7] = 'r';
+ if(m & S_IWOTH)
+ mode[8] = 'w';
+ if(m & S_IXOTH)
+ mode[9] = 'x';
+
+ if(m & S_ISUID)
+ mode[3] = (mode[3] == 'x') ? 's' : 'S';
+ if(m & S_ISGID)
+ mode[6] = (mode[6] == 'x') ? 's' : 'S';
+ if(m & S_ISVTX)
+ mode[9] = (mode[9] == 'x') ? 't' : 'T';
return mode;
}
int
-writefilestree(FILE *fp, git_tree *tree, const char *path)
-{
+writefilestree(FILE *fp, git_tree *tree, const char *path) {
const git_tree_entry *entry = NULL;
- git_object *obj = NULL;
- const char *entryname;
- char filepath[PATH_MAX], entrypath[PATH_MAX], oid[8];
- size_t count, i, lc, filesize;
- int r, ret;
+ git_object *obj = NULL;
+ const char *entryname;
+ char filepath[PATH_MAX], entrypath[PATH_MAX], oid[8];
+ size_t count, i, lc, filesize;
+ int r, ret;
count = git_tree_entrycount(tree);
- for (i = 0; i < count; i++) {
- if (!(entry = git_tree_entry_byindex(tree, i)) ||
- !(entryname = git_tree_entry_name(entry)))
+ for(i = 0; i < count; i++) {
+ if(!(entry = git_tree_entry_byindex(tree, i))
+ || !(entryname = git_tree_entry_name(entry)))
return -1;
joinpath(entrypath, sizeof(entrypath), path, entryname);
r = snprintf(filepath, sizeof(filepath), "file/%s.html",
- entrypath);
- if (r < 0 || (size_t)r >= sizeof(filepath))
+ entrypath);
+ if(r < 0 || (size_t)r >= sizeof(filepath))
errx(1, "path truncated: 'file/%s.html'", entrypath);
- if (!git_tree_entry_to_object(&obj, repo, entry)) {
+ if(!git_tree_entry_to_object(&obj, repo, entry)) {
switch (git_object_type(obj)) {
case GIT_OBJ_BLOB:
break;
case GIT_OBJ_TREE:
/* NOTE: recurses */
- ret = writefilestree(fp, (git_tree *)obj,
+ ret = writefilestree(fp, (git_tree *) obj,
entrypath);
git_object_free(obj);
- if (ret)
+ if(ret)
return ret;
continue;
default:
@@ -1111,7 +1171,7 @@ writefilestree(FILE *fp, git_tree *tree, const char *path)
continue;
}
- filesize = git_blob_rawsize((git_blob *)obj);
+ filesize = git_blob_rawsize((git_blob *) obj);
lc = writeblob(obj, filepath, entryname, filesize);
fputs("<tr><td>", fp);
@@ -1120,20 +1180,23 @@ writefilestree(FILE *fp, git_tree *tree, const char *path)
percentencode(fp, filepath, strlen(filepath));
fputs("\">", fp);
xmlencode(fp, entrypath, strlen(entrypath));
- fputs("</a></td><td class=\"num\" align=\"right\">", fp);
- if (lc > 0)
+ fputs("</a></td><td class=\"num\" align=\"right\">",
+ fp);
+ if(lc > 0)
fprintf(fp, "%zuL", lc);
else
fprintf(fp, "%zuB", filesize);
fputs("</td></tr>\n", fp);
git_object_free(obj);
- } else if (git_tree_entry_type(entry) == GIT_OBJ_COMMIT) {
+ } else if(git_tree_entry_type(entry) == GIT_OBJ_COMMIT) {
/* commit object in tree is a submodule */
- fprintf(fp, "<tr><td>m---------</td><td><a href=\"%sfile/.gitmodules.html\">",
- relpath);
+ fprintf(fp,
+ "<tr><td>m---------</td><td><a href=\"%sfile/.gitmodules.html\">",
+ relpath);
xmlencode(fp, entrypath, strlen(entrypath));
fputs("</a> @ ", fp);
- git_oid_tostr(oid, sizeof(oid), git_tree_entry_id(entry));
+ git_oid_tostr(oid, sizeof(oid),
+ git_tree_entry_id(entry));
xmlencode(fp, oid, strlen(oid));
fputs("</td><td class=\"num\" align=\"right\"></td></tr>\n", fp);
}
@@ -1143,19 +1206,18 @@ writefilestree(FILE *fp, git_tree *tree, const char *path)
}
int
-writefiles(FILE *fp, const git_oid *id)
-{
- git_tree *tree = NULL;
- git_commit *commit = NULL;
- int ret = -1;
+writefiles(FILE *fp, const git_oid *id) {
+ git_tree *tree = NULL;
+ git_commit *commit = NULL;
+ int ret = -1;
fputs("<table id=\"files\"><thead>\n<tr>"
"<td><b>Mode</b></td><td><b>Name</b></td>"
"<td class=\"num\" align=\"right\"><b>Size</b></td>"
"</tr>\n</thead><tbody>\n", fp);
- if (!git_commit_lookup(&commit, repo, id) &&
- !git_commit_tree(&tree, commit))
+ if(!git_commit_lookup(&commit, repo, id)
+ && !git_commit_tree(&tree, commit))
ret = writefilestree(fp, tree, "");
fputs("</tbody></table>", fp);
@@ -1167,34 +1229,33 @@ writefiles(FILE *fp, const git_oid *id)
}
int
-writerefs(FILE *fp)
-{
+writerefs(FILE *fp) {
struct referenceinfo *ris = NULL;
struct commitinfo *ci;
- size_t count, i, j, refcount;
- const char *titles[] = { "Branches", "Tags" };
- const char *ids[] = { "branches", "tags" };
- const char *s;
+ size_t count, i, j, refcount;
+ const char *titles[] = { "Branches", "Tags" };
+ const char *ids[] = { "branches", "tags" };
+ const char *s;
- if (getrefs(&ris, &refcount) == -1)
+ if(getrefs(&ris, &refcount) == -1)
return -1;
- for (i = 0, j = 0, count = 0; i < refcount; i++) {
- if (j == 0 && git_reference_is_tag(ris[i].ref)) {
- if (count)
+ for(i = 0, j = 0, count = 0; i < refcount; i++) {
+ if(j == 0 && git_reference_is_tag(ris[i].ref)) {
+ if(count)
fputs("</tbody></table><br/>\n", fp);
count = 0;
j = 1;
}
/* print header if it has an entry (first). */
- if (++count == 1) {
- fprintf(fp, "<h2>%s</h2><table id=\"%s\">"
- "<thead>\n<tr><td><b>Name</b></td>"
+ if(++count == 1) {
+ fprintf(fp,
+ "<h2>%s</h2><table id=\"%s\">"
+ "<thead>\n<tr><td><b>Name</b></td>"
"<td><b>Last commit date</b></td>"
"<td><b>Author</b></td>\n</tr>\n"
- "</thead><tbody>\n",
- titles[j], ids[j]);
+ "</thead><tbody>\n", titles[j], ids[j]);
}
ci = ris[i].ci;
@@ -1203,18 +1264,19 @@ writerefs(FILE *fp)
fputs("<tr><td>", fp);
xmlencode(fp, s, strlen(s));
fputs("</td><td>", fp);
- if (ci->author)
+ if(ci->author)
printtimeshort(fp, &(ci->author->when));
fputs("</td><td>", fp);
- if (ci->author)
- xmlencode(fp, ci->author->name, strlen(ci->author->name));
+ if(ci->author)
+ xmlencode(fp, ci->author->name,
+ strlen(ci->author->name));
fputs("</td></tr>\n", fp);
}
/* table footer */
- if (count)
+ if(count)
fputs("</tbody></table><br/>\n", fp);
- for (i = 0; i < refcount; i++) {
+ for(i = 0; i < refcount; i++) {
commitinfo_free(ris[i].ci);
git_reference_free(ris[i].ref);
}
@@ -1224,111 +1286,110 @@ writerefs(FILE *fp)
}
void
-usage(char *argv0)
-{
- fprintf(stderr, "%s [-c cachefile | -l commits] "
- "[-u baseurl] repodir\n", argv0);
+usage(char *argv0) {
+ fprintf(stderr,
+ "%s [-c cachefile | -l commits] " "[-u baseurl] repodir\n",
+ argv0);
exit(1);
}
int
-main(int argc, char *argv[])
-{
- git_object *obj = NULL;
- const git_oid *head = NULL;
- mode_t mask;
- FILE *fp, *fpread;
- char path[PATH_MAX], repodirabs[PATH_MAX + 1], *p;
- char tmppath[64] = "cache.XXXXXXXXXXXX", buf[BUFSIZ];
- size_t n;
- int i, fd;
-
- for (i = 1; i < argc; i++) {
- if (argv[i][0] != '-') {
- if (repodir)
+main(int argc, char *argv[]) {
+ git_object *obj = NULL;
+ const git_oid *head = NULL;
+ mode_t mask;
+ FILE *fp, *fpread;
+ char path[PATH_MAX], repodirabs[PATH_MAX + 1], *p;
+ char tmppath[64] = "cache.XXXXXXXXXXXX", buf[BUFSIZ];
+ size_t n;
+ int i, fd;
+
+ for(i = 1; i < argc; i++) {
+ if(argv[i][0] != '-') {
+ if(repodir)
usage(argv[0]);
repodir = argv[i];
- } else if (argv[i][1] == 'c') {
- if (nlogcommits > 0 || i + 1 >= argc)
+ } else if(argv[i][1] == 'c') {
+ if(nlogcommits > 0 || i + 1 >= argc)
usage(argv[0]);
cachefile = argv[++i];
- } else if (argv[i][1] == 'l') {
- if (cachefile || i + 1 >= argc)
+ } else if(argv[i][1] == 'l') {
+ if(cachefile || i + 1 >= argc)
usage(argv[0]);
errno = 0;
nlogcommits = strtoll(argv[++i], &p, 10);
- if (argv[i][0] == '\0' || *p != '\0' ||
- nlogcommits <= 0 || errno)
+ if(argv[i][0] == '\0' || *p != '\0' || nlogcommits <= 0
+ || errno)
usage(argv[0]);
- } else if (argv[i][1] == 'u') {
- if (i + 1 >= argc)
+ } else if(argv[i][1] == 'u') {
+ if(i + 1 >= argc)
usage(argv[0]);
baseurl = argv[++i];
}
}
- if (!repodir)
+ if(!repodir)
usage(argv[0]);
- if (!realpath(repodir, repodirabs))
+ if(!realpath(repodir, repodirabs))
err(1, "realpath");
/* do not search outside the git repository:
GIT_CONFIG_LEVEL_APP is the highest level currently */
git_libgit2_init();
- for (i = 1; i <= GIT_CONFIG_LEVEL_APP; i++)
+ for(i = 1; i <= GIT_CONFIG_LEVEL_APP; i++)
git_libgit2_opts(GIT_OPT_SET_SEARCH_PATH, i, "");
/* do not require the git repository to be owned by the current user */
git_libgit2_opts(GIT_OPT_SET_OWNER_VALIDATION, 0);
#ifdef __OpenBSD__
- if (unveil(repodir, "r") == -1)
+ if(unveil(repodir, "r") == -1)
err(1, "unveil: %s", repodir);
- if (unveil(".", "rwc") == -1)
+ if(unveil(".", "rwc") == -1)
err(1, "unveil: .");
- if (cachefile && unveil(cachefile, "rwc") == -1)
+ if(cachefile && unveil(cachefile, "rwc") == -1)
err(1, "unveil: %s", cachefile);
- if (cachefile) {
- if (pledge("stdio rpath wpath cpath fattr", NULL) == -1)
+ if(cachefile) {
+ if(pledge("stdio rpath wpath cpath fattr", NULL) == -1)
err(1, "pledge");
} else {
- if (pledge("stdio rpath wpath cpath", NULL) == -1)
+ if(pledge("stdio rpath wpath cpath", NULL) == -1)
err(1, "pledge");
}
#endif
- if (git_repository_open_ext(&repo, repodir,
- GIT_REPOSITORY_OPEN_NO_SEARCH, NULL) < 0) {
+ if(git_repository_open_ext
+ (&repo, repodir, GIT_REPOSITORY_OPEN_NO_SEARCH, NULL) < 0) {
fprintf(stderr, "%s: cannot open repository\n", argv[0]);
return 1;
}
/* find HEAD */
- if (!git_revparse_single(&obj, repo, "HEAD"))
+ if(!git_revparse_single(&obj, repo, "HEAD"))
head = git_object_id(obj);
git_object_free(obj);
/* use directory name as name */
- if ((name = strrchr(repodirabs, '/')))
+ if((name = strrchr(repodirabs, '/')))
name++;
else
name = "";
/* strip .git suffix */
- if (!(strippedname = strdup(name)))
+ if(!(strippedname = strdup(name)))
err(1, "strdup");
- if ((p = strrchr(strippedname, '.')))
- if (!strcmp(p, ".git"))
+ if((p = strrchr(strippedname, '.')))
+ if(!strcmp(p, ".git"))
*p = '\0';
/* read description or .git/description */
joinpath(path, sizeof(path), repodir, "description");
- if (!(fpread = fopen(path, "r"))) {
+ if(!(fpread = fopen(path, "r"))) {
joinpath(path, sizeof(path), repodir, ".git/description");
fpread = fopen(path, "r");
}
- if (fpread) {
- if (!fgets(description, sizeof(description), fpread))
+ if(fpread) {
+ if(!fgets(description, sizeof(description), fpread))
description[0] = '\0';
checkfileerror(fpread, path, 'r');
fclose(fpread);
@@ -1336,12 +1397,12 @@ main(int argc, char *argv[])
/* read url or .git/url */
joinpath(path, sizeof(path), repodir, "url");
- if (!(fpread = fopen(path, "r"))) {
+ if(!(fpread = fopen(path, "r"))) {
joinpath(path, sizeof(path), repodir, ".git/url");
fpread = fopen(path, "r");
}
- if (fpread) {
- if (!fgets(cloneurl, sizeof(cloneurl), fpread))
+ if(fpread) {
+ if(!fgets(cloneurl, sizeof(cloneurl), fpread))
cloneurl[0] = '\0';
checkfileerror(fpread, path, 'r');
fclose(fpread);
@@ -1349,23 +1410,23 @@ main(int argc, char *argv[])
}
/* check LICENSE */
- for (i = 0; i < LEN(licensefiles) && !license; i++) {
- if (!git_revparse_single(&obj, repo, licensefiles[i]) &&
- git_object_type(obj) == GIT_OBJ_BLOB)
+ for(i = 0; i < LEN(licensefiles) && !license; i++) {
+ if(!git_revparse_single(&obj, repo, licensefiles[i])
+ && git_object_type(obj) == GIT_OBJ_BLOB)
license = licensefiles[i] + strlen("HEAD:");
git_object_free(obj);
}
/* check README */
- for (i = 0; i < LEN(readmefiles) && !readme; i++) {
- if (!git_revparse_single(&obj, repo, readmefiles[i]) &&
- git_object_type(obj) == GIT_OBJ_BLOB)
+ for(i = 0; i < LEN(readmefiles) && !readme; i++) {
+ if(!git_revparse_single(&obj, repo, readmefiles[i])
+ && git_object_type(obj) == GIT_OBJ_BLOB)
readme = readmefiles[i] + strlen("HEAD:");
git_object_free(obj);
}
- if (!git_revparse_single(&obj, repo, "HEAD:.gitmodules") &&
- git_object_type(obj) == GIT_OBJ_BLOB)
+ if(!git_revparse_single(&obj, repo, "HEAD:.gitmodules")
+ && git_object_type(obj) == GIT_OBJ_BLOB)
submodules = ".gitmodules";
git_object_free(obj);
@@ -1378,21 +1439,22 @@ main(int argc, char *argv[])
"<td><b>Commit message</b></td>"
"<td><b>Author</b></td><td class=\"num\" align=\"right\"><b>Files</b></td>"
"<td class=\"num\" align=\"right\"><b>+</b></td>"
- "<td class=\"num\" align=\"right\"><b>-</b></td></tr>\n</thead><tbody>\n", fp);
+ "<td class=\"num\" align=\"right\"><b>-</b></td></tr>\n</thead><tbody>\n",
+ fp);
- if (cachefile && head) {
+ if(cachefile && head) {
/* read from cache file (does not need to exist) */
- if ((rcachefp = fopen(cachefile, "r"))) {
- if (!fgets(lastoidstr, sizeof(lastoidstr), rcachefp))
+ if((rcachefp = fopen(cachefile, "r"))) {
+ if(!fgets(lastoidstr, sizeof(lastoidstr), rcachefp))
errx(1, "%s: no object id", cachefile);
- if (git_oid_fromstr(&lastoid, lastoidstr))
+ if(git_oid_fromstr(&lastoid, lastoidstr))
errx(1, "%s: invalid object id", cachefile);
}
/* write log to (temporary) cache */
- if ((fd = mkstemp(tmppath)) == -1)
+ if((fd = mkstemp(tmppath)) == -1)
err(1, "mkstemp");
- if (!(wcachefp = fdopen(fd, "w")))
+ if(!(wcachefp = fdopen(fd, "w")))
err(1, "fdopen: '%s'", tmppath);
/* write last commit id (HEAD) */
git_oid_tostr(buf, sizeof(buf), head);
@@ -1400,15 +1462,15 @@ main(int argc, char *argv[])
writelog(fp, head);
- if (rcachefp) {
+ if(rcachefp) {
/* append previous log to log.html and the new cache */
- while (!feof(rcachefp)) {
+ while(!feof(rcachefp)) {
n = fread(buf, 1, sizeof(buf), rcachefp);
- if (ferror(rcachefp))
+ if(ferror(rcachefp))
+ break;
+ if(fwrite(buf, 1, n, fp) != n
+ || fwrite(buf, 1, n, wcachefp) != n)
break;
- if (fwrite(buf, 1, n, fp) != n ||
- fwrite(buf, 1, n, wcachefp) != n)
- break;
}
checkfileerror(rcachefp, cachefile, 'r');
fclose(rcachefp);
@@ -1416,7 +1478,7 @@ main(int argc, char *argv[])
checkfileerror(wcachefp, tmppath, 'w');
fclose(wcachefp);
} else {
- if (head)
+ if(head)
writelog(fp, head);
}
@@ -1428,7 +1490,7 @@ main(int argc, char *argv[])
/* files for HEAD */
fp = efopen("files.html", "w");
writeheader(fp, "Files");
- if (head)
+ if(head)
writefiles(fp, head);
writefooter(fp);
checkfileerror(fp, "files.html", 'w');
@@ -1455,12 +1517,14 @@ main(int argc, char *argv[])
fclose(fp);
/* rename new cache file on success */
- if (cachefile && head) {
- if (rename(tmppath, cachefile))
+ if(cachefile && head) {
+ if(rename(tmppath, cachefile))
err(1, "rename: '%s' to '%s'", tmppath, cachefile);
umask((mask = umask(0)));
- if (chmod(cachefile,
- (S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH) & ~mask))
+ if(chmod
+ (cachefile,
+ (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH)
+ & ~mask))
err(1, "chmod: '%s'", cachefile);
}