From d0b38944c50dab81755fca50a983a1bddefbfadf Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Thu, 1 Jun 2023 03:46:48 +0000 Subject: Refactor to add hiercopy_loose (for s6-l-i) Signed-off-by: Laurent Bercot --- src/libstddjb/hiercopy.c | 2 +- src/libstddjb/hiercopy_internal.c | 88 ++++++++++++++++++++++++++++++++++++++ src/libstddjb/hiercopy_loose.c | 9 ++++ src/libstddjb/hiercopy_loose_tmp.c | 8 ++++ src/libstddjb/hiercopy_tmp.c | 82 +---------------------------------- 5 files changed, 107 insertions(+), 82 deletions(-) create mode 100644 src/libstddjb/hiercopy_internal.c create mode 100644 src/libstddjb/hiercopy_loose.c create mode 100644 src/libstddjb/hiercopy_loose_tmp.c (limited to 'src/libstddjb') diff --git a/src/libstddjb/hiercopy.c b/src/libstddjb/hiercopy.c index 3fc4d2f..53f9850 100644 --- a/src/libstddjb/hiercopy.c +++ b/src/libstddjb/hiercopy.c @@ -5,5 +5,5 @@ int hiercopy (char const *src, char const *dst) { - return hiercopy_tmp(src, dst, &satmp) ; + return hiercopy_internal(src, dst, &satmp, 0) ; } diff --git a/src/libstddjb/hiercopy_internal.c b/src/libstddjb/hiercopy_internal.c new file mode 100644 index 0000000..c512463 --- /dev/null +++ b/src/libstddjb/hiercopy_internal.c @@ -0,0 +1,88 @@ +/* ISC license. */ + +#include +#include +#include +#include +#include + +#include +#include +#include + +static int dircopy (char const *src, char const *dst, mode_t mode, stralloc *tmp, unsigned int options) +{ + size_t tmpbase = tmp->len ; + size_t maxlen = 0 ; + if (sals(src, tmp, &maxlen) == -1) return 0 ; + + if (mkdir(dst, S_IRWXU) < 0) + { + struct stat st ; + if (errno != EEXIST) goto err ; + if (stat(dst, &st) < 0) goto err ; + if (!S_ISDIR(st.st_mode)) { errno = ENOTDIR ; goto err ; } + } + { + size_t srclen = strlen(src) ; + size_t dstlen = strlen(dst) ; + size_t i = tmpbase ; + char srcbuf[srclen + maxlen + 2] ; + char dstbuf[dstlen + maxlen + 2] ; + memcpy(srcbuf, src, srclen) ; + memcpy(dstbuf, dst, dstlen) ; + srcbuf[srclen] = '/' ; + dstbuf[dstlen] = '/' ; + while (i < tmp->len) + { + size_t n = strlen(tmp->s + i) + 1 ; + memcpy(srcbuf + srclen + 1, tmp->s + i, n) ; + memcpy(dstbuf + dstlen + 1, tmp->s + i, n) ; + i += n ; + hiercopy_internal(srcbuf, dstbuf, tmp, 0) ; + } + } + if (chmod(dst, mode) < 0 && !(options & 1)) goto err ; + tmp->len = tmpbase ; + return 1 ; +err: + tmp->len = tmpbase ; + return 0 ; +} + +int hiercopy_internal (char const *src, char const *dst, stralloc *tmp, unsigned int options) +{ + struct stat st ; + if (lstat(src, &st) < 0) return 0 ; + if (S_ISREG(st.st_mode)) + { + if (!filecopy_unsafe(src, dst, st.st_mode)) return 0 ; + } + else if (S_ISDIR(st.st_mode)) + { + if (!dircopy(src, dst, st.st_mode, tmp, options)) return 0 ; + } + else if (S_ISFIFO(st.st_mode)) + { + if (mkfifo(dst, st.st_mode) < 0) return 0 ; + } + else if (S_ISLNK(st.st_mode)) + { + size_t tmpbase = tmp->len ; + if (sareadlink(tmp, src) < 0) return 0 ; + if (!stralloc_0(tmp) || symlink(tmp->s + tmpbase, dst) < 0) + { + tmp->len = tmpbase ; + return 0 ; + } + tmp->len = tmpbase ; + } + else if (S_ISCHR(st.st_mode) || S_ISBLK(st.st_mode) || S_ISSOCK(st.st_mode)) + { + if (mknod(dst, st.st_mode, st.st_rdev) < 0) return 0 ; + } + else return (errno = ENOTSUP, 0) ; + lchown(dst, st.st_uid, st.st_gid) ; + if (!S_ISLNK(st.st_mode)) chmod(dst, st.st_mode) ; + return 1 ; +} diff --git a/src/libstddjb/hiercopy_loose.c b/src/libstddjb/hiercopy_loose.c new file mode 100644 index 0000000..38e47b5 --- /dev/null +++ b/src/libstddjb/hiercopy_loose.c @@ -0,0 +1,9 @@ +/* ISC license. */ + +#include +#include + +int hiercopy_loose (char const *src, char const *dst) +{ + return hiercopy_internal(src, dst, &satmp, 1) ; +} diff --git a/src/libstddjb/hiercopy_loose_tmp.c b/src/libstddjb/hiercopy_loose_tmp.c new file mode 100644 index 0000000..81eae4a --- /dev/null +++ b/src/libstddjb/hiercopy_loose_tmp.c @@ -0,0 +1,8 @@ +/* ISC license. */ + +#include + +int hiercopy_loose_tmp (char const *src, char const *dst, stralloc *tmp) +{ + return hiercopy_internal(src, dst, tmp, 1) ; +} diff --git a/src/libstddjb/hiercopy_tmp.c b/src/libstddjb/hiercopy_tmp.c index 3e147be..c820f84 100644 --- a/src/libstddjb/hiercopy_tmp.c +++ b/src/libstddjb/hiercopy_tmp.c @@ -1,88 +1,8 @@ /* ISC license. */ -#include -#include -#include -#include -#include - -#include -#include #include -static int dircopy (char const *src, char const *dst, mode_t mode, stralloc *tmp) -{ - size_t tmpbase = tmp->len ; - size_t maxlen = 0 ; - if (sals(src, tmp, &maxlen) == -1) return 0 ; - - if (mkdir(dst, S_IRWXU) < 0) - { - struct stat st ; - if (errno != EEXIST) goto err ; - if (stat(dst, &st) < 0) goto err ; - if (!S_ISDIR(st.st_mode)) { errno = ENOTDIR ; goto err ; } - } - { - size_t srclen = strlen(src) ; - size_t dstlen = strlen(dst) ; - size_t i = tmpbase ; - char srcbuf[srclen + maxlen + 2] ; - char dstbuf[dstlen + maxlen + 2] ; - memcpy(srcbuf, src, srclen) ; - memcpy(dstbuf, dst, dstlen) ; - srcbuf[srclen] = '/' ; - dstbuf[dstlen] = '/' ; - while (i < tmp->len) - { - size_t n = strlen(tmp->s + i) + 1 ; - memcpy(srcbuf + srclen + 1, tmp->s + i, n) ; - memcpy(dstbuf + dstlen + 1, tmp->s + i, n) ; - i += n ; - hiercopy_tmp(srcbuf, dstbuf, tmp) ; - } - } - if (chmod(dst, mode) < 0) goto err ; - tmp->len = tmpbase ; - return 1 ; -err: - tmp->len = tmpbase ; - return 0 ; -} - int hiercopy_tmp (char const *src, char const *dst, stralloc *tmp) { - struct stat st ; - if (lstat(src, &st) < 0) return 0 ; - if (S_ISREG(st.st_mode)) - { - if (!filecopy_unsafe(src, dst, st.st_mode)) return 0 ; - } - else if (S_ISDIR(st.st_mode)) - { - if (!dircopy(src, dst, st.st_mode, tmp)) return 0 ; - } - else if (S_ISFIFO(st.st_mode)) - { - if (mkfifo(dst, st.st_mode) < 0) return 0 ; - } - else if (S_ISLNK(st.st_mode)) - { - size_t tmpbase = tmp->len ; - if (sareadlink(tmp, src) < 0) return 0 ; - if (!stralloc_0(tmp) || symlink(tmp->s + tmpbase, dst) < 0) - { - tmp->len = tmpbase ; - return 0 ; - } - tmp->len = tmpbase ; - } - else if (S_ISCHR(st.st_mode) || S_ISBLK(st.st_mode) || S_ISSOCK(st.st_mode)) - { - if (mknod(dst, st.st_mode, st.st_rdev) < 0) return 0 ; - } - else return (errno = ENOTSUP, 0) ; - lchown(dst, st.st_uid, st.st_gid) ; - if (!S_ISLNK(st.st_mode)) chmod(dst, st.st_mode) ; - return 1 ; + return hiercopy_internal(src, dst, tmp, 0) ; } -- cgit v1.2.3