diff options
| -rw-r--r-- | package/deps.mak | 11 | ||||
| -rw-r--r-- | src/include/skalibs/functypes.h | 3 | ||||
| -rw-r--r-- | src/libunixonacid/access_at.c | 44 | ||||
| -rw-r--r-- | src/libunixonacid/at-internal.h | 10 | ||||
| -rw-r--r-- | src/libunixonacid/emulate_at.c | 43 | ||||
| -rw-r--r-- | src/libunixonacid/open2_at.c | 48 | ||||
| -rw-r--r-- | src/libunixonacid/open3_at.c | 48 | ||||
| -rw-r--r-- | src/libunixonacid/stat_at.c | 61 | ||||
| -rw-r--r-- | src/libunixonacid/symlink_at.c | 60 |
9 files changed, 220 insertions, 108 deletions
diff --git a/package/deps.mak b/package/deps.mak index 8628a5b..39f6843 100644 --- a/package/deps.mak +++ b/package/deps.mak @@ -69,6 +69,7 @@ src/libstddjb/cdb-internal.h: src/include/skalibs/cdb.h src/include/skalibs/gcca src/libstddjb/cdbmake-internal.h: src/include/skalibs/cdbmake.h src/libstddjb/djbtime-internal.h: src/include/skalibs/uint64.h src/libstddjb/fmtscan-internal.h: src/include/skalibs/fmtscan.h src/include/skalibs/uint64.h +src/libunixonacid/at-internal.h: src/include/skalibs/functypes.h src/libunixonacid/skaclient-internal.h: src/include/skalibs/kolbak.h src/include/skalibs/skaclient.h src/include/skalibs/unixmessage.h src/libdatastruct/avlnode_delete.o src/libdatastruct/avlnode_delete.lo: src/libdatastruct/avlnode_delete.c src/libdatastruct/avlnode-internal.h src/include/skalibs/avlnode.h src/libdatastruct/avlnode_doublerotate.o src/libdatastruct/avlnode_doublerotate.lo: src/libdatastruct/avlnode_doublerotate.c src/libdatastruct/avlnode-internal.h src/include/skalibs/avlnode.h @@ -739,7 +740,7 @@ src/libstddjb/waitn_reap_posix.o src/libstddjb/waitn_reap_posix.lo: src/libstddj src/libstddjb/waitpid_nointr.o src/libstddjb/waitpid_nointr.lo: src/libstddjb/waitpid_nointr.c src/include/skalibs/djbunix.h src/libstddjb/writenclose_unsafe5.o src/libstddjb/writenclose_unsafe5.lo: src/libstddjb/writenclose_unsafe5.c src/include/skalibs/allreadwrite.h src/include/skalibs/djbunix.h src/libstddjb/writevnclose_unsafe5.o src/libstddjb/writevnclose_unsafe5.lo: src/libstddjb/writevnclose_unsafe5.c src/include/skalibs/allreadwrite.h src/include/skalibs/djbunix.h src/include/skalibs/siovec.h -src/libunixonacid/access_at.o src/libunixonacid/access_at.lo: src/libunixonacid/access_at.c src/include/skalibs/djbunix.h src/include/skalibs/fcntl.h src/include/skalibs/nonposix.h src/include/skalibs/sysdeps.h src/include/skalibs/unix-transactional.h +src/libunixonacid/access_at.o src/libunixonacid/access_at.lo: src/libunixonacid/access_at.c src/libunixonacid/at-internal.h src/include/skalibs/djbunix.h src/include/skalibs/fcntl.h src/include/skalibs/nonposix.h src/include/skalibs/sysdeps.h src/include/skalibs/unix-transactional.h src/libunixonacid/ancil_recv_fd.o src/libunixonacid/ancil_recv_fd.lo: src/libunixonacid/ancil_recv_fd.c src/include/skalibs/allreadwrite.h src/include/skalibs/ancil.h src/include/skalibs/djbunix.h src/include/skalibs/nonposix.h src/include/skalibs/posixishard.h src/include/skalibs/sysdeps.h src/libunixonacid/ancil_send_fd.o src/libunixonacid/ancil_send_fd.lo: src/libunixonacid/ancil_send_fd.c src/include/skalibs/ancil.h src/include/skalibs/nonposix.h src/include/skalibs/posixishard.h src/libunixonacid/atomic_rm_rf.o src/libunixonacid/atomic_rm_rf.lo: src/libunixonacid/atomic_rm_rf.c src/include/skalibs/skamisc.h src/include/skalibs/unix-transactional.h @@ -753,6 +754,7 @@ src/libunixonacid/buffer_timed_getv.o src/libunixonacid/buffer_timed_getv.lo: sr src/libunixonacid/buffer_timed_put.o src/libunixonacid/buffer_timed_put.lo: src/libunixonacid/buffer_timed_put.c src/include/skalibs/buffer.h src/include/skalibs/unix-timed.h src/libunixonacid/buffer_timed_puts.o src/libunixonacid/buffer_timed_puts.lo: src/libunixonacid/buffer_timed_puts.c src/include/skalibs/unix-timed.h src/libunixonacid/buffer_timed_putv.o src/libunixonacid/buffer_timed_putv.lo: src/libunixonacid/buffer_timed_putv.c src/include/skalibs/buffer.h src/include/skalibs/siovec.h src/include/skalibs/unix-timed.h +src/libunixonacid/emulate_at.o src/libunixonacid/emulate_at.lo: src/libunixonacid/emulate_at.c src/libunixonacid/at-internal.h src/include/skalibs/bsdsnowflake.h src/include/skalibs/djbunix.h src/include/skalibs/functypes.h src/include/skalibs/sysdeps.h src/include/skalibs/unix-transactional.h src/libunixonacid/ipc_timed_recv.o src/libunixonacid/ipc_timed_recv.lo: src/libunixonacid/ipc_timed_recv.c src/include/skalibs/allreadwrite.h src/include/skalibs/functypes.h src/include/skalibs/socket.h src/include/skalibs/unix-timed.h src/libunixonacid/ipc_timed_send.o src/libunixonacid/ipc_timed_send.lo: src/libunixonacid/ipc_timed_send.c src/include/skalibs/error.h src/include/skalibs/iopause.h src/include/skalibs/nonposix.h src/include/skalibs/posixishard.h src/include/skalibs/unix-timed.h src/libunixonacid/ipc_timed_sendv.o src/libunixonacid/ipc_timed_sendv.lo: src/libunixonacid/ipc_timed_sendv.c src/include/skalibs/error.h src/include/skalibs/iopause.h src/include/skalibs/nonposix.h src/include/skalibs/posixishard.h src/include/skalibs/siovec.h src/include/skalibs/unix-timed.h @@ -761,8 +763,8 @@ src/libunixonacid/kolbak_enqueue.o src/libunixonacid/kolbak_enqueue.lo: src/libu src/libunixonacid/kolbak_queue_init.o src/libunixonacid/kolbak_queue_init.lo: src/libunixonacid/kolbak_queue_init.c src/include/skalibs/kolbak.h src/libunixonacid/kolbak_unenqueue.o src/libunixonacid/kolbak_unenqueue.lo: src/libunixonacid/kolbak_unenqueue.c src/include/skalibs/kolbak.h src/libunixonacid/netstring_timed_get.o src/libunixonacid/netstring_timed_get.lo: src/libunixonacid/netstring_timed_get.c src/include/skalibs/buffer.h src/include/skalibs/iopause.h src/include/skalibs/netstring.h src/include/skalibs/unix-timed.h -src/libunixonacid/open2_at.o src/libunixonacid/open2_at.lo: src/libunixonacid/open2_at.c src/include/skalibs/djbunix.h src/include/skalibs/fcntl.h src/include/skalibs/nonposix.h src/include/skalibs/sysdeps.h src/include/skalibs/unix-transactional.h -src/libunixonacid/open3_at.o src/libunixonacid/open3_at.lo: src/libunixonacid/open3_at.c src/include/skalibs/djbunix.h src/include/skalibs/fcntl.h src/include/skalibs/nonposix.h src/include/skalibs/sysdeps.h src/include/skalibs/unix-transactional.h +src/libunixonacid/open2_at.o src/libunixonacid/open2_at.lo: src/libunixonacid/open2_at.c src/libunixonacid/at-internal.h src/include/skalibs/djbunix.h src/include/skalibs/fcntl.h src/include/skalibs/nonposix.h src/include/skalibs/stat.h src/include/skalibs/sysdeps.h src/include/skalibs/unix-transactional.h +src/libunixonacid/open3_at.o src/libunixonacid/open3_at.lo: src/libunixonacid/open3_at.c src/libunixonacid/at-internal.h src/include/skalibs/djbunix.h src/include/skalibs/fcntl.h src/include/skalibs/nonposix.h src/include/skalibs/sysdeps.h src/include/skalibs/unix-transactional.h src/libunixonacid/open_appendat.o src/libunixonacid/open_appendat.lo: src/libunixonacid/open_appendat.c src/include/skalibs/fcntl.h src/include/skalibs/unix-transactional.h src/libunixonacid/open_appendatb.o src/libunixonacid/open_appendatb.lo: src/libunixonacid/open_appendatb.c src/include/skalibs/djbunix.h src/include/skalibs/unix-transactional.h src/libunixonacid/open_readat.o src/libunixonacid/open_readat.lo: src/libunixonacid/open_readat.c src/include/skalibs/fcntl.h src/include/skalibs/unix-transactional.h @@ -807,7 +809,8 @@ src/libunixonacid/skaclient_startf.o src/libunixonacid/skaclient_startf.lo: src/ src/libunixonacid/skaclient_startf_async.o src/libunixonacid/skaclient_startf_async.lo: src/libunixonacid/skaclient_startf_async.c src/include/skalibs/cspawn.h src/include/skalibs/djbunix.h src/include/skalibs/kolbak.h src/libunixonacid/skaclient-internal.h src/include/skalibs/skaclient.h src/libunixonacid/skaclient_syncify.o src/libunixonacid/skaclient_syncify.lo: src/libunixonacid/skaclient_syncify.c src/include/skalibs/skaclient.h src/libunixonacid/skaclient_zero.o src/libunixonacid/skaclient_zero.lo: src/libunixonacid/skaclient_zero.c src/include/skalibs/skaclient.h -src/libunixonacid/stat_at.o src/libunixonacid/stat_at.lo: src/libunixonacid/stat_at.c src/include/skalibs/djbunix.h src/include/skalibs/fcntl.h src/include/skalibs/nonposix.h src/include/skalibs/sysdeps.h src/include/skalibs/unix-transactional.h +src/libunixonacid/stat_at.o src/libunixonacid/stat_at.lo: src/libunixonacid/stat_at.c src/libunixonacid/at-internal.h src/include/skalibs/bsdsnowflake.h src/include/skalibs/fcntl.h src/include/skalibs/nonposix.h src/include/skalibs/stat.h src/include/skalibs/sysdeps.h src/include/skalibs/unix-transactional.h +src/libunixonacid/symlink_at.o src/libunixonacid/symlink_at.lo: src/libunixonacid/symlink_at.c src/include/skalibs/fcntl.h src/include/skalibs/nonposix.h src/include/skalibs/posixplz.h src/include/skalibs/sysdeps.h src/include/skalibs/unix-transactional.h src/libunixonacid/textclient_command.o src/libunixonacid/textclient_command.lo: src/libunixonacid/textclient_command.c src/include/skalibs/posixishard.h src/include/skalibs/textclient.h src/libunixonacid/textclient_commandv.o src/libunixonacid/textclient_commandv.lo: src/libunixonacid/textclient_commandv.c src/include/skalibs/posixishard.h src/include/skalibs/textclient.h src/libunixonacid/textclient_end.o src/libunixonacid/textclient_end.lo: src/libunixonacid/textclient_end.c src/include/skalibs/djbunix.h src/include/skalibs/textclient.h src/include/skalibs/textmessage.h diff --git a/src/include/skalibs/functypes.h b/src/include/skalibs/functypes.h index df1dc1d..d1a7c4c 100644 --- a/src/include/skalibs/functypes.h +++ b/src/include/skalibs/functypes.h @@ -28,6 +28,9 @@ typedef free_func *free_func_ref ; typedef int init_func (void *) ; typedef init_func *init_func_ref ; +typedef void deinit_func (int, void *) ; +typedef deinit_func *deinit_func_ref ; + typedef ssize_t get_func (void *) ; typedef get_func *get_func_ref ; diff --git a/src/libunixonacid/access_at.c b/src/libunixonacid/access_at.c index e7f988c..f974fbe 100644 --- a/src/libunixonacid/access_at.c +++ b/src/libunixonacid/access_at.c @@ -27,30 +27,32 @@ int access_at (int dirfd, char const *file, int amode, unsigned int flag) #include <skalibs/djbunix.h> #include <skalibs/unix-transactional.h> +#include "at-internal.h" + +struct access_s +{ + char const *file ; + int amode ; +} ; + +static int do_access (void *p) +{ + struct access_s *b = p ; + return access(b->file, b->amode) ; +} + +static void cancel_access (int r, void *p) +{ + (void)r ; + (void)p ; +} int access_at (int dirfd, char const *file, int amode, unsigned int flag) { - int fdhere ; - if (getuid() != geteuid() || getgid() != getegid()) - return (errno = ENOSYS, -1) ; - (void)flag ; - fdhere = openc_read(".") ; - if (fdhere < 0) return -1 ; - if (fd_chdir(dirfd) < 0) - { - fd_close(fdhere) ; - return -1 ; - } - if (access(file, amode) < 0) - { - int e = errno ; - fd_chdir(fdhere) ; - fd_close(fdhere) ; - return (errno = e, -1) ; - } - fd_chdir(fdhere) ; - fd_close(fdhere) ; - return 0 ; + struct access_s args = { .file = file, .amode = amode } ; + if (flag && (getuid() != geteuid() || getgid() != getegid())) + return (errno = ENOSYS, 1) ; + return emulate_at(dirfd, &do_access, &cancel_access, &args) ; } #endif diff --git a/src/libunixonacid/at-internal.h b/src/libunixonacid/at-internal.h new file mode 100644 index 0000000..e76d68a --- /dev/null +++ b/src/libunixonacid/at-internal.h @@ -0,0 +1,10 @@ +/* ISC license. */ + +#ifndef SKALIBS_AT_INTERNAL_H +#define SKALIBS_AT_INTERNAL_H + +#include <skalibs/functypes.h> + +extern int emulate_at (int, init_func_ref, deinit_func_ref, void *) ; + +#endif diff --git a/src/libunixonacid/emulate_at.c b/src/libunixonacid/emulate_at.c new file mode 100644 index 0000000..0bb194a --- /dev/null +++ b/src/libunixonacid/emulate_at.c @@ -0,0 +1,43 @@ +/* ISC license. */ + +#include <skalibs/sysdeps.h> + +#if !defined(SKALIBS_HASOPENAT) || !defined(SKALIBS_HASLINKAT) + +#include <skalibs/bsdsnowflake.h> + +#include <errno.h> + +#include <skalibs/functypes.h> +#include <skalibs/djbunix.h> +#include <skalibs/unix-transactional.h> +#include "at-internal.h" + +int emulate_at (int dirfd, init_func_ref f, deinit_func_ref g, void *p) +{ + int r ; + int fdhere = open_read(".") ; + if (fdhere < 0) return -1 ; + if (fd_chdir(dirfd) < 0) goto errclose ; + r = (*f)(p) ; + if (r < 0) + { + int e = errno ; + fd_chdir(fdhere) ; + errno = e ; + goto errclose ; + } + if (fd_chdir(fdhere) < 0) + { + (*g)(r, p) ; + goto errclose ; + } + fd_close(fdhere) ; + return r ; + + errclose: + fd_close(fdhere) ; + return -1 ; +} + +#endif diff --git a/src/libunixonacid/open2_at.c b/src/libunixonacid/open2_at.c index d96c0b7..3afc4fb 100644 --- a/src/libunixonacid/open2_at.c +++ b/src/libunixonacid/open2_at.c @@ -12,6 +12,7 @@ #include <errno.h> +#include <skalibs/stat.h> #include <skalibs/fcntl.h> #include <skalibs/unix-transactional.h> @@ -25,38 +26,33 @@ int open2_at (int dirfd, char const *file, int flags) #else -#include <sys/stat.h> -#include <errno.h> - #include <skalibs/fcntl.h> #include <skalibs/djbunix.h> #include <skalibs/unix-transactional.h> +#include "at-internal.h" -int open2_at (int dirfd, char const *file, int flags) +struct open2_s { - int fd ; - int fdhere = open_read(".") ; - if (fdhere < 0) return -1 ; - if (fd_chdir(dirfd) < 0) goto errclose ; - fd = open2(file, flags) ; - if (fd < 0) - { - int e = errno ; - fd_chdir(fdhere) ; - errno = e ; - goto errclose ; - } - if (fd_chdir(fdhere) < 0) - { - fd_close(fd) ; - goto errclose ; - } - fd_close(fdhere) ; - return fd ; + char const *file ; + int flags ; +} ; - errclose: - fd_close(fdhere) ; - return -1 ; +static int do_open2 (void *p) +{ + struct open2_s *b = p ; + return open2(b->file, b->flags) ; +} + +static void cancel_open2 (int fd, void *p) +{ + (void)p ; + fd_close(fd) ; +} + +int open2_at (int dirfd, char const *file, int flags) +{ + struct open2_s args = { .file = file, .flags = flags } ; + return emulate_at(dirfd, &do_open2, &cancel_open2, &args) ; } #endif diff --git a/src/libunixonacid/open3_at.c b/src/libunixonacid/open3_at.c index 742a579..a960339 100644 --- a/src/libunixonacid/open3_at.c +++ b/src/libunixonacid/open3_at.c @@ -25,38 +25,34 @@ int open3_at (int dirfd, char const *file, int flags, unsigned int mode) #else -#include <sys/stat.h> -#include <errno.h> - #include <skalibs/fcntl.h> #include <skalibs/djbunix.h> #include <skalibs/unix-transactional.h> +#include "at-internal.h" -int open3_at (int dirfd, char const *file, int flags, unsigned int mode) +struct open3_s { - int fd ; - int fdhere = open_read(".") ; - if (fdhere < 0) return -1 ; - if (fd_chdir(dirfd) < 0) goto errclose ; - fd = open3(file, flags, mode) ; - if (fd < 0) - { - int e = errno ; - fd_chdir(fdhere) ; - errno = e ; - goto errclose ; - } - if (fd_chdir(fdhere) < 0) - { - fd_close(fd) ; - goto errclose ; - } - fd_close(fdhere) ; - return fd ; + char const *file ; + int flags ; + unsigned int mode ; +} ; - errclose: - fd_close(fdhere) ; - return -1 ; +static int do_open3 (void *p) +{ + struct open3_s *b = p ; + return open3(b->file, b->flags, b->mode) ; +} + +static void cancel_open3 (int fd, void *p) +{ + (void)p ; + fd_close(fd) ; +} + +int open3_at (int dirfd, char const *file, int flags, unsigned int mode) +{ + struct open3_s args = { .file = file, .flags = flags, .mode = mode } ; + return emulate_at(dirfd, &do_open3, &cancel_open3, &args) ; } #endif diff --git a/src/libunixonacid/stat_at.c b/src/libunixonacid/stat_at.c index e4040d5..57aa8dd 100644 --- a/src/libunixonacid/stat_at.c +++ b/src/libunixonacid/stat_at.c @@ -8,10 +8,11 @@ #define _ATFILE_SOURCE #endif +#include <skalibs/bsdsnowflake.h> #include <skalibs/nonposix.h> -#include <sys/stat.h> +#include <skalibs/stat.h> #include <skalibs/fcntl.h> #include <skalibs/unix-transactional.h> @@ -27,52 +28,50 @@ int lstat_at (int dirfd, char const *file, struct stat *st) #else - /* OpenBSD plz. lstat() is POSIX. */ +#include <skalibs/bsdsnowflake.h> #include <skalibs/nonposix.h> -#include <sys/stat.h> #include <errno.h> +#include <skalibs/stat.h> #include <skalibs/fcntl.h> -#include <skalibs/djbunix.h> #include <skalibs/unix-transactional.h> +#include "at-internal.h" -static int fstat_at (int dirfd, char const *file, struct stat *st, int (*dostat)(char const *, struct stat *)) +struct stat_s { - int r ; - int fdhere = open_read(".") ; - if (fdhere < 0) return -1 ; - if (fd_chdir(dirfd) < 0) - { - fd_close(fdhere) ; - return -1 ; - } - r = (*dostat)(file, st) ; - if (r < 0) - { - int e = errno ; - fd_chdir(fdhere) ; - fd_close(fdhere) ; - errno = e ; - return -1 ; - } - if (fd_chdir(fdhere) < 0) - { - fd_close(fdhere) ; - return -1 ; - } - fd_close(fdhere) ; - return r ; + char const *file ; + struct stat *st ; +} ; + +static int do_stat (void *p) +{ + struct stat_s *b = p ; + return stat(b->file, b->st) ; +} + +static int do_lstat (void *p) +{ + struct stat_s *b = p ; + return lstat(b->file, b->st) ; +} + +static void cancel_stat (int r, void *p) +{ + (void)r ; + (void)p ; } int stat_at (int dirfd, char const *file, struct stat *st) { - return fstat_at(dirfd, file, st, &stat) ; + struct stat_s args = { .file = file, .st = st } ; + return emulate_at(dirfd, &do_stat, &cancel_stat, &args) ; } int lstat_at (int dirfd, char const *file, struct stat *st) { - return fstat_at(dirfd, file, st, &lstat) ; + struct stat_s args = { .file = file, .st = st } ; + return emulate_at(dirfd, &do_lstat, &cancel_stat, &args) ; } #endif diff --git a/src/libunixonacid/symlink_at.c b/src/libunixonacid/symlink_at.c new file mode 100644 index 0000000..4d63120 --- /dev/null +++ b/src/libunixonacid/symlink_at.c @@ -0,0 +1,60 @@ +/* ISC license. */ + +#include <skalibs/sysdeps.h> + +#ifdef SKALIBS_HASLINKAT + +#ifndef _ATFILE_SOURCE +#define _ATFILE_SOURCE +#endif + +#include <skalibs/nonposix.h> + +#include <unistd.h> +#include <errno.h> + +#include <skalibs/fcntl.h> +#include <skalibs/unix-transactional.h> + +int symlink_at (char const *src, int dirfd, char const *dst) +{ + int r ; + do r = symlinkat(src, dirfd, dst) ; + while (r == -1 && errno == EINTR) ; + return r ; +} + +#else + +#include <unistd.h> +#include <errno.h> + +#include <skalibs/posixplz.h> +#include <skalibs/unix-transactional.h> + +struct symlink_s +{ + char const *src ; + char const *dst ; +} ; + +static int do_symlink (void *p) +{ + struct symlink_s *b = p ; + return symlink(b->src, b->dst) ; +} + +static void cancel_symlink (int r, void *p) +{ + struct symlink_s *b = p ; + (void)r ; + unlink_void(b->dst) ; +} + +int symlink_at (char const *src, int dirfd, char const *dst) +{ + struct symlink_s args = { .src = src, .dst = dst } ; + return emulate_at(dirfd, &do_symlink, &cancel_symlink, &args) ; +} + +#endif |