diff options
author | Laurent Bercot <ska-skaware@skarnet.org> | 2017-09-27 20:16:01 +0000 |
---|---|---|
committer | Laurent Bercot <ska-skaware@skarnet.org> | 2017-09-27 20:16:01 +0000 |
commit | c365aeb0721d3749bb5f94f09a3ad97ec6131805 (patch) | |
tree | 0a63fa2d7c499b6e835d5665438f1f67cd7db494 /src/libunixonacid | |
parent | 1728f7ed8e96a03dd6a75c9668d394562ed63a59 (diff) | |
download | skalibs-c365aeb0721d3749bb5f94f09a3ad97ec6131805.tar.xz |
Rewrite openwrite(v)nclose using mkstemp
Diffstat (limited to 'src/libunixonacid')
-rw-r--r-- | src/libunixonacid/openwritenclose.c | 9 | ||||
-rw-r--r-- | src/libunixonacid/openwritenclose_devino.c | 9 | ||||
-rw-r--r-- | src/libunixonacid/openwritenclose_devino_tmp.c | 37 | ||||
-rw-r--r-- | src/libunixonacid/openwritenclose_tmp.c | 11 |
4 files changed, 0 insertions, 66 deletions
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 <skalibs/skamisc.h> -#include <skalibs/unix-transactional.h> - -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 <skalibs/skamisc.h> -#include <skalibs/unix-transactional.h> - -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 <sys/types.h> -#include <errno.h> -#include <unistd.h> -#include <stdio.h> -#include <skalibs/types.h> -#include <skalibs/stralloc.h> -#include <skalibs/djbunix.h> -#include <skalibs/random.h> -#include <skalibs/unix-transactional.h> - -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 <sys/types.h> -#include <skalibs/unix-transactional.h> - -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) ; -} |