X-Git-Url: https://git.armaanb.net/?p=stagit.git;a=blobdiff_plain;f=stagit.c;h=264604eb4fffd984ff7ef47993e7ff0d4b44de84;hp=8a1a798f4106e395d3b15e0fd285f53398b6a90f;hb=3c00e328b546283294871232e65e39b9d2b80041;hpb=5c278a600ea64c64f238e14d38dafbdbee6c9562 diff --git a/stagit.c b/stagit.c index 8a1a798..264604e 100644 --- a/stagit.c +++ b/stagit.c @@ -1,19 +1,27 @@ #include +#include #include #include -#include #include #include +#include #include #include #include +#include #include #include #include "compat.h" -#include "config.h" + +struct deltainfo { + git_patch *patch; + + size_t addcount; + size_t delcount; +}; struct commitinfo { const git_oid *id; @@ -22,19 +30,22 @@ struct commitinfo { char parentoid[GIT_OID_HEXSZ + 1]; const git_signature *author; + const git_signature *committer; const char *summary; const char *msg; - git_diff_stats *stats; - 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; + + struct deltainfo **deltas; + size_t ndeltas; }; static git_repository *repo; @@ -43,71 +54,212 @@ static const char *relpath = ""; static const char *repodir; static char *name = ""; -static char *stripped_name; +static char *strippedname = ""; static char description[255]; static char cloneurl[1024]; -static int haslicense, hasreadme, hassubmodules; +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; /* < 0 indicates not used */ + +/* cache */ +static git_oid lastoid; +static char lastoidstr[GIT_OID_HEXSZ + 2]; /* id + newline + NUL byte */ +static FILE *rcachefp, *wcachefp; +static const char *cachefile; + +int cp(char fileSource[], char fileDestination[]) +{ + int c; + FILE *stream_R, *stream_W; + + stream_R = fopen(fileSource, "r"); + if (stream_R == NULL) + return -1; + stream_W = fopen(fileDestination, "w"); //create and write to file + if (stream_W == NULL) + { + fclose(stream_R); + return -2; + } + while ((c = fgetc(stream_R)) != EOF) + fputc(c, stream_W); + fclose(stream_R); + fclose(stream_W); + + return 0; +} + +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); +} + +void +deltainfo_free(struct deltainfo *di) +{ + if (!di) + return; + git_patch_free(di->patch); + memset(di, 0, sizeof(*di)); + free(di); +} + +int +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; + + 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))) { + 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)) + goto err; + + 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)) + goto err; + + ndeltas = git_diff_num_deltas(ci->diff); + 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)) + goto err; + + if (!(di = calloc(1, sizeof(struct deltainfo)))) + err(1, "calloc"); + di->patch = patch; + ci->deltas[i] = di; + + delta = git_patch_get_delta(patch); + + /* skip stats for binary data */ + 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)) + break; + for (k = 0; ; k++) { + if (git_patch_get_line_in_hunk(&line, patch, j, k)) + break; + if (line->old_lineno == -1) { + di->addcount++; + ci->addcount++; + } else if (line->new_lineno == -1) { + di->delcount++; + ci->delcount++; + } + } + } + } + ci->ndeltas = i; + ci->filecount = i; + + return 0; + +err: + git_diff_free(ci->diff); + ci->diff = NULL; + git_tree_free(ci->commit_tree); + ci->commit_tree = NULL; + git_tree_free(ci->parent_tree); + ci->parent_tree = NULL; + git_commit_free(ci->parent); + ci->parent = NULL; + + if (ci->deltas) + for (i = 0; i < ci->ndeltas; i++) + deltainfo_free(ci->deltas[i]); + free(ci->deltas); + ci->deltas = NULL; + ci->ndeltas = 0; + ci->addcount = 0; + ci->delcount = 0; + ci->filecount = 0; + + return -1; +} void commitinfo_free(struct commitinfo *ci) { + size_t i; + if (!ci) return; + if (ci->deltas) + for (i = 0; i < ci->ndeltas; i++) + deltainfo_free(ci->deltas[i]); - git_diff_stats_free(ci->stats); + free(ci->deltas); git_diff_free(ci->diff); git_tree_free(ci->commit_tree); git_tree_free(ci->parent_tree); git_commit_free(ci->commit); + git_commit_free(ci->parent); + memset(ci, 0, sizeof(*ci)); + free(ci); } struct commitinfo * commitinfo_getbyoid(const git_oid *id) { struct commitinfo *ci; - git_diff_options opts; - int error; if (!(ci = calloc(1, sizeof(struct commitinfo)))) err(1, "calloc"); - ci->id = 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)); ci->author = git_commit_author(ci->commit); + ci->committer = git_commit_committer(ci->commit); ci->summary = git_commit_summary(ci->commit); ci->msg = git_commit_message(ci->commit); - if ((error = git_commit_tree(&(ci->commit_tree), ci->commit))) - goto err; - if (!(error = git_commit_parent(&(ci->parent), ci->commit, 0))) { - if ((error = git_commit_tree(&(ci->parent_tree), ci->parent))) - goto err; - } else { - ci->parent = NULL; - ci->parent_tree = NULL; - } - - git_diff_init_options(&opts, GIT_DIFF_OPTIONS_VERSION); - opts.flags |= GIT_DIFF_DISABLE_PATHSPEC_MATCH; - if ((error = git_diff_tree_to_tree(&(ci->diff), repo, ci->parent_tree, ci->commit_tree, &opts))) - goto err; - if (git_diff_get_stats(&(ci->stats), ci->diff)) - goto err; - - ci->addcount = git_diff_stats_insertions(ci->stats); - ci->delcount = git_diff_stats_deletions(ci->stats); - ci->filecount = git_diff_stats_files_changed(ci->stats); - return ci; err: commitinfo_free(ci); - free(ci); return NULL; } @@ -118,7 +270,7 @@ efopen(const char *name, const char *flags) FILE *fp; if (!(fp = fopen(name, flags))) - err(1, "fopen"); + err(1, "fopen: '%s'", name); return fp; } @@ -133,7 +285,7 @@ xmlencode(FILE *fp, const char *s, size_t len) switch(*s) { case '<': fputs("<", fp); break; case '>': fputs(">", fp); break; - case '\'': fputs("'", fp); break; + case '\'': fputs("'", fp); break; case '&': fputs("&", fp); break; case '"': fputs(""", fp); break; default: fputc(*s, fp); @@ -141,27 +293,6 @@ xmlencode(FILE *fp, const char *s, size_t len) } } -/* Some implementations of dirname(3) return a pointer to a static - * internal buffer (OpenBSD). Others modify the contents of `path` (POSIX). - * This is a wrapper function that is compatible with both versions. - * The program will error out if dirname(3) failed, this can only happen - * with the OpenBSD version. */ -char * -xdirname(const char *path) -{ - char *p, *b; - - if (!(p = strdup(path))) - err(1, "strdup"); - if (!(b = dirname(p))) - err(1, "dirname"); - if (!(b = strdup(b))) - err(1, "strdup"); - free(p); - - return b; -} - int mkdirp(const char *path) { @@ -183,118 +314,154 @@ mkdirp(const char *path) } void -printtimeformat(FILE *fp, const git_time *intime, const char *fmt) +printtimez(FILE *fp, const git_time *intime) { struct tm *intm; time_t t; char out[32]; - t = (time_t) intime->time + (intime->offset * 60); + t = (time_t)intime->time; if (!(intm = gmtime(&t))) return; - strftime(out, sizeof(out), fmt, intm); + strftime(out, sizeof(out), "%Y-%m-%dT%H:%M:%SZ", intm); fputs(out, fp); } -void -printtimez(FILE *fp, const git_time *intime) -{ - printtimeformat(fp, intime, "%Y-%m-%dT%H:%M:%SZ"); -} - void printtime(FILE *fp, const git_time *intime) { - printtimeformat(fp, intime, "%a %b %e %T %Y"); + 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); + else + fprintf(fp, "%s +%02d%02d", out, + intime->offset / 60, intime->offset % 60); } void printtimeshort(FILE *fp, const git_time *intime) { - printtimeformat(fp, intime, "%Y-%m-%d %H:%M"); + 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); } -int +void writeheader(FILE *fp, const char *title) { fputs("\n" - "\n\n" + "\n\n" "\n" - "\n", fp); + "<meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0\" />\n" + "<title>", fp); xmlencode(fp, title, strlen(title)); - if (title[0] && stripped_name[0]) + if (title[0] && strippedname[0]) fputs(" - ", fp); - xmlencode(fp, stripped_name, strlen(stripped_name)); + xmlencode(fp, strippedname, strlen(strippedname)); if (description[0]) fputs(" - ", fp); xmlencode(fp, description, strlen(description)); fprintf(fp, "\n\n", relpath); fprintf(fp, "\n", name, relpath); - fprintf(fp, "\n", relpath); + fprintf(fp, "\n", relpath); + fprintf(fp, "\n", relpath); fputs("\n\n", fp); if (cloneurl[0]) { - fputs("", fp); + fputs("", fp); } fputs("
", fp); fprintf(fp, "\"\"", relpath, relpath); fputs("

", fp); - xmlencode(fp, stripped_name, strlen(stripped_name)); + xmlencode(fp, strippedname, strlen(strippedname)); fputs("

", fp); xmlencode(fp, description, strlen(description)); fputs("
git clone git clone ", fp); xmlencode(fp, cloneurl, strlen(cloneurl)); - fputs("
\n", fp); fprintf(fp, "Log | ", relpath); fprintf(fp, "Files | ", relpath); fprintf(fp, "Refs", relpath); - if (hassubmodules) - fprintf(fp, " | Submodules", relpath); - if (hasreadme) - fprintf(fp, " | README", relpath); - if (haslicense) - fprintf(fp, " | LICENSE", relpath); + if (submodules) + fprintf(fp, " | Submodules", + relpath, submodules); + if (readme) + fprintf(fp, " | README", + relpath, readme); + if (license) + fprintf(fp, " | LICENSE", + relpath, license); fputs("
\n
\n
\n", fp); +} - return 0; +void +writefooter(FILE *fp) +{ + fputs("
\n\n\n", fp); } int -writefooter(FILE *fp) +call_py(const char *filename, FILE *fp, const char *s, size_t len) { - return !fputs("\n\n\n", fp); + // Flush HTML-file + fflush(fp); + // Copy STDOUT + int stdout_copy = dup(1); + // Redirect STDOUT + dup2(fileno(fp), 1); + + // Python Pygments script for syntax highlighting. + FILE *child = popen("/usr/local/share/stagit/highlight.py", "w"); + if (child == NULL) { + printf("child is null: %s", strerror(errno)); + exit(1); + } + // Give filename through STDIN: + fprintf(child, "%s\n", filename); + // Give code to highlight through STDIN: + int lc; + size_t i; + for (i = 0; *s && i < len; s++, i++) { + if (*s == '\n') lc++; + fprintf(child, "%c", *s); + } + + pclose(child); + fflush(stdout); + // Give back STDOUT. + dup2(stdout_copy, 1); + return lc; } int -writeblobhtml(FILE *fp, const git_blob *blob) +writeblobhtml(const char *filename, FILE *fp, const git_blob *blob) { - off_t i; - size_t n = 0; - char *nfmt = "%d\n"; + int lc = 0; const char *s = git_blob_rawcontent(blob); git_off_t len = git_blob_rawsize(blob); - fputs("
\n", fp);
-
-	if (len) {
-		n++;
-		fprintf(fp, nfmt, n, n, n);
-		for (i = 0; i < len - 1; i++) {
-			if (s[i] == '\n') {
-				n++;
-				fprintf(fp, nfmt, n, n, n);
-			}
-		}
+	if (len > 0) {
+		lc = call_py(filename, fp, s, len);
 	}
 
-	fputs("
\n", fp);
-	xmlencode(fp, s, (size_t)len);
-	fputs("
\n", fp); - - return n; + return lc; } void @@ -332,42 +499,92 @@ printshowfile(FILE *fp, struct commitinfo *ci) const git_diff_hunk *hunk; const git_diff_line *line; git_patch *patch; - git_buf statsbuf; - size_t ndeltas, nhunks, nhunklines; - size_t i, j, k; + size_t nhunks, nhunklines, changed, add, del, total, i, j, k; + char linestr[80]; + int c; printcommit(fp, ci); - memset(&statsbuf, 0, sizeof(statsbuf)); + if (!ci->deltas) + return; + + 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 */ - if (ci->stats && - !git_diff_stats_to_buf(&statsbuf, ci->stats, - GIT_DIFF_STATS_FULL | GIT_DIFF_STATS_SHORT, 80)) { - if (statsbuf.ptr && statsbuf.ptr[0]) { - fputs("Diffstat:\n", fp); - xmlencode(fp, statsbuf.ptr, strlen(statsbuf.ptr)); + fputs("Diffstat:\n", fp); + 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; + } + if (c == ' ') + fprintf(fp, "\n", fp); } + fprintf(fp, "
%c", c); + else + fprintf(fp, "
%c", c, c); + + fprintf(fp, "", i); + 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)); } + + add = ci->deltas[i]->addcount; + del = ci->deltas[i]->delcount; + changed = add + del; + total = sizeof(linestr) - 2; + if (changed > total) { + if (add) + add = ((float)total / changed * add) + 1; + if (del) + del = ((float)total / changed * del) + 1; + } + memset(&linestr, '+', add); + memset(&linestr[add], '-', del); + + fprintf(fp, " | %zu", + ci->deltas[i]->addcount + ci->deltas[i]->delcount); + fwrite(&linestr, 1, add, fp); + fputs("", fp); + fwrite(&linestr[add], 1, del, fp); + fputs("
%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("
", fp);
 
-	ndeltas = git_diff_num_deltas(ci->diff);
-	for (i = 0; i < ndeltas; i++) {
-		if (git_patch_from_diff(&patch, ci->diff, i)) {
-			git_patch_free(patch);
-			break;
-		}
-
+	for (i = 0; i < ci->ndeltas; i++) {
+		patch = ci->deltas[i]->patch;
 		delta = git_patch_get_delta(patch);
-		fprintf(fp, "diff --git a/%s b/%s\n",
-			relpath, delta->old_file.path, delta->old_file.path,
-			relpath, delta->new_file.path, delta->new_file.path);
+		fprintf(fp, "diff --git a/old_file.path, strlen(delta->old_file.path));
+		fputs(".html\">", fp);
+		xmlencode(fp, delta->old_file.path, strlen(delta->old_file.path));
+		fprintf(fp, " b/new_file.path, strlen(delta->new_file.path));
+		fprintf(fp, ".html\">");
+		xmlencode(fp, delta->new_file.path, strlen(delta->new_file.path));
+		fprintf(fp, "\n");
 
 		/* check binary data */
 		if (delta->flags & GIT_DIFF_FLAG_BINARY) {
-			fputs("Binary files differ\n", fp);
-			git_patch_free(patch);
+			fputs("Binary files differ.\n", fp);
 			continue;
 		}
 
@@ -396,11 +613,31 @@ printshowfile(FILE *fp, struct commitinfo *ci)
 					fputs("", fp);
 			}
 		}
-		git_patch_free(patch);
 	}
-	git_buf_free(&statsbuf);
+}
 
-	return;
+void
+writelogline(FILE *fp, struct commitinfo *ci)
+{
+	fputs("", fp);
+	if (ci->author)
+		printtimeshort(fp, &(ci->author->when));
+	fputs("", fp);
+	if (ci->summary) {
+		fprintf(fp, "", relpath, ci->oid);
+		xmlencode(fp, ci->summary, strlen(ci->summary));
+		fputs("", fp);
+	}
+	fputs("", fp);
+	if (ci->author)
+		xmlencode(fp, ci->author->name, strlen(ci->author->name));
+	fputs("", fp);
+	fprintf(fp, "%zu", ci->filecount);
+	fputs("", fp);
+	fprintf(fp, "+%zu", ci->addcount);
+	fputs("", fp);
+	fprintf(fp, "-%zu", ci->delcount);
+	fputs("\n", fp);
 }
 
 int
@@ -409,59 +646,54 @@ writelog(FILE *fp, const git_oid *oid)
 	struct commitinfo *ci;
 	git_revwalk *w = NULL;
 	git_oid id;
-	size_t len;
-	char path[PATH_MAX];
+	char path[PATH_MAX], oidstr[GIT_OID_HEXSZ + 1];
 	FILE *fpfile;
 	int r;
 
 	git_revwalk_new(&w, repo);
 	git_revwalk_push(w, oid);
-	git_revwalk_sorting(w, GIT_SORT_TIME);
 	git_revwalk_simplify_first_parent(w);
 
-	fputs("\n"
-		  ""
-		  "\n\n", fp);
-
 	while (!git_revwalk_next(&id, w)) {
 		relpath = "";
 
+		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))
+			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 && !r)
+			continue;
+
 		if (!(ci = commitinfo_getbyoid(&id)))
 			break;
+		/* diffstat: for stagit HTML required for the log.html line */
+		if (commitinfo_getstats(ci) == -1)
+			goto err;
 
-		fputs(""
+				      "\n", fp);
 		}
-		fputs("\n", fp);
-
-		relpath = "../";
-
-		r = snprintf(path, sizeof(path), "commit/%s.html", ci->oid);
-		if (r == -1 || (size_t)r >= sizeof(path))
-			errx(1, "path truncated: 'commit/%s.html'", ci->oid);
+
+		if (cachefile)
+			writelogline(wcachefp, ci);
 
 		/* check if file exists if so skip it */
-		if (access(path, F_OK)) {
+		if (r) {
+			relpath = "../";
 			fpfile = efopen(path, "w");
 			writeheader(fpfile, ci->summary);
 			fputs("
", fpfile);
@@ -470,10 +702,9 @@ writelog(FILE *fp, const git_oid *oid)
 			writefooter(fpfile);
 			fclose(fpfile);
 		}
+err:
 		commitinfo_free(ci);
 	}
-	fputs("
DateCommit messageAuthorFiles+-
", fp);
-		if (ci->author)
-			printtimeshort(fp, &(ci->author->when));
-		fputs("", fp);
-		if (ci->summary) {
-			fprintf(fp, "", relpath, ci->oid);
-			if ((len = strlen(ci->summary)) > summarylen) {
-				xmlencode(fp, ci->summary, summarylen - 1);
-				fputs("…", fp);
-			} else {
-				xmlencode(fp, ci->summary, len);
-			}
-			fputs("", fp);
+		if (nlogcommits < 0) {
+			writelogline(fp, ci);
+		} else if (nlogcommits > 0) {
+			writelogline(fp, ci);
+			nlogcommits--;
+			if (!nlogcommits && ci->parentoid[0])
+				fputs("
"
+				      "More commits remaining [...]
", fp);
-		if (ci->author)
-			xmlencode(fp, ci->author->name, strlen(ci->author->name));
-		fputs("", fp);
-		fprintf(fp, "%zu", ci->filecount);
-		fputs("", fp);
-		fprintf(fp, "+%zu", ci->addcount);
-		fputs("", fp);
-		fprintf(fp, "-%zu", ci->delcount);
-		fputs("
", fp);
-
 	git_revwalk_free(w);
 
 	relpath = "";
@@ -488,8 +719,13 @@ printcommitatom(FILE *fp, struct commitinfo *ci)
 
 	fprintf(fp, "%s\n", ci->oid);
 	if (ci->author) {
-		fputs("", fp);
+		fputs("", fp);
 		printtimez(fp, &(ci->author->when));
+		fputs("\n", fp);
+	}
+	if (ci->committer) {
+		fputs("", fp);
+		printtimez(fp, &(ci->committer->when));
 		fputs("\n", fp);
 	}
 	if (ci->summary) {
@@ -497,11 +733,11 @@ printcommitatom(FILE *fp, struct commitinfo *ci)
 		xmlencode(fp, ci->summary, strlen(ci->summary));
 		fputs("\n", fp);
 	}
-	fprintf(fp, "",
+	fprintf(fp, "\n",
 	        ci->oid);
 
 	if (ci->author) {
-		fputs("", fp);
+		fputs("\n", fp);
 		xmlencode(fp, ci->author->name, strlen(ci->author->name));
 		fputs("\n", fp);
 		xmlencode(fp, ci->author->email, strlen(ci->author->email));
@@ -525,9 +761,7 @@ printcommitatom(FILE *fp, struct commitinfo *ci)
 		fputc('\n', fp);
 		xmlencode(fp, ci->msg, strlen(ci->msg));
 	}
-	fputs("\n\n", fp);
-
-	fputs("\n", fp);
+	fputs("\n\n\n", fp);
 }
 
 int
@@ -536,18 +770,17 @@ writeatom(FILE *fp)
 	struct commitinfo *ci;
 	git_revwalk *w = NULL;
 	git_oid id;
-	size_t i, m = 100; /* max */
+	size_t i, m = 100; /* last 'm' commits */
 
 	fputs("\n"
 	      "\n", fp);
-	xmlencode(fp, stripped_name, strlen(stripped_name));
+	xmlencode(fp, strippedname, strlen(strippedname));
 	fputs(", branch HEAD\n", fp);
 	xmlencode(fp, description, strlen(description));
 	fputs("\n", fp);
 
 	git_revwalk_new(&w, repo);
 	git_revwalk_push_head(w);
-	git_revwalk_sorting(w, GIT_SORT_TIME);
 	git_revwalk_simplify_first_parent(w);
 
 	for (i = 0; i < m && !git_revwalk_next(&id, w); i++) {
@@ -558,7 +791,7 @@ writeatom(FILE *fp)
 	}
 	git_revwalk_free(w);
 
-	fputs("", fp);
+	fputs("\n", fp);
 
 	return 0;
 }
@@ -566,24 +799,21 @@ writeatom(FILE *fp)
 int
 writeblob(git_object *obj, const char *fpath, const char *filename, git_off_t filesize)
 {
-	char tmp[PATH_MAX] = "";
-	char *d;
+	char tmp[PATH_MAX] = "", *d;
 	const char *p;
 	int lc = 0;
 	FILE *fp;
 
-	d = xdirname(fpath);
-	if (mkdirp(d)) {
-		free(d);
+	if (strlcpy(tmp, fpath, sizeof(tmp)) >= sizeof(tmp))
+		errx(1, "path truncated: '%s'", fpath);
+	if (!(d = dirname(tmp)))
+		err(1, "dirname");
+	if (mkdirp(d))
 		return -1;
-	}
-	free(d);
 
-	p = fpath;
-	while (*p) {
+	for (p = fpath, tmp[0] = '\0'; *p; p++) {
 		if (*p == '/' && strlcat(tmp, "../", sizeof(tmp)) >= sizeof(tmp))
 			errx(1, "path truncated: '../%s'", tmp);
-		p++;
 	}
 	relpath = tmp;
 
@@ -595,9 +825,9 @@ writeblob(git_object *obj, const char *fpath, const char *filename, git_off_t fi
 	fputs("
", fp);
 
 	if (git_blob_is_binary((git_blob *)obj)) {
-		fputs("
Binary file
\n", fp);
+		fputs("
Binary file.
\n", fp);
 	} else {
-		lc = writeblobhtml(fp, (git_blob *)obj);
+		lc = writeblobhtml(filename, fp, (git_blob *)obj);
 		if (ferror(fp))
 			err(1, "fwrite");
 	}
@@ -652,14 +882,14 @@ filemode(git_filemode_t m)
 }
 
 int
-writefilestree(FILE *fp, git_tree *tree, const char *branch, const char *path)
+writefilestree(FILE *fp, git_tree *tree, const char *path)
 {
 	const git_tree_entry *entry = NULL;
 	git_submodule *module = NULL;
-	const char *entryname;
-	char filepath[PATH_MAX], entrypath[PATH_MAX];
 	git_object *obj = NULL;
 	git_off_t filesize;
+	const char *entryname;
+	char filepath[PATH_MAX], entrypath[PATH_MAX];
 	size_t count, i;
 	int lc, r, ret;
 
@@ -668,17 +898,12 @@ writefilestree(FILE *fp, git_tree *tree, const char *branch, const char *path)
 		if (!(entry = git_tree_entry_byindex(tree, i)) ||
 		    !(entryname = git_tree_entry_name(entry)))
 			return -1;
-		r = snprintf(entrypath, sizeof(entrypath), "%s%s%s",
-			 path, path[0] ? "/" : "", entryname);
-		if (r == -1 || (size_t)r >= sizeof(entrypath))
-			errx(1, "path truncated: '%s%s%s'",
-			        path, path[0] ? "/" : "", entryname);
-
-		r = snprintf(filepath, sizeof(filepath), "file/%s%s%s.html",
-		         path, path[0] ? "/" : "", entryname);
-		if (r == -1 || (size_t)r >= sizeof(filepath))
-			errx(1, "path truncated: 'file/%s%s%s.html'",
-			        path, path[0] ? "/" : "", entryname);
+		joinpath(entrypath, sizeof(entrypath), path, entryname);
+
+		r = snprintf(filepath, sizeof(filepath), "file/%s.html",
+		         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)) {
 			switch (git_object_type(obj)) {
@@ -686,7 +911,7 @@ writefilestree(FILE *fp, git_tree *tree, const char *branch, const char *path)
 				break;
 			case GIT_OBJ_TREE:
 				/* NOTE: recurses */
-				ret = writefilestree(fp, (git_tree *)obj, branch,
+				ret = writefilestree(fp, (git_tree *)obj,
 				                     entrypath);
 				git_object_free(obj);
 				if (ret)
@@ -702,20 +927,23 @@ writefilestree(FILE *fp, git_tree *tree, const char *branch, const char *path)
 
 			fputs("", fp);
 			fputs(filemode(git_tree_entry_filemode(entry)), fp);
-			fprintf(fp, "", relpath, filepath);
+			fprintf(fp, "", fp);
 			xmlencode(fp, entrypath, strlen(entrypath));
-			fputs("", fp);
-			if (showlinecount && lc > 0)
+			fputs("", fp);
+			if (lc > 0)
 				fprintf(fp, "%dL", lc);
 			else
 				fprintf(fp, "%juB", (uintmax_t)filesize);
 			fputs("\n", fp);
+			git_object_free(obj);
 		} else if (!git_submodule_lookup(&module, repo, entryname)) {
-			fprintf(fp, "m------",
+			fprintf(fp, "m---------",
 				relpath);
 			xmlencode(fp, entrypath, strlen(entrypath));
 			git_submodule_free(module);
-			fputs("\n", fp);
+			fputs("\n", fp);
 		}
 	}
 
@@ -723,22 +951,21 @@ writefilestree(FILE *fp, git_tree *tree, const char *branch, const char *path)
 }
 
 int
-writefiles(FILE *fp, const git_oid *id, const char *branch)
+writefiles(FILE *fp, const git_oid *id)
 {
 	git_tree *tree = NULL;
 	git_commit *commit = NULL;
 	int ret = -1;
 
 	fputs("\n"
-	      ""
+	      ""
+	      ""
 	      "\n\n", fp);
 
-	if (git_commit_lookup(&commit, repo, id) ||
-	    git_commit_tree(&tree, commit))
-		goto err;
-	ret = writefilestree(fp, tree, branch, "");
+	if (!git_commit_lookup(&commit, repo, id) &&
+	    !git_commit_tree(&tree, commit))
+		ret = writefilestree(fp, tree, "");
 
-err:
 	fputs("
ModeNameSizeModeNameSize
", fp);
 
 	git_commit_free(commit);
@@ -752,13 +979,10 @@ refs_cmp(const void *v1, const void *v2)
 {
 	git_reference *r1 = (*(git_reference **)v1);
 	git_reference *r2 = (*(git_reference **)v2);
-	int t1, t2;
-
-	t1 = git_reference_is_branch(r1);
-	t2 = git_reference_is_branch(r2);
+	int r;
 
-	if (t1 != t2)
-		return t1 - t2;
+	if ((r = git_reference_is_branch(r1) - git_reference_is_branch(r2)))
+		return r;
 
 	return strcmp(git_reference_shorthand(r1),
 	              git_reference_shorthand(r2));
@@ -773,7 +997,7 @@ writerefs(FILE *fp)
 	git_reference *dref = NULL, *r, *ref = NULL;
 	git_reference_iterator *it = NULL;
 	git_reference **refs = NULL;
-	size_t count, i, j, refcount = 0;
+	size_t count, i, j, refcount;
 	const char *titles[] = { "Branches", "Tags" };
 	const char *ids[] = { "branches", "tags" };
 	const char *name;
@@ -809,9 +1033,8 @@ writerefs(FILE *fp)
 			default:
 				continue;
 			}
-			if (!(id = git_reference_target(r)))
-				goto err;
-			if (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)))
 				goto err;
@@ -820,9 +1043,12 @@ writerefs(FILE *fp)
 
 			/* print header if it has an entry (first). */
 			if (++count == 1) {
-				fprintf(fp, "
%s
\n"
-				      "\n\n\n",
-				      titles[j], ids[j]);
+				fprintf(fp, "
%s
NameLast commit dateAuthor
"
+			                "\n"
+				        ""
+				        "\n\n"
+				        "\n",
+				         titles[j], ids[j]);
 			}
 
 			relpath = "";
@@ -862,37 +1088,78 @@ err:
 	return 0;
 }
 
+void
+usage(char *argv0)
+{
+	fprintf(stderr, "%s [-c cachefile | -l commits] repodir\n", argv0);
+	exit(1);
+}
+
 int
 main(int argc, char *argv[])
 {
 	git_object *obj = NULL;
 	const git_oid *head = NULL;
-	const git_error *e = NULL;
+	mode_t mask;
 	FILE *fp, *fpread;
 	char path[PATH_MAX], repodirabs[PATH_MAX + 1], *p;
-	int r, status;
-
-	if (argc != 2) {
-		fprintf(stderr, "%s \n", argv[0]);
-		return 1;
+	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)
+				usage(argv[0]);
+			cachefile = argv[++i];
+		} 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)
+				usage(argv[0]);
+		}
 	}
-	repodir = argv[1];
+	if (!repodir)
+		usage(argv[0]);
+
 	if (!realpath(repodir, repodirabs))
 		err(1, "realpath");
 
 	git_libgit2_init();
 
-	if ((status = git_repository_open_ext(&repo, repodir,
-		GIT_REPOSITORY_OPEN_NO_SEARCH, NULL)) < 0) {
-		e = giterr_last();
-		fprintf(stderr, "%s: %s\n", argv[0], e->message);
-		return status;
+#ifdef __OpenBSD__
+	if (unveil(repodir, "r") == -1)
+		err(1, "unveil: %s", repodir);
+	if (unveil(".", "rwc") == -1)
+		err(1, "unveil: .");
+	if (cachefile && unveil(cachefile, "rwc") == -1)
+		err(1, "unveil: %s", cachefile);
+
+	if (cachefile) {
+		if (pledge("stdio rpath wpath cpath fattr", NULL) == -1)
+			err(1, "pledge");
+	} else {
+		if (pledge("stdio rpath wpath cpath", NULL) == -1)
+			err(1, "pledge");
 	}
+#endif
 
-	/* find HEAD */
-	if (git_revparse_single(&obj, repo, "HEAD"))
+	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;
-	head = git_object_id(obj);
+	}
+
+	/* find HEAD */
+	if (!git_revparse_single(&obj, repo, "HEAD"))
+		head = git_object_id(obj);
 	git_object_free(obj);
 
 	/* use directory name as name */
@@ -901,25 +1168,24 @@ main(int argc, char *argv[])
 	else
 		name = "";
 
+	/* copy css */
+	char cwd[PATH_MAX];
+	strcpy(cwd, getcwd(cwd, sizeof(cwd)));
+	cp("/usr/local/share/stagit/syntax.css", strcat(cwd, "/syntax.css"));
+	strcpy(cwd, getcwd(cwd, sizeof(cwd)));
+	cp("/usr/local/share/stagit/style.min.css", strcat(cwd, "/style.min.css"));
+
 	/* strip .git suffix */
-	if (!(stripped_name = strdup(name)))
+	if (!(strippedname = strdup(name)))
 		err(1, "strdup");
-	if ((p = strrchr(stripped_name, '.')))
+	if ((p = strrchr(strippedname, '.')))
 		if (!strcmp(p, ".git"))
 			*p = '\0';
 
 	/* read description or .git/description */
-	r = snprintf(path, sizeof(path), "%s%s%s",
-		repodir, repodir[strlen(repodir)] == '/' ? "" : "/", "description");
-	if (r == -1 || (size_t)r >= sizeof(path))
-		errx(1, "path truncated: '%s%s%s'",
-	                repodir, repodir[strlen(repodir)] == '/' ? "" : "/", "description");
+	joinpath(path, sizeof(path), repodir, "description");
 	if (!(fpread = fopen(path, "r"))) {
-		r = snprintf(path, sizeof(path), "%s%s%s",
-			repodir, repodir[strlen(repodir)] == '/' ? "" : "/", ".git/description");
-		if (r == -1 || (size_t)r >= sizeof(path))
-			errx(1, "path truncated: '%s%s%s'",
-		                repodir, repodir[strlen(repodir)] == '/' ? "" : "/", ".git/description");
+		joinpath(path, sizeof(path), repodir, ".git/description");
 		fpread = fopen(path, "r");
 	}
 	if (fpread) {
@@ -929,17 +1195,9 @@ main(int argc, char *argv[])
 	}
 
 	/* read url or .git/url */
-	r = snprintf(path, sizeof(path), "%s%s%s",
-		repodir, repodir[strlen(repodir)] == '/' ? "" : "/", "url");
-	if (r == -1 || (size_t)r >= sizeof(path))
-		errx(1, "path truncated: '%s%s%s'",
-		        repodir, repodir[strlen(repodir)] == '/' ? "" : "/", "url");
+	joinpath(path, sizeof(path), repodir, "url");
 	if (!(fpread = fopen(path, "r"))) {
-		r = snprintf(path, sizeof(path), "%s%s%s",
-			repodir, repodir[strlen(repodir)] == '/' ? "" : "/", ".git/url");
-		if (r == -1 || (size_t)r >= sizeof(path))
-			errx(1, "path truncated: '%s%s%s'",
-			        repodir, repodir[strlen(repodir)] == '/' ? "" : "/", ".git/url");
+		joinpath(path, sizeof(path), repodir, ".git/url");
 		fpread = fopen(path, "r");
 	}
 	if (fpread) {
@@ -950,27 +1208,84 @@ main(int argc, char *argv[])
 	}
 
 	/* check LICENSE */
-	haslicense = !git_revparse_single(&obj, repo, "HEAD:LICENSE");
-	git_object_free(obj);
+	for (i = 0; i < sizeof(licensefiles) / sizeof(*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 */
-	hasreadme = !git_revparse_single(&obj, repo, "HEAD:README");
-	git_object_free(obj);
-	hassubmodules = !git_revparse_single(&obj, repo, "HEAD:.gitmodules");
+	for (i = 0; i < sizeof(readmefiles) / sizeof(*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)
+		submodules = ".gitmodules";
 	git_object_free(obj);
 
 	/* log for HEAD */
 	fp = efopen("log.html", "w");
 	relpath = "";
+	mkdir("commit", S_IRWXU | S_IRWXG | S_IRWXO);
 	writeheader(fp, "Log");
-	mkdir("commit", 0755);
-	writelog(fp, head);
+	fputs("
NameLast commit dateAuthor
\n"
+	      ""
+	      ""
+	      ""
+	      "\n\n", fp);
+
+	if (cachefile && head) {
+		/* read from cache file (does not need to exist) */
+		if ((rcachefp = fopen(cachefile, "r"))) {
+			if (!fgets(lastoidstr, sizeof(lastoidstr), rcachefp))
+				errx(1, "%s: no object id", cachefile);
+			if (git_oid_fromstr(&lastoid, lastoidstr))
+				errx(1, "%s: invalid object id", cachefile);
+		}
+
+		/* write log to (temporary) cache */
+		if ((fd = mkstemp(tmppath)) == -1)
+			err(1, "mkstemp");
+		if (!(wcachefp = fdopen(fd, "w")))
+			err(1, "fdopen: '%s'", tmppath);
+		/* write last commit id (HEAD) */
+		git_oid_tostr(buf, sizeof(buf), head);
+		fprintf(wcachefp, "%s\n", buf);
+
+		writelog(fp, head);
+
+		if (rcachefp) {
+			/* append previous log to log.html and the new cache */
+			while (!feof(rcachefp)) {
+				n = fread(buf, 1, sizeof(buf), rcachefp);
+				if (ferror(rcachefp))
+					err(1, "fread");
+				if (fwrite(buf, 1, n, fp) != n ||
+				    fwrite(buf, 1, n, wcachefp) != n)
+					err(1, "fwrite");
+			}
+			fclose(rcachefp);
+		}
+		fclose(wcachefp);
+	} else {
+		if (head)
+			writelog(fp, head);
+	}
+
+	fputs("
DateCommitAuthorFiles+-
", fp);
 	writefooter(fp);
 	fclose(fp);
 
 	/* files for HEAD */
 	fp = efopen("files.html", "w");
 	writeheader(fp, "Files");
-	writefiles(fp, head, "HEAD");
+	if (head)
+		writefiles(fp, head);
 	writefooter(fp);
 	fclose(fp);
 
@@ -986,6 +1301,16 @@ main(int argc, char *argv[])
 	writeatom(fp);
 	fclose(fp);
 
+	/* rename new cache file on success */
+	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))
+			err(1, "chmod: '%s'", cachefile);
+	}
+
 	/* cleanup */
 	git_repository_free(repo);
 	git_libgit2_shutdown();