summaryrefslogtreecommitdiff
path: root/src/libunixonacid
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2015-08-13 12:02:12 +0000
committerLaurent Bercot <ska-skaware@skarnet.org>2015-08-13 12:02:12 +0000
commit65d71ab4b780a5d18a8146eb4567eb8a9105f4fe (patch)
tree93dae694b1fd6917176711e467f4f3efab16d1e9 /src/libunixonacid
parent01dc2086a7b722133ce6d1582e4226942d590cb0 (diff)
downloadskalibs-65d71ab4b780a5d18a8146eb4567eb8a9105f4fe.tar.xz
Add atomic_rm_rf and atomic_rm_rf_tmp
Diffstat (limited to 'src/libunixonacid')
-rw-r--r--src/libunixonacid/atomic_rm_rf.c9
-rw-r--r--src/libunixonacid/atomic_rm_rf_tmp.c32
-rw-r--r--src/libunixonacid/mkdir_unique.c4
3 files changed, 43 insertions, 2 deletions
diff --git a/src/libunixonacid/atomic_rm_rf.c b/src/libunixonacid/atomic_rm_rf.c
new file mode 100644
index 0000000..b7f157b
--- /dev/null
+++ b/src/libunixonacid/atomic_rm_rf.c
@@ -0,0 +1,9 @@
+/* ISC license. */
+
+#include <skalibs/skamisc.h>
+#include <skalibs/unix-transactional.h>
+
+int atomic_rm_rf (char const *filename)
+{
+ return atomic_rm_rf_tmp(filename, &satmp) ;
+}
diff --git a/src/libunixonacid/atomic_rm_rf_tmp.c b/src/libunixonacid/atomic_rm_rf_tmp.c
new file mode 100644
index 0000000..8be5189
--- /dev/null
+++ b/src/libunixonacid/atomic_rm_rf_tmp.c
@@ -0,0 +1,32 @@
+/* ISC license. */
+
+#include <errno.h>
+#include <stdio.h>
+#include <skalibs/stralloc.h>
+#include <skalibs/djbunix.h>
+#include <skalibs/random.h>
+#include <skalibs/unix-transactional.h>
+
+int atomic_rm_rf_tmp (char const *filename, stralloc *tmp)
+{
+ unsigned int tmpbase = tmp->len ;
+ unsigned int start ;
+ if (!stralloc_cats(tmp, ".skalibs-rmrf-")
+ || !stralloc_cats(tmp, filename)) return -1 ;
+ start = tmp->len ;
+ for (;;)
+ {
+ if (random_sauniquename(tmp, 64) < 0) goto err ;
+ if (!stralloc_0(tmp)) goto err ;
+ if (!rename(filename, tmp->s + tmpbase)) break ;
+ if (errno != EEXIST && errno != ENOTEMPTY) goto err ;
+ tmp->len = start ;
+ }
+ if (rm_rf_in_tmp(tmp, tmpbase) < 0) goto err ;
+ tmp->len = tmpbase ;
+ return 0 ;
+
+err:
+ tmp->len = tmpbase ;
+ return -1 ;
+}
diff --git a/src/libunixonacid/mkdir_unique.c b/src/libunixonacid/mkdir_unique.c
index 523ecef..efc74cc 100644
--- a/src/libunixonacid/mkdir_unique.c
+++ b/src/libunixonacid/mkdir_unique.c
@@ -10,8 +10,8 @@ int mkdir_unique (stralloc *sa, char const *fn, unsigned int mode)
unsigned int base = sa->len ;
int wasnull = !sa->s ;
if (!stralloc_cats(sa, fn)) return 0 ;
- if (!stralloc_cats(sa, "/mkdir_unique")) goto fail ;
- if (random_sauniquename(sa, 8) < 0) goto fail ;
+ if (!stralloc_cats(sa, "/mkdir_unique:")) goto fail ;
+ if (random_sauniquename(sa, 64) < 0) goto fail ;
if (!stralloc_0(sa)) goto fail ;
if (mkdir(sa->s + base, mode) < 0) goto fail ;
sa->len-- ;