X-Git-Url: https://git.armaanb.net/?a=blobdiff_plain;f=stagit.c;h=9a8ccd0245b1e55af35fad1dd86f3477ec779e22;hb=503398bd5f325447f7d801306222e5fc142cacae;hp=61804af1623d0a7e8ac6819495bdfdcfbcc3803c;hpb=f63edd593dfcaa84b30958d845fa85eaffc664b0;p=stagit.git diff --git a/stagit.c b/stagit.c index 61804af..9a8ccd0 100644 --- a/stagit.c +++ b/stagit.c @@ -1,13 +1,15 @@ #include +#include #include #include -#include #include #include +#include #include #include #include +#include #include #include @@ -46,36 +48,28 @@ struct commitinfo { size_t ndeltas; }; -/* summary length (bytes) in the log */ -static const unsigned summarylen = 70; -/* display line count or file size in file tree index */ -static const int showlinecount = 1; - static git_repository *repo; static const char *relpath = ""; static const char *repodir; static char *name = ""; -static char *strippedname; +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 char lastoidstr[GIT_OID_HEXSZ + 2]; /* id + newline + NUL byte */ static FILE *rcachefp, *wcachefp; static const char *cachefile; -#ifndef USE_PLEDGE -int -pledge(const char *promises, const char *paths[]) -{ - return 0; -} -#endif - void joinpath(char *buf, size_t bufsiz, const char *path, const char *path2) { @@ -83,7 +77,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); } @@ -94,7 +88,7 @@ deltainfo_free(struct deltainfo *di) if (!di) return; git_patch_free(di->patch); - di->patch = NULL; + memset(di, 0, sizeof(*di)); free(di); } @@ -102,6 +96,8 @@ 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; @@ -109,23 +105,46 @@ commitinfo_getstats(struct commitinfo *ci) 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"); - if (git_patch_from_diff(&patch, ci->diff, i)) { - git_patch_free(patch); - goto err; - } di->patch = patch; ci->deltas[i] = di; delta = git_patch_get_delta(patch); - /* check binary data */ + /* skip stats for binary data */ if (delta->flags & GIT_DIFF_FLAG_BINARY) continue; @@ -152,6 +171,15 @@ commitinfo_getstats(struct commitinfo *ci) 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]); @@ -175,19 +203,21 @@ commitinfo_free(struct commitinfo *ci) if (ci->deltas) for (i = 0; i < ci->ndeltas; i++) deltainfo_free(ci->deltas[i]); + free(ci->deltas); - ci->deltas = NULL; 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; if (!(ci = calloc(1, sizeof(struct commitinfo)))) err(1, "calloc"); @@ -204,27 +234,10 @@ commitinfo_getbyoid(const git_oid *id) ci->summary = git_commit_summary(ci->commit); ci->msg = git_commit_message(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))) { - ci->parent = NULL; - ci->parent_tree = NULL; - } - } - - git_diff_init_options(&opts, GIT_DIFF_OPTIONS_VERSION); - opts.flags |= GIT_DIFF_DISABLE_PATHSPEC_MATCH; - if (git_diff_tree_to_tree(&(ci->diff), repo, ci->parent_tree, ci->commit_tree, &opts)) - goto err; - if (commitinfo_getstats(ci) == -1) - goto err; - return ci; err: commitinfo_free(ci); - free(ci); return NULL; } @@ -235,7 +248,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; } @@ -250,7 +263,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); @@ -302,7 +315,7 @@ printtime(FILE *fp, const git_time *intime) t = (time_t)intime->time + (intime->offset * 60); if (!(intm = gmtime(&t))) return; - strftime(out, sizeof(out), "%a %b %e %H:%M:%S", intm); + 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); @@ -329,9 +342,10 @@ 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] && strippedname[0]) fputs(" - ", fp); @@ -352,22 +366,25 @@ writeheader(FILE *fp, const char *title) 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); + fputs("<tr class=\"url\"><td></td><td><span class=\"clone\">git clone <a href=\"", fp); xmlencode(fp, cloneurl, strlen(cloneurl)); fputs("\">", fp); xmlencode(fp, cloneurl, strlen(cloneurl)); - fputs("</a></td></tr>", fp); + fputs("</a></span></td></tr>", 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 (hassubmodules) - fprintf(fp, " | <a href=\"%sfile/.gitmodules.html\">Submodules</a>", relpath); - if (hasreadme) - fprintf(fp, " | <a href=\"%sfile/README.html\">README</a>", relpath); - if (haslicense) - fprintf(fp, " | <a href=\"%sfile/LICENSE.html\">LICENSE</a>", relpath); + 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) + fprintf(fp, " | <a href=\"%sfile/%s.html\">LICENSE</a>", + relpath, license); fputs("</td></tr></table>\n<hr/>\n<div id=\"content\">\n", fp); } @@ -378,32 +395,51 @@ writefooter(FILE *fp) } int -writeblobhtml(FILE *fp, const git_blob *blob) +syntax_highlight(const char *filename, FILE *fp, const char *s, size_t len) +{ + // Copy STDOUT + int stdout_copy = dup(1); + // Redirect STDOUT + dup2(fileno(fp), 1); + + // Ruby script for syntax highlighting. + FILE *child = popen("./highlight", "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); + // Give back STDOUT. + dup2(stdout_copy, 1); + return lc; +} + +int +writeblobhtml(const char *filename, FILE *fp, const git_blob *blob) { - off_t i; - size_t n = 0; - char *nfmt = "<a href=\"#l%d\" id=\"l%d\">%d</a>\n"; + int lc = 0; const char *s = git_blob_rawcontent(blob); git_off_t len = git_blob_rawsize(blob); - fputs("<table id=\"blob\"><tr><td class=\"num\"><pre>\n", fp); + fputs("<div id=\"blob\">\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 = syntax_highlight(filename, fp, s, len); } - fputs("</pre></td><td><pre>\n", fp); - xmlencode(fp, s, (size_t)len); - fputs("</pre></td></tr></table>\n", fp); + fputs("</div>\n", fp); - return n; + return lc; } void @@ -443,6 +479,7 @@ printshowfile(FILE *fp, struct commitinfo *ci) git_patch *patch; size_t nhunks, nhunklines, changed, add, del, total, i, j, k; char linestr[80]; + int c; printcommit(fp, ci); @@ -453,7 +490,7 @@ printshowfile(FILE *fp, struct commitinfo *ci) ci->ndeltas > 1000 || ci->addcount > 100000 || ci->delcount > 100000) { - fprintf(fp, "(diff is too large, output suppressed)"); + fputs("Diff is too large, output suppressed.\n", fp); return; } @@ -461,7 +498,22 @@ printshowfile(FILE *fp, struct commitinfo *ci) fputs("<b>Diffstat:</b>\n<table>", fp); for (i = 0; i < ci->ndeltas; i++) { delta = git_patch_get_delta(ci->deltas[i]->patch); - fprintf(fp, "<tr><td><a href=\"#h%zu\">", i); + + 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, "<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)) { fputs(" -> ", fp); @@ -488,7 +540,7 @@ printshowfile(FILE *fp, struct commitinfo *ci) fwrite(&linestr[add], 1, del, fp); fputs("</span></td></tr>\n", fp); } - fprintf(fp, "</table>%zu file%s changed, %zu insertion%s(+), %zu deletion%s(-)\n", + 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"); @@ -498,13 +550,19 @@ printshowfile(FILE *fp, struct commitinfo *ci) 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/%s.html\">%s</a> b/<a href=\"%sfile/%s.html\">%s</a></b>\n", - i, relpath, delta->old_file.path, delta->old_file.path, - relpath, delta->new_file.path, delta->new_file.path); + fprintf(fp, "<b>diff --git a/<a id=\"h%zu\" href=\"%sfile/", i, relpath); + xmlencode(fp, delta->old_file.path, strlen(delta->old_file.path)); + fputs(".html\">", fp); + xmlencode(fp, delta->old_file.path, strlen(delta->old_file.path)); + fprintf(fp, "</a> b/<a href=\"%sfile/", relpath); + xmlencode(fp, delta->new_file.path, strlen(delta->new_file.path)); + fprintf(fp, ".html\">"); + 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) { - fputs("Binary files differ\n", fp); + fputs("Binary files differ.\n", fp); continue; } @@ -539,30 +597,23 @@ printshowfile(FILE *fp, struct commitinfo *ci) void writelogline(FILE *fp, struct commitinfo *ci) { - size_t len; - fputs("<tr><td>", fp); if (ci->author) printtimeshort(fp, &(ci->author->when)); fputs("</td><td>", fp); if (ci->summary) { fprintf(fp, "<a href=\"%scommit/%s.html\">", relpath, ci->oid); - if ((len = strlen(ci->summary)) > summarylen) { - xmlencode(fp, ci->summary, summarylen - 1); - fputs("…", fp); - } else { - xmlencode(fp, ci->summary, len); - } + xmlencode(fp, ci->summary, strlen(ci->summary)); fputs("</a>", fp); } fputs("</td><td>", fp); if (ci->author) xmlencode(fp, ci->author->name, strlen(ci->author->name)); - fputs("</td><td class=\"num\">", fp); + fputs("</td><td class=\"num\" align=\"right\">", fp); fprintf(fp, "%zu", ci->filecount); - fputs("</td><td class=\"num\">", fp); + fputs("</td><td class=\"num\" align=\"right\">", fp); fprintf(fp, "+%zu", ci->addcount); - fputs("</td><td class=\"num\">", fp); + fputs("</td><td class=\"num\" align=\"right\">", fp); fprintf(fp, "-%zu", ci->delcount); fputs("</td></tr>\n", fp); } @@ -573,13 +624,12 @@ writelog(FILE *fp, const git_oid *oid) struct commitinfo *ci; git_revwalk *w = NULL; git_oid id; - 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); while (!git_revwalk_next(&id, w)) { @@ -587,21 +637,41 @@ writelog(FILE *fp, const git_oid *oid) 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; + + if (nlogcommits < 0) { + writelogline(fp, ci); + } else if (nlogcommits > 0) { + writelogline(fp, ci); + nlogcommits--; + if (!nlogcommits && ci->parentoid[0]) + fputs("<tr><td></td><td colspan=\"5\">" + "More commits remaining [...]</td>" + "</tr>\n", fp); + } - writelogline(fp, ci); if (cachefile) writelogline(wcachefp, ci); - 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); - /* 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("<pre>", fpfile); @@ -610,6 +680,7 @@ writelog(FILE *fp, const git_oid *oid) writefooter(fpfile); fclose(fpfile); } +err: commitinfo_free(ci); } git_revwalk_free(w); @@ -640,11 +711,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)); @@ -688,7 +759,6 @@ writeatom(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); for (i = 0; i < m && !git_revwalk_next(&id, w); i++) { @@ -699,7 +769,7 @@ writeatom(FILE *fp) } git_revwalk_free(w); - fputs("", fp); + fputs("\n", fp); return 0; } @@ -733,9 +803,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(fpath, fp, (git_blob *)obj); if (ferror(fp)) err(1, "fwrite"); } @@ -790,7 +860,7 @@ 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; @@ -810,7 +880,7 @@ writefilestree(FILE *fp, git_tree *tree, const char *branch, const char *path) r = snprintf(filepath, sizeof(filepath), "file/%s.html", entrypath); - if (r == -1 || (size_t)r >= sizeof(filepath)) + 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)) { @@ -819,7 +889,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) @@ -835,20 +905,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---------", relpath); xmlencode(fp, entrypath, strlen(entrypath)); git_submodule_free(module); - fputs("\n", fp); + fputs("\n", fp); } } @@ -856,22 +929,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); @@ -885,13 +957,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)); @@ -942,9 +1011,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; @@ -953,9 +1021,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 = ""; @@ -998,7 +1069,7 @@ err: void usage(char *argv0) { - fprintf(stderr, "%s [-c cachefile] repodir\n", argv0); + fprintf(stderr, "%s [-c cachefile | -l commits] repodir\n", argv0); exit(1); } @@ -1007,25 +1078,30 @@ 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; char tmppath[64] = "cache.XXXXXXXXXXXX", buf[BUFSIZ]; size_t n; int i, fd; - if (pledge("stdio rpath wpath cpath", NULL) == -1) - err(1, "pledge"); - 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 (i + 1 >= argc) + 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]); } } if (!repodir) @@ -1036,17 +1112,32 @@ main(int argc, char *argv[]) git_libgit2_init(); +#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 + if (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); + fprintf(stderr, "%s: cannot open repository\n", argv[0]); return 1; } /* find HEAD */ - if (git_revparse_single(&obj, repo, "HEAD")) - return 1; - head = git_object_id(obj); + if (!git_revparse_single(&obj, repo, "HEAD")) + head = git_object_id(obj); git_object_free(obj); /* use directory name as name */ @@ -1088,24 +1179,38 @@ 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", 0755); + mkdir("commit", S_IRWXU | S_IRWXG | S_IRWXO); writeheader(fp, "Log"); - fputs("
NameLast commit dateAuthor
\n" - "" - "\n\n", fp); + fputs("
DateCommit messageAuthorFiles+-
\n" + "" + "" + "" + "\n\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)) @@ -1118,7 +1223,7 @@ main(int argc, char *argv[]) if ((fd = mkstemp(tmppath)) == -1) err(1, "mkstemp"); if (!(wcachefp = fdopen(fd, "w"))) - err(1, "fdopen"); + err(1, "fdopen: '%s'", tmppath); /* write last commit id (HEAD) */ git_oid_tostr(buf, sizeof(buf), head); fprintf(wcachefp, "%s\n", buf); @@ -1139,7 +1244,8 @@ main(int argc, char *argv[]) } fclose(wcachefp); } else { - writelog(fp, head); + if (head) + writelog(fp, head); } fputs("
DateCommitAuthorFiles+-
", fp); @@ -1149,7 +1255,8 @@ main(int argc, char *argv[]) /* files for HEAD */ fp = efopen("files.html", "w"); writeheader(fp, "Files"); - writefiles(fp, head, "HEAD"); + if (head) + writefiles(fp, head); writefooter(fp); fclose(fp); @@ -1166,8 +1273,14 @@ main(int argc, char *argv[]) fclose(fp); /* rename new cache file on success */ - if (cachefile && rename(tmppath, cachefile)) - err(1, "rename: '%s' to '%s'", 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)) + err(1, "chmod: '%s'", cachefile); + } /* cleanup */ git_repository_free(repo);