Rewrite openwrite(v)nclose using mkstemp

12 files changed, 147 insertions, 96 deletions

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 <string.h>
+#include <errno.h>
+#include <unistd.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <skalibs/djbunix.h>
+
+#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 <sys/stat.h>
 #include <errno.h>
 #include <unistd.h>
-#include <skalibs/allreadwrite.h>
 #include <skalibs/djbunix.h>
 
 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 <sys/uio.h>
+#include <string.h>
+#include <errno.h>
+#include <unistd.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <skalibs/djbunix.h>
+
+#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 <sys/uio.h>
-#include <sys/stat.h>
 #include <errno.h>
 #include <unistd.h>
 #include <skalibs/allreadwrite.h>
-#include <skalibs/siovec.h>
 #include <skalibs/djbunix.h>
 
 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 <sys/stat.h>
+#include <errno.h>
+#include <skalibs/allreadwrite.h>
+#include <skalibs/djbunix.h>
+
+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 <sys/uio.h>
+#include <sys/stat.h>
+#include <errno.h>
+#include <skalibs/allreadwrite.h>
+#include <skalibs/siovec.h>
+#include <skalibs/djbunix.h>
+
+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 <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) ;
-}