diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2026-10-18 00:30:27 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska-skaware@skarnet.org> | 2026-10-18 00:30:27 +0000 |
| commit | ebf148d99e2dab6135794149553c193abe4e675d (patch) | |
| tree | ea288fb1bafff4f05ac59170f77c75ac5f3a3d6e /src/repo/s6rc_repo_setcopy.c | |
| parent | 6ada80ed7e45ed630e4d9877a9b11e2dfddb4758 (diff) | |
| download | s6-rc-ebf148d99e2dab6135794149553c193abe4e675d.tar.gz | |
Part four: we delete all the snapshots after set-install
Except the snapshot corresponding to the new live db, of course.
Also, in order to accommodate snapshots without risking name
conflicts, the real name of set foobar isn't .foobar:XXXXXX
anymore, but .real.foobar:XXXXXX
Now the automatic upgrade in case of major bump is complete.
Next comes testing and debugging.
Diffstat (limited to 'src/repo/s6rc_repo_setcopy.c')
| -rw-r--r-- | src/repo/s6rc_repo_setcopy.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/repo/s6rc_repo_setcopy.c b/src/repo/s6rc_repo_setcopy.c index 30cb042..1a964a9 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 + 18] ; - char realdst[repolen + dstlen + 18] ; - char olddst[repolen + dstlen + 18] ; + char realsrc[repolen + srclen + 22] ; + char realdst[repolen + dstlen + 22] ; + char olddst[repolen + dstlen + 22] ; memcpy(src, repo, repolen) ; memcpy(src + repolen, "/sources/", 9) ; memcpy(src + repolen + 9, srcname, srclen + 1) ; @@ -44,12 +44,12 @@ int s6rc_repo_setcopy (char const *repo, char const *srcname, char const *dstnam memcpy(realsrc, src, repolen + 9) ; r = readlink(src, realsrc + repolen + 9, srclen + 9) ; if (r == -1) return errno ; - if (r != srclen + 8) return -2 ; - realsrc[repolen + srclen + 17] = 0 ; + if (r != srclen + 12) return -2 ; + realsrc[repolen + srclen + 21] = 0 ; memcpy(realdst, dst, repolen + 9) ; - realdst[repolen + 9] = '.' ; - memcpy(realdst + repolen + 10, dstname, dstlen) ; - memcpy(realdst + repolen + 10 + dstlen, ":XXXXXX", 8) ; + memcpy(realdst + repolen + 9, ".real.", 5) ; + memcpy(realdst + repolen + 14, dstname, dstlen) ; + memcpy(realdst + repolen + 14 + dstlen, ":XXXXXX", 8) ; if (mkntemp(realdst) == -1) return errno ; if (!hiercopy(realsrc, realdst)) { |