Move strlcpy_no_slash() to libsudo_iolog to sudo_logsrvd can use it.

Author: millert

include/sudo_iolog.h

@@ -103,6 +103,7 @@ bool iolog_parse_host_port(char *str, char **hostp, char **portp, bool *tlsp, co
 
 /* iolog_path.c */
 bool expand_iolog_path(const char *inpath, char *path, size_t pathlen, const struct iolog_path_escape *escapes, void *closure);
+size_t strlcpy_no_slash(char * restrict dst, const char * restrict src, size_t size);
 
 /* iolog_util.c */
 bool iolog_parse_timing(const char *line, struct timing_closure *timing);

lib/iolog/iolog_path.c

@@ -123,3 +123,29 @@ expand_iolog_path(const char *inpath, char *path, size_t pathlen,
 bad:
     debug_return_bool(false);
 }
+
+/*
+ * Like strlcpy(3) but replaces '/' with '_'.
+ */
+size_t
+strlcpy_no_slash(char * restrict dst, const char * restrict src, size_t size)
+{
+    size_t len = 0;
+    char ch;
+    debug_decl(strlcpy_no_slash, SUDO_DEBUG_UTIL);
+
+    while ((ch = *src++) != '\0') {
+	if (size > 1) {
+	    /* Replace '/' with '_' */
+	    if (ch == '/')
+		ch = '_';
+	    *dst++ = ch;
+	    size--;
+	}
+	len++;
+    }
+    if (size > 0)
+	*dst = '\0';
+
+    debug_return_size_t(len);
+}

plugins/sudoers/iolog_path_escapes.c

@@ -28,32 +28,6 @@
 #include <sudoers.h>
 #include <sudo_iolog.h>
 
-/*
- * Like strlcpy(3) but replaces '/' with '_'.
- */
-static size_t
-strlcpy_no_slash(char * restrict dst, const char * restrict src, size_t size)
-{
-    size_t len = 0;
-    char ch;
-    debug_decl(strlcpy_no_slash, SUDOERS_DEBUG_UTIL);
-
-    while ((ch = *src++) != '\0') {
-	if (size > 1) {
-	    /* Replace '/' with '_' */
-	    if (ch == '/')
-		ch = '_';
-	    *dst++ = ch;
-	    size--;
-	}
-	len++;
-    }
-    if (size > 0)
-	*dst = '\0';
-
-    debug_return_size_t(len);
-}
-
 static size_t
 fill_seq(char * restrict str, size_t strsize, void * restrict v)
 {