diff options
| -rw-r--r-- | src/repo/s6rc_repo_setcopy.c | 18 | ||||
| -rw-r--r-- | src/repo/s6rc_repo_setdelete.c | 8 | ||||
| -rw-r--r-- | src/s6-rc/s6-rc-compile.c | 6 |
3 files changed, 16 insertions, 16 deletions
diff --git a/src/repo/s6rc_repo_setcopy.c b/src/repo/s6rc_repo_setcopy.c index 018084c..00b4886 100644 --- a/src/repo/s6rc_repo_setcopy.c +++ b/src/repo/s6rc_repo_setcopy.c @@ -25,9 +25,9 @@ int s6rc_repo_setcopy (char const *repo, char const *srcname, char const *dstnam size_t r ; char src[repolen + srclen + 10] ; char dst[repolen + dstlen + 10] ; - char realsrc[repolen + srclen + 22] ; - char realdst[repolen + dstlen + 22] ; - char olddst[repolen + dstlen + 22] ; + char realsrc[repolen + srclen + 23] ; + char realdst[repolen + dstlen + 23] ; + char olddst[repolen + dstlen + 23] ; memcpy(src, repo, repolen) ; memcpy(src + repolen, "/sources/", 9) ; memcpy(src + repolen + 9, srcname, srclen + 1) ; @@ -42,14 +42,14 @@ int s6rc_repo_setcopy (char const *repo, char const *srcname, char const *dstnam else if (!(flags & 1)) return -1 ; memcpy(realsrc, src, repolen + 9) ; - r = readlink(src, realsrc + repolen + 9, srclen + 13) ; + r = readlink(src, realsrc + repolen + 9, srclen + 14) ; if (r == -1) return errno ; - if (r != srclen + 12) return -2 ; - realsrc[repolen + srclen + 21] = 0 ; + if (r != srclen + 13) return -2 ; + realsrc[repolen + srclen + 22] = 0 ; memcpy(realdst, dst, repolen + 9) ; - memcpy(realdst + repolen + 9, ".real.", 5) ; - memcpy(realdst + repolen + 14, dstname, dstlen) ; - memcpy(realdst + repolen + 14 + dstlen, ":XXXXXX", 8) ; + memcpy(realdst + repolen + 9, ".real.", 6) ; + memcpy(realdst + repolen + 15, dstname, dstlen) ; + memcpy(realdst + repolen + 15 + dstlen, ":XXXXXX", 8) ; if (mkntemp(realdst) == -1) return errno ; if (!hiercopy(realsrc, realdst)) { diff --git a/src/repo/s6rc_repo_setdelete.c b/src/repo/s6rc_repo_setdelete.c index 605533e..60aa731 100644 --- a/src/repo/s6rc_repo_setdelete.c +++ b/src/repo/s6rc_repo_setdelete.c @@ -14,7 +14,7 @@ void s6rc_repo_setdelete (char const *repo, char const *set) size_t repolen = strlen(repo) ; size_t setlen = strlen(set) ; ssize_t r ; - char real[repolen + setlen + 22] ; + char real[repolen + setlen + 23] ; char fn[repolen + setlen + 11] ; memcpy(fn, repo, repolen) ; memcpy(fn + repolen, "/sources/", 9) ; @@ -22,9 +22,9 @@ void s6rc_repo_setdelete (char const *repo, char const *set) if (access(fn, W_OK) == -1 && errno != ENOENT) return ; memcpy(real, repo, repolen) ; memcpy(real + repolen, "/sources/", 9) ; - r = readlink(fn, real + repolen + 9, setlen + 13) ; - if (r == -1 || r != setlen + 12) return ; - real[repolen + setlen + 21] = 0 ; + r = readlink(fn, real + repolen + 9, setlen + 14) ; + if (r == -1 || r != setlen + 13) return ; + real[repolen + setlen + 22] = 0 ; unlink_void(fn) ; rm_rf(real) ; } diff --git a/src/s6-rc/s6-rc-compile.c b/src/s6-rc/s6-rc-compile.c index ec8f46a..7ed0c6f 100644 --- a/src/s6-rc/s6-rc-compile.c +++ b/src/s6-rc/s6-rc-compile.c @@ -1166,7 +1166,7 @@ static inline void write_fdholder (char const *compiled, s6rc_db_t const *db, ch EXECLINE_EXTBINPREFIX "redirfd -r 0 ./data/autofilled\n " S6_EXTBINPREFIX "s6-ipcclient -l0 -- s\n " S6RC_EXTLIBEXECPREFIX "s6-rc-fdholder-filler -1 ")) goto err ; - if (catchall) + if (catchall && catchall[0]) { if (!stralloc_cats(&satmp, "-L ") || !string_quote(&satmp, catchall, strlen(catchall)) @@ -1174,7 +1174,7 @@ static inline void write_fdholder (char const *compiled, s6rc_db_t const *db, ch } if (!stralloc_cats(&satmp, "--\n }\n " S6_EXTBINPREFIX "s6-svc -t .\n}\n")) goto err ; - if (fdhuser) + if (fdhuser && fdhuser[0]) { if (!stralloc_cats(&satmp, S6_EXTBINPREFIX "s6-envuidgid -i -- ") || !string_quote(&satmp, fdhuser, strlen(fdhuser)) @@ -1187,7 +1187,7 @@ static inline void write_fdholder (char const *compiled, s6rc_db_t const *db, ch fmt[len++] = ' ' ; if (!stralloc_catb(&satmp, fmt, len)) goto err ; } - if (fdhuser) + if (fdhuser && fdhuser[0]) { if (!stralloc_cats(&satmp, "-U ")) goto err ; } |