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;
}
#endif
+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 == -1 || (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)
{
delta = git_patch_get_delta(patch);
- /* check binary data */
+ /* skip stats for binary data */
if (delta->flags & GIT_DIFF_FLAG_BINARY)
continue;
}
}
-/* 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)
{
{
struct tm *intm;
time_t t;
- int offset, sign = '+';
char out[32];
- offset = intime->offset * 60;
- t = (time_t)intime->time + offset;
+ t = (time_t)intime->time + (intime->offset * 60);
if (!(intm = gmtime(&t)))
return;
strftime(out, sizeof(out), "%a %b %e %H:%M:%S", intm);
- if (offset < 0) {
- offset = -offset;
- sign = '-';
- }
- fprintf(fp, "%s %c%02d%02d", out, sign, offset / 60, 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);
}
void
fputs(out, fp);
}
-int
+void
writeheader(FILE *fp, const char *title)
{
fputs("<!DOCTYPE html>\n"
"<meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n"
"<meta http-equiv=\"Content-Language\" content=\"en\" />\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, "<a href=\"../%s\"><img src=\"%slogo.png\" alt=\"\" width=\"32\" height=\"32\" /></a>",
relpath, relpath);
fputs("</td><td><h1>", fp);
- xmlencode(fp, stripped_name, strlen(stripped_name));
+ xmlencode(fp, strippedname, strlen(strippedname));
fputs("</h1><span class=\"desc\">", fp);
xmlencode(fp, description, strlen(description));
fputs("</span></td></tr>", fp);
if (haslicense)
fprintf(fp, " | <a href=\"%sfile/LICENSE.html\">LICENSE</a>", relpath);
fputs("</td></tr></table>\n<hr/>\n<div id=\"content\">\n", fp);
-
- return 0;
}
-int
+void
writefooter(FILE *fp)
{
- return !fputs("</div>\n</body>\n</html>\n", fp);
+ fputs("</div>\n</body>\n</html>\n", fp);
}
int
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;
}
fputs("<b>Diffstat:</b>\n<table>", fp);
for (i = 0; i < ci->ndeltas; i++) {
delta = git_patch_get_delta(ci->deltas[i]->patch);
- fputs("<tr><td>", fp);
+ fprintf(fp, "<tr><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);
memset(&linestr, '+', add);
memset(&linestr[add], '-', del);
- fprintf(fp, "</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);
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 href=\"%sfile/%s.html\">%s</a> b/<a href=\"%sfile/%s.html\">%s</a></b>\n",
- relpath, delta->old_file.path, delta->old_file.path,
+ 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);
/* check binary data */
if (delta->flags & GIT_DIFF_FLAG_BINARY) {
- fputs("Binary files differ\n", fp);
+ fputs("Binary files differ.\n", fp);
continue;
}
fputs("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
"<feed xmlns=\"http://www.w3.org/2005/Atom\">\n<title>", fp);
- xmlencode(fp, stripped_name, strlen(stripped_name));
+ xmlencode(fp, strippedname, strlen(strippedname));
fputs(", branch HEAD</title>\n<subtitle>", fp);
xmlencode(fp, description, strlen(description));
fputs("</subtitle>\n", fp);
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;
fputs("</p><hr/>", fp);
if (git_blob_is_binary((git_blob *)obj)) {
- fputs("<p>Binary file</p>\n", fp);
+ fputs("<p>Binary file.</p>\n", fp);
} else {
lc = writeblobhtml(fp, (git_blob *)obj);
if (ferror(fp))
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);
+ joinpath(entrypath, sizeof(entrypath), path, entryname);
+
+ r = snprintf(filepath, sizeof(filepath), "file/%s.html",
+ entrypath);
if (r == -1 || (size_t)r >= sizeof(filepath))
- errx(1, "path truncated: 'file/%s%s%s.html'",
- path, path[0] ? "/" : "", entryname);
+ errx(1, "path truncated: 'file/%s.html'", entrypath);
if (!git_tree_entry_to_object(&obj, repo, entry)) {
switch (git_object_type(obj)) {
return 0;
}
-void
-joinpath(char *buf, size_t bufsiz, const char *path, const char *path2)
-{
- int r;
-
- r = snprintf(buf, bufsiz, "%s%s%s",
- repodir, path[0] && path[strlen(path) - 1] != '/' ? "/" : "", path2);
- if (r == -1 || (size_t)r >= bufsiz)
- errx(1, "path truncated: '%s%s%s'",
- path, path[0] && path[strlen(path) - 1] != '/' ? "/" : "", path2);
-}
-
void
usage(char *argv0)
{
name = "";
/* 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';
n = fread(buf, 1, sizeof(buf), rcachefp);
if (ferror(rcachefp))
err(1, "fread");
- if (fwrite(buf, 1, n, fp) != n)
- err(1, "fwrite");
- if (fwrite(buf, 1, n, wcachefp) != n)
+ if (fwrite(buf, 1, n, fp) != n ||
+ fwrite(buf, 1, n, wcachefp) != n)
err(1, "fwrite");
}
fclose(rcachefp);
projects / stagit.git / blobdiff