From 41dec6436242c4daccdd9fdee3ac052004c439bd Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Mon, 16 Mar 2026 21:09:38 +0000
Subject:  Refactor ftrig using sass; clean up API a bit, update its users

---
 src/libs6/ftrigw_clean.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'src/libs6/ftrigw_clean.c')

diff --git a/src/libs6/ftrigw_clean.c b/src/libs6/ftrigw_clean.c
index e540aba..301fd39 100644
--- a/src/libs6/ftrigw_clean.c
+++ b/src/libs6/ftrigw_clean.c
@@ -3,21 +3,22 @@
 #include <string.h>
 #include <unistd.h>
 #include <errno.h>
+
+#include <skalibs/posixplz.h>
 #include <skalibs/direntry.h>
 #include <skalibs/djbunix.h>
-#include "ftrig1.h"
+
 #include <s6/ftrigw.h>
 
 int ftrigw_clean (char const *path)
 {
   size_t pathlen = strlen(path) ;
-  int e = 0 ;
   DIR *dir = opendir(path) ;
   if (!dir) return 0 ;
   {
-    char tmp[pathlen + FTRIG1_PREFIXLEN + 35] ;
+    char tmp[pathlen + 41] ;
     memcpy(tmp, path, pathlen) ;
-    tmp[pathlen] = '/' ; tmp[pathlen + FTRIG1_PREFIXLEN + 34] = 0 ;
+    tmp[pathlen] = '/' ; tmp[pathlen + 40] = 0 ;
     for (;;)
     {
       direntry *d ;
@@ -25,15 +26,14 @@ int ftrigw_clean (char const *path)
       errno = 0 ;
       d = readdir(dir) ;
       if (!d) break ;
-      if (strncmp(d->d_name, FTRIG1_PREFIX, FTRIG1_PREFIXLEN)) continue ;
-      if (strlen(d->d_name) != FTRIG1_PREFIXLEN + 33) continue ;
-      memcpy(tmp + pathlen + 1, d->d_name, FTRIG1_PREFIXLEN + 33) ;
+      if (strncmp(d->d_name, "ftrig1", 6)) continue ;
+      if (strlen(d->d_name) != 39) continue ;
+      memcpy(tmp + pathlen + 1, d->d_name, 39) ;
       fd = open_write(tmp) ;
       if (fd >= 0) fd_close(fd) ;
-      else if ((errno == ENXIO) && (unlink(tmp) < 0)) e = errno ;
+      else if (errno == ENXIO) unlink_void(tmp) ;
     }
   }
   dir_close(dir) ;
-  if (errno) e = errno ;
-  return e ? (errno = e, 0) : 1 ;
+  return !errno ;
 }
-- 
cgit v1.3.1