diff options
author | Hiltjo Posthuma <[email protected]> | 2016-05-01 14:38:57 +0200 |
---|---|---|
committer | Hiltjo Posthuma <[email protected]> | 2016-05-01 14:51:02 +0200 |
commit | fc60d78d8917fb930227ecc53936c9216e6298c2 (patch) | |
tree | 1a2e52398f75e5d1d64dff2c276fa70667b7b0d1 /stagit-index.c | |
parent | c13c4119501291e5c276d4d1217491b16a2a7ff9 (diff) | |
download | stagit-fc60d78d8917fb930227ecc53936c9216e6298c2.tar.gz stagit-fc60d78d8917fb930227ecc53936c9216e6298c2.zip |
fix path join '/'
add joinpath() function to handle this.
Diffstat (limited to 'stagit-index.c')
-rw-r--r-- | stagit-index.c | 42 |
1 files changed, 19 insertions, 23 deletions
diff --git a/stagit-index.c b/stagit-index.c index 412721d..2d7bf85 100644 --- a/stagit-index.c +++ b/stagit-index.c @@ -140,13 +140,25 @@ 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[]) { const git_error *e = NULL; FILE *fp; char path[PATH_MAX], repodirabs[PATH_MAX + 1]; - int i, r, ret = 0; + int i, ret = 0; if (argc < 2) { fprintf(stderr, "%s [repodir...]\n", argv[0]); @@ -176,20 +188,12 @@ main(int argc, char *argv[]) name = ""; /* read description or .git/description */ - description[0] = '\0'; - r = snprintf(path, sizeof(path), "%s%s%s", - repodir, repodir[strlen(repodir)] == '/' ? "" : "/", "description"); - if (r == -1 || (size_t)r >= sizeof(path)) - errx(1, "path truncated: '%s%s%s'", - repodir, repodir[strlen(repodir)] == '/' ? "" : "/", "description"); + joinpath(path, sizeof(path), repodir, "description"); if (!(fp = fopen(path, "r"))) { - r = snprintf(path, sizeof(path), "%s%s%s", - repodir, repodir[strlen(repodir)] == '/' ? "" : "/", ".git/description"); - if (r == -1 || (size_t)r >= sizeof(path)) - errx(1, "path truncated: '%s%s%s'", - repodir, repodir[strlen(repodir)] == '/' ? "" : "/", ".git/description"); + joinpath(path, sizeof(path), repodir, ".git/description"); fp = fopen(path, "r"); } + description[0] = '\0'; if (fp) { if (!fgets(description, sizeof(description), fp)) description[0] = '\0'; @@ -197,20 +201,12 @@ main(int argc, char *argv[]) } /* read owner or .git/owner */ - owner[0] = '\0'; - r = snprintf(path, sizeof(path), "%s%s%s", - repodir, repodir[strlen(repodir)] == '/' ? "" : "/", "owner"); - if (r == -1 || (size_t)r >= sizeof(path)) - errx(1, "path truncated: '%s%s%s'", - repodir, repodir[strlen(repodir)] == '/' ? "" : "/", "owner"); + joinpath(path, sizeof(path), repodir, "owner"); if (!(fp = fopen(path, "r"))) { - r = snprintf(path, sizeof(path), "%s%s%s", - repodir, repodir[strlen(repodir)] == '/' ? "" : "/", ".git/owner"); - if (r == -1 || (size_t)r >= sizeof(path)) - errx(1, "path truncated: '%s%s%s'", - repodir, repodir[strlen(repodir)] == '/' ? "" : "/", ".git/owner"); + joinpath(path, sizeof(path), repodir, ".git/owner"); fp = fopen(path, "r"); } + owner[0] = '\0'; if (fp) { if (!fgets(owner, sizeof(owner), fp)) owner[0] = '\0'; |