xfnw/stagit
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

pedantic snprintf() improvement

Browse source 
POSIX says:
"If an output error was encountered, these functions shall return a negative
value and set errno to indicate the error."
This commit is contained in:
Hiltjo Posthuma 2019-03-09 12:39:10 +01:00
parent 587b01428d
commit bb1d06eb20
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
stagit-index.c
View file

@ -28,7 +28,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);
}

6
stagit.c
View file

@ -76,7 +76,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);
}
@ -616,7 +616,7 @@ writelog(FILE *fp, const git_oid *oid)
git_oid_tostr(oidstr, sizeof(oidstr), &id);
r = snprintf(path, sizeof(path), "commit/%s.html", oidstr);
if (r == -1 || (size_t)r >= sizeof(path))
if (r < 0 || (size_t)r >= sizeof(path))
errx(1, "path truncated: 'commit/%s.html'", oidstr);
r = access(path, F_OK);
@ -856,7 +856,7 @@ writefilestree(FILE *fp, git_tree *tree, 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)) {