idetect more names for README and LICENSE - stagit-gemini - Stagit for gemini protocol Openbsd Err thinkerwim.openbsd.amsterdam 70 hgit clone git://thinkerwim.org/stagit-gemini.git URL:git://thinkerwim.org/stagit-gemini.git thinkerwim.org 70 1Log /git/stagit-gemini/log.gph thinkerwim.org 70 1Files /git/stagit-gemini/files.gph thinkerwim.org 70 1Refs /git/stagit-gemini/refs.gph thinkerwim.org 70 1README /git/stagit-gemini/file/README.gph thinkerwim.org 70 1LICENSE /git/stagit-gemini/file/LICENSE.gph thinkerwim.org 70 i--- Err thinkerwim.openbsd.amsterdam 70 1commit 4ae2a118c3f7dd0cc7e7b81289152afbada103bc /git/stagit-gemini/commit/4ae2a118c3f7dd0cc7e7b81289152afbada103bc.gph thinkerwim.org 70 1parent 3a00e5bb2bf0415338ff08d1a7bc9a47b4b751e2 /git/stagit-gemini/commit/3a00e5bb2bf0415338ff08d1a7bc9a47b4b751e2.gph thinkerwim.org 70 hAuthor: Hiltjo Posthuma URL:mailto:hiltjo@codemadness.org thinkerwim.org 70 iDate: Sun, 11 Nov 2018 19:07:24 +0100 Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 idetect more names for README and LICENSE Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i- for license: LICENSE, LICENSE.md, COPYING. Err thinkerwim.openbsd.amsterdam 70 i- for readme: README, README.md. Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 iDiffstat: Err thinkerwim.openbsd.amsterdam 70 i M stagit-gopher.c | 47 ++++++++++++++++++++----------- Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i1 file changed, 31 insertions(+), 16 deletions(-) Err thinkerwim.openbsd.amsterdam 70 i--- Err thinkerwim.openbsd.amsterdam 70 1diff --git a/stagit-gopher.c b/stagit-gopher.c /git/stagit-gemini/file/stagit-gopher.c.gph thinkerwim.org 70 i@@ -58,12 +58,17 @@ static char *name = ""; Err thinkerwim.openbsd.amsterdam 70 i static char *strippedname = ""; Err thinkerwim.openbsd.amsterdam 70 i static char description[255]; Err thinkerwim.openbsd.amsterdam 70 i static char cloneurl[1024]; Err thinkerwim.openbsd.amsterdam 70 i-static int haslicense, hasreadme, hassubmodules, hastagsgph; Err thinkerwim.openbsd.amsterdam 70 i+static int hastagsgph; Err thinkerwim.openbsd.amsterdam 70 i+static char *submodules; Err thinkerwim.openbsd.amsterdam 70 i+static char *licensefiles[] = { "HEAD:LICENSE", "HEAD:LICENSE.md", "HEAD:COPYING" }; Err thinkerwim.openbsd.amsterdam 70 i+static char *license; Err thinkerwim.openbsd.amsterdam 70 i+static char *readmefiles[] = { "HEAD:README", "HEAD:README.md" }; Err thinkerwim.openbsd.amsterdam 70 i+static char *readme; Err thinkerwim.openbsd.amsterdam 70 i static long long nlogcommits = -1; /* < 0 indicates not used */ Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i /* cache */ Err thinkerwim.openbsd.amsterdam 70 i static git_oid lastoid; Err thinkerwim.openbsd.amsterdam 70 i-static char lastoidstr[GIT_OID_HEXSZ + 2]; /* id + newline + nul byte */ Err thinkerwim.openbsd.amsterdam 70 i+static char lastoidstr[GIT_OID_HEXSZ + 2]; /* id + newline + NUL byte */ Err thinkerwim.openbsd.amsterdam 70 i static FILE *rcachefp, *wcachefp; Err thinkerwim.openbsd.amsterdam 70 i static const char *cachefile; Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i@@ -465,12 +470,15 @@ writeheader(FILE *fp, const char *title) Err thinkerwim.openbsd.amsterdam 70 i fprintf(fp, "[1|Refs|%s/refs.gph|server|port]\n", relpath); Err thinkerwim.openbsd.amsterdam 70 i if (hastagsgph) Err thinkerwim.openbsd.amsterdam 70 i fprintf(fp, "[1|Tags|%s/tags.gph|server|port]\n", relpath); Err thinkerwim.openbsd.amsterdam 70 i- if (hassubmodules) Err thinkerwim.openbsd.amsterdam 70 i- fprintf(fp, "[1|Submodules|%s/file/.gitmodules.gph|server|port]\n", relpath); Err thinkerwim.openbsd.amsterdam 70 i- if (hasreadme) Err thinkerwim.openbsd.amsterdam 70 i- fprintf(fp, "[1|README|%s/file/README.gph|server|port]\n", relpath); Err thinkerwim.openbsd.amsterdam 70 i- if (haslicense) Err thinkerwim.openbsd.amsterdam 70 i- fprintf(fp, "[1|LICENSE|%s/file/LICENSE.gph|server|port]\n", relpath); Err thinkerwim.openbsd.amsterdam 70 i+ if (submodules) Err thinkerwim.openbsd.amsterdam 70 i+ fprintf(fp, "[1|Submodules|%s/file/%s.gph|server|port]\n", Err thinkerwim.openbsd.amsterdam 70 i+ relpath, submodules); Err thinkerwim.openbsd.amsterdam 70 i+ if (readme) Err thinkerwim.openbsd.amsterdam 70 i+ fprintf(fp, "[1|README|%s/file/%s.gph|server|port]\n", Err thinkerwim.openbsd.amsterdam 70 i+ relpath, readme); Err thinkerwim.openbsd.amsterdam 70 i+ if (license) Err thinkerwim.openbsd.amsterdam 70 i+ fprintf(fp, "[1|LICENSE|%s/file/%s.gph|server|port]\n", Err thinkerwim.openbsd.amsterdam 70 i+ relpath, license); Err thinkerwim.openbsd.amsterdam 70 i fputs("---\n", fp); Err thinkerwim.openbsd.amsterdam 70 i } Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i@@ -1218,17 +1226,24 @@ main(int argc, char *argv[]) Err thinkerwim.openbsd.amsterdam 70 i hastagsgph = (access("tags.gph", F_OK) == 0); Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i /* check LICENSE */ Err thinkerwim.openbsd.amsterdam 70 i- haslicense = (!git_revparse_single(&obj, repo, "HEAD:LICENSE") && Err thinkerwim.openbsd.amsterdam 70 i- git_object_type(obj) == GIT_OBJ_BLOB); Err thinkerwim.openbsd.amsterdam 70 i- git_object_free(obj); Err thinkerwim.openbsd.amsterdam 70 i+ for (i = 0; i < sizeof(licensefiles) / sizeof(*licensefiles) && !license; i++) { Err thinkerwim.openbsd.amsterdam 70 i+ if (!git_revparse_single(&obj, repo, licensefiles[i]) && Err thinkerwim.openbsd.amsterdam 70 i+ git_object_type(obj) == GIT_OBJ_BLOB) Err thinkerwim.openbsd.amsterdam 70 i+ license = licensefiles[i] + strlen("HEAD:"); Err thinkerwim.openbsd.amsterdam 70 i+ git_object_free(obj); Err thinkerwim.openbsd.amsterdam 70 i+ } Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i /* check README */ Err thinkerwim.openbsd.amsterdam 70 i- hasreadme = (!git_revparse_single(&obj, repo, "HEAD:README") && Err thinkerwim.openbsd.amsterdam 70 i- git_object_type(obj) == GIT_OBJ_BLOB); Err thinkerwim.openbsd.amsterdam 70 i- git_object_free(obj); Err thinkerwim.openbsd.amsterdam 70 i+ for (i = 0; i < sizeof(readmefiles) / sizeof(*readmefiles) && !readme; i++) { Err thinkerwim.openbsd.amsterdam 70 i+ if (!git_revparse_single(&obj, repo, readmefiles[i]) && Err thinkerwim.openbsd.amsterdam 70 i+ git_object_type(obj) == GIT_OBJ_BLOB) Err thinkerwim.openbsd.amsterdam 70 i+ readme = readmefiles[i] + strlen("HEAD:"); Err thinkerwim.openbsd.amsterdam 70 i+ git_object_free(obj); Err thinkerwim.openbsd.amsterdam 70 i+ } Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i- hassubmodules = (!git_revparse_single(&obj, repo, "HEAD:.gitmodules") && Err thinkerwim.openbsd.amsterdam 70 i- git_object_type(obj) == GIT_OBJ_BLOB); Err thinkerwim.openbsd.amsterdam 70 i+ if (!git_revparse_single(&obj, repo, "HEAD:.gitmodules") && Err thinkerwim.openbsd.amsterdam 70 i+ git_object_type(obj) == GIT_OBJ_BLOB) Err thinkerwim.openbsd.amsterdam 70 i+ submodules = ".gitmodules"; Err thinkerwim.openbsd.amsterdam 70 i git_object_free(obj); Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i /* log for HEAD */ Err thinkerwim.openbsd.amsterdam 70 .