ipedantic snprintf() improvement - 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 f8a73285fa1ba57d5815a9c365db13772896ad19 /git/stagit-gemini/commit/f8a73285fa1ba57d5815a9c365db13772896ad19.gph thinkerwim.org 70 1parent 77bfd42fb3c139ada3a679a62c56f6eebd38a0c2 /git/stagit-gemini/commit/77bfd42fb3c139ada3a679a62c56f6eebd38a0c2.gph thinkerwim.org 70 hAuthor: Hiltjo Posthuma URL:mailto:hiltjo@codemadness.org thinkerwim.org 70 iDate: Sat, 9 Mar 2019 12:41:38 +0100 Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 ipedantic snprintf() improvement Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 iPOSIX says: Err thinkerwim.openbsd.amsterdam 70 i"If an output error was encountered, these functions shall return a negative Err thinkerwim.openbsd.amsterdam 70 ivalue and set errno to indicate the error." Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 iDiffstat: Err thinkerwim.openbsd.amsterdam 70 i M stagit-gopher-index.c | 2 +- Err thinkerwim.openbsd.amsterdam 70 i M stagit-gopher.c | 6 +++--- Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i2 files changed, 4 insertions(+), 4 deletions(-) Err thinkerwim.openbsd.amsterdam 70 i--- Err thinkerwim.openbsd.amsterdam 70 1diff --git a/stagit-gopher-index.c b/stagit-gopher-index.c /git/stagit-gemini/file/stagit-gopher-index.c.gph thinkerwim.org 70 i@@ -117,7 +117,7 @@ joinpath(char *buf, size_t bufsiz, const char *path, const char *path2) Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i r = snprintf(buf, bufsiz, "%s%s%s", Err thinkerwim.openbsd.amsterdam 70 i path, path[0] && path[strlen(path) - 1] != '/' ? "/" : "", path2); Err thinkerwim.openbsd.amsterdam 70 i- if (r == -1 || (size_t)r >= bufsiz) Err thinkerwim.openbsd.amsterdam 70 i+ if (r < 0 || (size_t)r >= bufsiz) Err thinkerwim.openbsd.amsterdam 70 i errx(1, "path truncated: '%s%s%s'", Err thinkerwim.openbsd.amsterdam 70 i path, path[0] && path[strlen(path) - 1] != '/' ? "/" : "", path2); 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@@ -124,7 +124,7 @@ joinpath(char *buf, size_t bufsiz, const char *path, const char *path2) Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i r = snprintf(buf, bufsiz, "%s%s%s", Err thinkerwim.openbsd.amsterdam 70 i path, path[0] && path[strlen(path) - 1] != '/' ? "/" : "", path2); Err thinkerwim.openbsd.amsterdam 70 i- if (r == -1 || (size_t)r >= bufsiz) Err thinkerwim.openbsd.amsterdam 70 i+ if (r < 0 || (size_t)r >= bufsiz) Err thinkerwim.openbsd.amsterdam 70 i errx(1, "path truncated: '%s%s%s'", Err thinkerwim.openbsd.amsterdam 70 i path, path[0] && path[strlen(path) - 1] != '/' ? "/" : "", path2); Err thinkerwim.openbsd.amsterdam 70 i } Err thinkerwim.openbsd.amsterdam 70 i@@ -710,7 +710,7 @@ writelog(FILE *fp, const git_oid *oid) Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i git_oid_tostr(oidstr, sizeof(oidstr), &id); Err thinkerwim.openbsd.amsterdam 70 i r = snprintf(path, sizeof(path), "commit/%s.gph", oidstr); Err thinkerwim.openbsd.amsterdam 70 i- if (r == -1 || (size_t)r >= sizeof(path)) Err thinkerwim.openbsd.amsterdam 70 i+ if (r < 0 || (size_t)r >= sizeof(path)) Err thinkerwim.openbsd.amsterdam 70 i errx(1, "path truncated: 'commit/%s.gph'", oidstr); Err thinkerwim.openbsd.amsterdam 70 i r = access(path, F_OK); Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i@@ -935,7 +935,7 @@ writefilestree(FILE *fp, git_tree *tree, const char *path) Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i r = snprintf(filepath, sizeof(filepath), "file/%s.gph", Err thinkerwim.openbsd.amsterdam 70 i entrypath); Err thinkerwim.openbsd.amsterdam 70 i- if (r == -1 || (size_t)r >= sizeof(filepath)) Err thinkerwim.openbsd.amsterdam 70 i+ if (r < 0 || (size_t)r >= sizeof(filepath)) Err thinkerwim.openbsd.amsterdam 70 i errx(1, "path truncated: 'file/%s.gph'", entrypath); Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i if (!git_tree_entry_to_object(&obj, repo, entry)) { Err thinkerwim.openbsd.amsterdam 70 .