daniel/stagit
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix joinpath(): use of global 'repodir', should be 'path'

Browse Source 
use joinpath for another case.
This commit is contained in:
Hiltjo Posthuma
2016-05-03 20:42:46 +02:00
parent 2d8eb85f01
commit 543582034e
2 changed files with 28 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
stagit-index.c
View File

@@ -30,6 +30,18 @@ pledge(const char *promises, const char *paths[])
}
#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);
}
/* Escape characters below as HTML 2.0 / XML 1.0. */
void
xmlencode(FILE *fp, const char *s, size_t len)
@@ -139,18 +151,6 @@ err:
return ret;
}
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);
}
int
main(int argc, char *argv[])
{