From c365aeb0721d3749bb5f94f09a3ad97ec6131805 Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Wed, 27 Sep 2017 20:16:01 +0000 Subject: Rewrite openwrite(v)nclose using mkstemp --- package/deps.mak | 15 ++++++---- src/include/skalibs/djbunix.h | 24 ++++++++++++++++ src/include/skalibs/unix-transactional.h | 4 --- src/libstddjb/openwritenclose.c | 38 +++++++++++++++++++++++++ src/libstddjb/openwritenclose_unsafe.c | 17 +++-------- src/libstddjb/openwritevnclose.c | 39 ++++++++++++++++++++++++++ src/libstddjb/openwritevnclose_unsafe.c | 17 +++-------- src/libstddjb/writenclose_unsafe.c | 18 ++++++++++++ src/libstddjb/writevnclose_unsafe.c | 20 +++++++++++++ src/libunixonacid/openwritenclose.c | 9 ------ src/libunixonacid/openwritenclose_devino.c | 9 ------ src/libunixonacid/openwritenclose_devino_tmp.c | 37 ------------------------ src/libunixonacid/openwritenclose_tmp.c | 11 -------- 13 files changed, 156 insertions(+), 102 deletions(-) create mode 100644 src/libstddjb/openwritenclose.c create mode 100644 src/libstddjb/openwritevnclose.c create mode 100644 src/libstddjb/writenclose_unsafe.c create mode 100644 src/libstddjb/writevnclose_unsafe.c delete mode 100644 src/libunixonacid/openwritenclose.c delete mode 100644 src/libunixonacid/openwritenclose_devino.c delete mode 100644 src/libunixonacid/openwritenclose_devino_tmp.c delete mode 100644 src/libunixonacid/openwritenclose_tmp.c diff --git a/package/deps.mak b/package/deps.mak index 7f839c8..d548008 100644 --- a/package/deps.mak +++ b/package/deps.mak @@ -21,12 +21,14 @@ src/include/skalibs/djbtime.h: src/include/skalibs/tai.h src/include/skalibs/uin src/include/skalibs/djbunix.h: src/include/skalibs/env.h src/include/skalibs/envalloc.h src/include/skalibs/gccattributes.h src/include/skalibs/stralloc.h src/include/skalibs/env.h: src/include/skalibs/gccattributes.h src/include/skalibs/stralloc.h src/include/skalibs/envalloc.h: src/include/skalibs/genalloc.h +src/include/skalibs/error.h: src/include/skalibs/gccattributes.h src/include/skalibs/fmtscan.h: src/include/skalibs/gccattributes.h src/include/skalibs/genalloc.h: src/include/skalibs/functypes.h src/include/skalibs/stralloc.h src/include/skalibs/genset.h: src/include/skalibs/functypes.h src/include/skalibs/gensetdyn.h: src/include/skalibs/functypes.h src/include/skalibs/genalloc.h src/include/skalibs/stralloc.h src/include/skalibs/iobuffer.h: src/include/skalibs/buffer.h src/include/skalibs/djbunix.h src/include/skalibs/iopause.h: src/include/skalibs/tai.h +src/include/skalibs/ip46.h: src/include/skalibs/fmtscan.h src/include/skalibs/socket.h src/include/skalibs/kolbak.h: src/include/skalibs/unixmessage.h src/include/skalibs/lolstdio.h: src/include/skalibs/bufalloc.h src/include/skalibs/buffer.h src/include/skalibs/strerr2.h src/include/skalibs/mininetstring.h: src/include/skalibs/stralloc.h @@ -45,6 +47,7 @@ src/include/skalibs/stddjb.h: src/include/skalibs/alarm.h src/include/skalibs/al src/include/skalibs/strerr.h: src/include/skalibs/gccattributes.h src/include/skalibs/strerr2.h: src/include/skalibs/strerr.h src/include/skalibs/tai.h: src/include/skalibs/gccattributes.h src/include/skalibs/uint64.h +src/include/skalibs/types.h: src/include/skalibs/uint16.h src/include/skalibs/uint32.h src/include/skalibs/uint64.h src/include/skalibs/unix-timed.h: src/include/skalibs/bufalloc.h src/include/skalibs/buffer.h src/include/skalibs/functypes.h src/include/skalibs/stralloc.h src/include/skalibs/tai.h src/include/skalibs/unix-transactional.h: src/include/skalibs/stralloc.h src/include/skalibs/uint64.h src/include/skalibs/unixconnection.h: src/include/skalibs/unixmessage.h @@ -416,10 +419,12 @@ src/libstddjb/open_write.o src/libstddjb/open_write.lo: src/libstddjb/open_write src/libstddjb/openreadfileclose.o src/libstddjb/openreadfileclose.lo: src/libstddjb/openreadfileclose.c src/include/skalibs/allreadwrite.h src/include/skalibs/djbunix.h src/include/skalibs/stralloc.h src/libstddjb/openreadnclose.o src/libstddjb/openreadnclose.lo: src/libstddjb/openreadnclose.c src/include/skalibs/allreadwrite.h src/include/skalibs/djbunix.h src/libstddjb/openslurpclose.o src/libstddjb/openslurpclose.lo: src/libstddjb/openslurpclose.c src/include/skalibs/djbunix.h src/include/skalibs/stralloc.h +src/libstddjb/openwritenclose.o src/libstddjb/openwritenclose.lo: src/libstddjb/openwritenclose.c src/include/skalibs/djbunix.h src/libstddjb/openwritenclose_suffix.o src/libstddjb/openwritenclose_suffix.lo: src/libstddjb/openwritenclose_suffix.c src/include/skalibs/djbunix.h -src/libstddjb/openwritenclose_unsafe.o src/libstddjb/openwritenclose_unsafe.lo: src/libstddjb/openwritenclose_unsafe.c src/include/skalibs/allreadwrite.h src/include/skalibs/djbunix.h +src/libstddjb/openwritenclose_unsafe.o src/libstddjb/openwritenclose_unsafe.lo: src/libstddjb/openwritenclose_unsafe.c src/include/skalibs/djbunix.h +src/libstddjb/openwritevnclose.o src/libstddjb/openwritevnclose.lo: src/libstddjb/openwritevnclose.c src/include/skalibs/djbunix.h src/libstddjb/openwritevnclose_suffix.o src/libstddjb/openwritevnclose_suffix.lo: src/libstddjb/openwritevnclose_suffix.c src/include/skalibs/djbunix.h -src/libstddjb/openwritevnclose_unsafe.o src/libstddjb/openwritevnclose_unsafe.lo: src/libstddjb/openwritevnclose_unsafe.c src/include/skalibs/allreadwrite.h src/include/skalibs/djbunix.h src/include/skalibs/siovec.h +src/libstddjb/openwritevnclose_unsafe.o src/libstddjb/openwritevnclose_unsafe.lo: src/libstddjb/openwritevnclose_unsafe.c src/include/skalibs/allreadwrite.h src/include/skalibs/djbunix.h src/libstddjb/pathexec.o src/libstddjb/pathexec.lo: src/libstddjb/pathexec.c src/include/skalibs/djbunix.h src/include/skalibs/env.h src/include/skalibs/environ.h src/libstddjb/pathexec0.o src/libstddjb/pathexec0.lo: src/libstddjb/pathexec0.c src/include/skalibs/djbunix.h src/libstddjb/pathexec0_run.o src/libstddjb/pathexec0_run.lo: src/libstddjb/pathexec0_run.c src/include/skalibs/djbunix.h @@ -671,6 +676,8 @@ src/libstddjb/wait_reap.o src/libstddjb/wait_reap.lo: src/libstddjb/wait_reap.c src/libstddjb/waitn.o src/libstddjb/waitn.lo: src/libstddjb/waitn.c src/include/skalibs/djbunix.h src/libstddjb/waitn_reap.o src/libstddjb/waitn_reap.lo: src/libstddjb/waitn_reap.c src/include/skalibs/djbunix.h src/libstddjb/waitpid_nointr.o src/libstddjb/waitpid_nointr.lo: src/libstddjb/waitpid_nointr.c src/include/skalibs/djbunix.h +src/libstddjb/writenclose_unsafe.o src/libstddjb/writenclose_unsafe.lo: src/libstddjb/writenclose_unsafe.c src/include/skalibs/allreadwrite.h src/include/skalibs/djbunix.h +src/libstddjb/writevnclose_unsafe.o src/libstddjb/writevnclose_unsafe.lo: src/libstddjb/writevnclose_unsafe.c src/include/skalibs/allreadwrite.h src/include/skalibs/djbunix.h src/include/skalibs/siovec.h src/libstddjb/xexecvep.o src/libstddjb/xexecvep.lo: src/libstddjb/xexecvep.c src/include/skalibs/djbunix.h src/include/skalibs/strerr2.h src/libstddjb/xpathexec.o src/libstddjb/xpathexec.lo: src/libstddjb/xpathexec.c src/include/skalibs/djbunix.h src/include/skalibs/strerr2.h src/libstddjb/xpathexec0.o src/libstddjb/xpathexec0.lo: src/libstddjb/xpathexec0.c src/include/skalibs/djbunix.h src/include/skalibs/strerr2.h @@ -713,11 +720,7 @@ src/libunixonacid/opengetlnclose.o src/libunixonacid/opengetlnclose.lo: src/libu src/libunixonacid/opengetlnclose_at.o src/libunixonacid/opengetlnclose_at.lo: src/libunixonacid/opengetlnclose_at.c src/include/skalibs/allreadwrite.h src/include/skalibs/buffer.h src/include/skalibs/djbunix.h src/include/skalibs/skamisc.h src/include/skalibs/unix-transactional.h src/libunixonacid/openreadnclose_at.o src/libunixonacid/openreadnclose_at.lo: src/libunixonacid/openreadnclose_at.c src/include/skalibs/allreadwrite.h src/include/skalibs/djbunix.h src/include/skalibs/unix-transactional.h src/libunixonacid/openslurpclose_at.o src/libunixonacid/openslurpclose_at.lo: src/libunixonacid/openslurpclose_at.c src/include/skalibs/djbunix.h src/include/skalibs/unix-transactional.h -src/libunixonacid/openwritenclose.o src/libunixonacid/openwritenclose.lo: src/libunixonacid/openwritenclose.c src/include/skalibs/skamisc.h src/include/skalibs/unix-transactional.h src/libunixonacid/openwritenclose_at.o src/libunixonacid/openwritenclose_at.lo: src/libunixonacid/openwritenclose_at.c src/include/skalibs/allreadwrite.h src/include/skalibs/djbunix.h src/include/skalibs/unix-transactional.h -src/libunixonacid/openwritenclose_devino.o src/libunixonacid/openwritenclose_devino.lo: src/libunixonacid/openwritenclose_devino.c src/include/skalibs/skamisc.h src/include/skalibs/unix-transactional.h -src/libunixonacid/openwritenclose_devino_tmp.o src/libunixonacid/openwritenclose_devino_tmp.lo: src/libunixonacid/openwritenclose_devino_tmp.c src/include/skalibs/djbunix.h src/include/skalibs/random.h src/include/skalibs/stralloc.h src/include/skalibs/types.h src/include/skalibs/unix-transactional.h -src/libunixonacid/openwritenclose_tmp.o src/libunixonacid/openwritenclose_tmp.lo: src/libunixonacid/openwritenclose_tmp.c src/include/skalibs/unix-transactional.h src/libunixonacid/openwritevnclose_at.o src/libunixonacid/openwritevnclose_at.lo: src/libunixonacid/openwritevnclose_at.c src/include/skalibs/allreadwrite.h src/include/skalibs/djbunix.h src/include/skalibs/siovec.h src/include/skalibs/unix-transactional.h src/libunixonacid/skaclient_default_cb.o src/libunixonacid/skaclient_default_cb.lo: src/libunixonacid/skaclient_default_cb.c src/include/skalibs/error.h src/include/skalibs/skaclient.h src/include/skalibs/unixmessage.h src/libunixonacid/skaclient_end.o src/libunixonacid/skaclient_end.lo: src/libunixonacid/skaclient_end.c src/include/skalibs/djbunix.h src/include/skalibs/skaclient.h src/include/skalibs/unixmessage.h diff --git a/src/include/skalibs/djbunix.h b/src/include/skalibs/djbunix.h index 757852c..f4cac8a 100644 --- a/src/include/skalibs/djbunix.h +++ b/src/include/skalibs/djbunix.h @@ -107,6 +107,12 @@ extern ssize_t openreadnclose (char const *, char *, size_t) ; extern ssize_t openreadnclose_nb (char const *, char *, size_t) ; extern int openreadfileclose (char const *, stralloc *, size_t) ; +#define writenclose_unsafe(fd, s, n) writenclose_unsafe_internal(fd, s, (n), 0, 0, 0) +#define writenclose_unsafe_sync(fd, s, n) writenclose_unsafe_internal(fd, s, (n), 0, 0, 1) +#define writenclose_unsafe_devino(fd, s, n, dev, ino) writenclose_unsafe_internal(fd, s, n, dev, (ino), 0) +#define writenclose_unsafe_devino_sync(fd, s, n, dev, ino) writenclose_unsafe_internal(fd, s, n, dev, (ino), 1) +extern int writenclose_unsafe_internal (int, char const *, size_t, dev_t *, ino_t *, int) ; + #define openwritenclose_unsafe(f, s, n) openwritenclose_unsafe_internal(f, s, (n), 0, 0, 0) #define openwritenclose_unsafe_sync(f, s, n) openwritenclose_unsafe_internal(f, s, (n), 0, 0, 1) #define openwritenclose_unsafe_devino(f, s, n, dev, ino) openwritenclose_unsafe_internal(f, s, n, dev, (ino), 0) @@ -119,6 +125,18 @@ extern int openwritenclose_unsafe_internal (char const *, char const *, size_t, #define openwritenclose_suffix_devino_sync(f, s, n, t, dev, ino) openwritenclose_suffix_internal(f, s, n, dev, (ino), 1, t) extern int openwritenclose_suffix_internal (char const *, char const *, size_t, dev_t *, ino_t *, int, char const *) ; +#define openwritenclose(f, s, n) openwritenclose_internal(f, s, (n), 0, 0, 0) +#define openwritenclose_sync(f, s, n) openwritenclose_internal(f, s, (n), 0, 0, 1) +#define openwritenclose_devino(f, s, n, dev, ino) openwritenclose_internal(f, s, n, dev, (ino), 0) +#define openwritenclose_devino_sync(f, s, n, dev, ino) openwritenclose_internal(f, s, n, dev, (ino), 1) +extern int openwritenclose_internal (char const *, char const *, size_t, dev_t *, ino_t *, int) ; + +#define writenvclose_unsafe(fd, v, n) writevnclose_unsafe_internal(fd, v, (n), 0, 0, 0) +#define writevnclose_unsafe_sync(fd, v, n) writevnclose_unsafe_internal(fd, v, (n), 0, 0, 1) +#define writevnclose_unsafe_devino(fd, v, n, dev, ino) writevnclose_unsafe_internal(fd, v, n, dev, (ino), 0) +#define writevnclose_unsafe_devino_sync(fd, v, n, dev, ino) writevnclose_unsafe_internal(fd, v, n, dev, (ino), 1) +extern int writevnclose_unsafe_internal (int, struct iovec const *, unsigned int, dev_t *, ino_t *, int) ; + #define openwritevnclose_unsafe(f, v, n) openwritevnclose_unsafe_internal(f, v, (n), 0, 0, 0) #define openwritevnclose_unsafe_sync(f, v, n) openwritevnclose_unsafe_internal(f, v, (n), 0, 0, 1) #define openwritevnclose_unsafe_devino(f, v, n, dev, ino) openwritevnclose_unsafe_internal(f, v, n, dev, (ino), 0) @@ -131,6 +149,12 @@ extern int openwritevnclose_unsafe_internal (char const *, struct iovec const *, #define openwritevnclose_suffix_devino_sync(f, v, n, t, dev, ino) openwritevnclose_suffix_internal(f, v, n, dev, (ino), 1, t) extern int openwritevnclose_suffix_internal (char const *, struct iovec const *, unsigned int, dev_t *, ino_t *, int, char const *) ; +#define openwritevnclose(f, v, n) openwritevnclose_internal(f, v, (n), 0, 0, 0) +#define openwritevnclose_sync(f, v, n) openwritevnclose_internal(f, v, (n), 0, 0, 1) +#define openwritevnclose_devino(f, v, n, dev, ino) openwritevnclose_internal(f, v, n, dev, (ino), 0) +#define openwritevnclose_devino_sync(f, v, n, dev, ino) openwritevnclose_internal(f, v, n, dev, (ino), 1) +extern int openwritevnclose_internal (char const *, struct iovec const *, unsigned int, dev_t *, ino_t *, int) ; + extern int rm_rf (char const *) ; extern int rm_rf_tmp (char const *, stralloc *) ; extern int rm_rf_in_tmp (stralloc *, size_t) ; /* caution ! */ diff --git a/src/include/skalibs/unix-transactional.h b/src/include/skalibs/unix-transactional.h index a2f56e8..5f1dd90 100644 --- a/src/include/skalibs/unix-transactional.h +++ b/src/include/skalibs/unix-transactional.h @@ -32,10 +32,6 @@ extern size_t openreadnclose_at (int, char const *, char *, size_t) ; extern int openslurpclose_at (int, char const *, stralloc *) ; extern int opengetlnclose_at (int, char const *, stralloc *, int) ; -extern int openwritenclose (char const *, char const *, size_t) ; -extern int openwritenclose_devino (char const *, char const *, size_t, dev_t *, ino_t *) ; -extern int openwritenclose_tmp (char const *, char const *, size_t, stralloc *) ; -extern int openwritenclose_devino_tmp (char const *, char const *, size_t, dev_t *, ino_t *, stralloc *) ; extern size_t openwritenclose_at (int, char const *, char const *, size_t) ; extern size_t openwritevnclose_at (int, char const *, struct iovec const *, unsigned int) ; diff --git a/src/libstddjb/openwritenclose.c b/src/libstddjb/openwritenclose.c new file mode 100644 index 0000000..427e53e --- /dev/null +++ b/src/libstddjb/openwritenclose.c @@ -0,0 +1,38 @@ +/* ISC license. */ + +#include +#include +#include +#include +#include +#include + +#define SUFFIX ":skalibs-openwritenclose:XXXXXX" + +int openwritenclose_internal (char const *fn, char const *s, size_t n, dev_t *dev, ino_t *ino, int dosync) +{ + dev_t tmpdev ; + ino_t tmpino ; + size_t fnlen = strlen(fn) ; + int fd ; + char tmp[fnlen + sizeof(SUFFIX)] ; + memcpy(tmp, fn, fnlen) ; + memcpy(tmp + fnlen, SUFFIX, sizeof(SUFFIX)) ; + fd = mkstemp(tmp) ; + if (fd < 0) return 0 ; + if (!writenclose_unsafe_internal(fd, s, n, dev ? &tmpdev : 0, ino ? &tmpino : 0, dosync)) goto failclose ; + if (rename(tmp, fn) < 0) goto fail ; + if (dev) *dev = tmpdev ; + if (ino) *ino = tmpino ; + return 1 ; + + failclose: + fd_close(fd) ; + fail: + { + int e = errno ; + unlink(tmp) ; + errno = e ; + } + return 0 ; +} diff --git a/src/libstddjb/openwritenclose_unsafe.c b/src/libstddjb/openwritenclose_unsafe.c index 3aebd97..e5ac260 100644 --- a/src/libstddjb/openwritenclose_unsafe.c +++ b/src/libstddjb/openwritenclose_unsafe.c @@ -1,30 +1,21 @@ /* ISC license. */ -#include #include #include -#include #include int openwritenclose_unsafe_internal (char const *fn, char const *s, size_t len, dev_t *dev, ino_t *ino, int dosync) { - struct stat st ; int fd = open_trunc(fn) ; if (fd < 0) return 0 ; - if (allwrite(fd, s, len) < len) goto fail ; - if ((dev || ino) && (fstat(fd, &st) < 0)) goto fail ; - if (dosync && (fd_sync(fd) < 0) && (errno != EINVAL)) goto fail ; - fd_close(fd) ; - if (dev) *dev = st.st_dev ; - if (ino) *ino = st.st_ino ; - return 1 ; - - fail: + if (!writenclose_unsafe_internal(fd, s, len, dev, ino, dosync)) { int e = errno ; fd_close(fd) ; unlink(fn) ; errno = e ; + return 0 ; } - return 0 ; + fd_close(fd) ; + return 1 ; } diff --git a/src/libstddjb/openwritevnclose.c b/src/libstddjb/openwritevnclose.c new file mode 100644 index 0000000..01df3e3 --- /dev/null +++ b/src/libstddjb/openwritevnclose.c @@ -0,0 +1,39 @@ +/* ISC license. */ + +#include +#include +#include +#include +#include +#include +#include + +#define SUFFIX ":skalibs-openwritevnclose:XXXXXX" + +int openwritevnclose_internal (char const *fn, struct iovec const *v, unsigned int vlen, dev_t *dev, ino_t *ino, int dosync) +{ + dev_t tmpdev ; + ino_t tmpino ; + size_t fnlen = strlen(fn) ; + int fd ; + char tmp[fnlen + sizeof(SUFFIX)] ; + memcpy(tmp, fn, fnlen) ; + memcpy(tmp + fnlen, SUFFIX, sizeof(SUFFIX)) ; + fd = mkstemp(tmp) ; + if (fd < 0) return 0 ; + if (!writevnclose_unsafe_internal(fd, v, vlen, dev ? &tmpdev : 0, ino ? &tmpino : 0, dosync)) goto failclose ; + if (rename(tmp, fn) < 0) goto fail ; + if (dev) *dev = tmpdev ; + if (ino) *ino = tmpino ; + return 1 ; + + failclose: + fd_close(fd) ; + fail: + { + int e = errno ; + unlink(tmp) ; + errno = e ; + } + return 0 ; +} diff --git a/src/libstddjb/openwritevnclose_unsafe.c b/src/libstddjb/openwritevnclose_unsafe.c index 4bc7b2b..ddcbfd3 100644 --- a/src/libstddjb/openwritevnclose_unsafe.c +++ b/src/libstddjb/openwritevnclose_unsafe.c @@ -1,32 +1,23 @@ /* ISC license. */ #include -#include #include #include #include -#include #include int openwritevnclose_unsafe_internal (char const *fn, struct iovec const *v, unsigned int vlen, dev_t *dev, ino_t *ino, int dosync) { - struct stat st ; int fd = open_trunc(fn) ; if (fd < 0) return 0 ; - if (allwritev(fd, v, vlen) < siovec_len(v, vlen)) goto fail ; - if ((dev || ino) && (fstat(fd, &st) < 0)) goto fail ; - if (dosync && (fd_sync(fd) < 0) && (errno != EINVAL)) goto fail ; - fd_close(fd) ; - if (dev) *dev = st.st_dev ; - if (ino) *ino = st.st_ino ; - return 1 ; - - fail: + if (!writevnclose_unsafe_internal(fd, v, vlen, dev, ino, dosync)) { int e = errno ; fd_close(fd) ; unlink(fn) ; errno = e ; + return 0 ; } - return 0 ; + fd_close(fd) ; + return 1 ; } diff --git a/src/libstddjb/writenclose_unsafe.c b/src/libstddjb/writenclose_unsafe.c new file mode 100644 index 0000000..f71caea --- /dev/null +++ b/src/libstddjb/writenclose_unsafe.c @@ -0,0 +1,18 @@ +/* ISC license. */ + +#include +#include +#include +#include + +int writenclose_unsafe_internal (int fd, char const *s, size_t len, dev_t *dev, ino_t *ino, int dosync) +{ + struct stat st ; + if (allwrite(fd, s, len) < len) return 0 ; + if ((dev || ino) && (fstat(fd, &st) < 0)) return 0 ; + if (dosync && (fd_sync(fd) < 0) && (errno != EINVAL)) return 0 ; + fd_close(fd) ; + if (dev) *dev = st.st_dev ; + if (ino) *ino = st.st_ino ; + return 1 ; +} diff --git a/src/libstddjb/writevnclose_unsafe.c b/src/libstddjb/writevnclose_unsafe.c new file mode 100644 index 0000000..9d2348a --- /dev/null +++ b/src/libstddjb/writevnclose_unsafe.c @@ -0,0 +1,20 @@ +/* ISC license. */ + +#include +#include +#include +#include +#include +#include + +int writevnclose_unsafe_internal (int fd, struct iovec const *v, unsigned int vlen, dev_t *dev, ino_t *ino, int dosync) +{ + struct stat st ; + if (allwritev(fd, v, vlen) < siovec_len(v, vlen)) return 0 ; + if ((dev || ino) && (fstat(fd, &st) < 0)) return 0 ; + if (dosync && (fd_sync(fd) < 0) && (errno != EINVAL)) return 0 ; + fd_close(fd) ; + if (dev) *dev = st.st_dev ; + if (ino) *ino = st.st_ino ; + return 1 ; +} diff --git a/src/libunixonacid/openwritenclose.c b/src/libunixonacid/openwritenclose.c deleted file mode 100644 index d8dc174..0000000 --- a/src/libunixonacid/openwritenclose.c +++ /dev/null @@ -1,9 +0,0 @@ -/* ISC license. */ - -#include -#include - -int openwritenclose (char const *fn, char const *s, size_t len) -{ - return openwritenclose_tmp(fn, s, len, &satmp) ; -} diff --git a/src/libunixonacid/openwritenclose_devino.c b/src/libunixonacid/openwritenclose_devino.c deleted file mode 100644 index 5a9c38d..0000000 --- a/src/libunixonacid/openwritenclose_devino.c +++ /dev/null @@ -1,9 +0,0 @@ -/* ISC license. */ - -#include -#include - -int openwritenclose_devino (char const *fn, char const *s, size_t len, dev_t *dev, ino_t *ino) -{ - return openwritenclose_devino_tmp(fn, s, len, dev, ino, &satmp) ; -} diff --git a/src/libunixonacid/openwritenclose_devino_tmp.c b/src/libunixonacid/openwritenclose_devino_tmp.c deleted file mode 100644 index 49eec93..0000000 --- a/src/libunixonacid/openwritenclose_devino_tmp.c +++ /dev/null @@ -1,37 +0,0 @@ -/* ISC license. */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -int openwritenclose_devino_tmp (char const *fn, char const *s, size_t len, dev_t *dev, ino_t *ino, stralloc *tmp) -{ - dev_t tmpdev ; - ino_t tmpino ; - size_t base = tmp->len ; - if (!stralloc_cats(tmp, fn)) return 0 ; - if (!random_sauniquename(tmp, 8)) goto fail ; - if (!stralloc_0(tmp)) goto fail ; - if (!openwritenclose_unsafe_devino_sync(tmp->s + base, s, len, &tmpdev, &tmpino)) goto fail ; - if (rename(tmp->s + base, fn) < 0) - { - int e = errno ; - unlink(tmp->s + base) ; - errno = e ; - goto fail ; - } - tmp->len = base ; - *dev = tmpdev ; - *ino = tmpino ; - return 1 ; - - fail: - tmp->len = base ; - return 0 ; -} diff --git a/src/libunixonacid/openwritenclose_tmp.c b/src/libunixonacid/openwritenclose_tmp.c deleted file mode 100644 index a8cb78f..0000000 --- a/src/libunixonacid/openwritenclose_tmp.c +++ /dev/null @@ -1,11 +0,0 @@ -/* ISC license. */ - -#include -#include - -int openwritenclose_tmp (char const *fn, char const *s, size_t len, stralloc *tmp) -{ - dev_t dev ; - ino_t ino ; - return openwritenclose_devino_tmp(fn, s, len, &dev, &ino, tmp) ; -} -- cgit v1.2.3