feat: Add lws_dir_du_cb for du-like functionality

Co-developed-by: Gemini 2.5 Pro

Author: lws-team

include/libwebsockets/lws-misc.h

@@ -822,6 +822,34 @@ lws_dir(const char *dirpath, void *user, lws_dir_callback_function cb);
 LWS_VISIBLE LWS_EXTERN int
 lws_dir_rm_rf_cb(const char *dirpath, void *user, struct lws_dir_entry *lde);
 
+
+/**
+ * lws_dir_du_t: context for lws_dir_du_cb()
+ *
+ * It's zeroed before starting the lws_dir() walk.
+ */
+
+typedef struct lws_dir_du {
+	uint64_t			size_in_bytes;
+	uint32_t			count_files;
+} lws_dir_du_t;
+
+/**
+ * lws_dir_du_cb() - callback for lws_dir that performs recursive du
+ *
+ * \param dirpath: directory we are at in lws_dir
+ * \param user: pointer to a lws_dir_du_t to collate the results in
+ * \param lde: lws_dir info on the file or directory we are at
+ *
+ * This is a readymade du -b callback for use with lws_dir.  It recursively
+ * sums the sizes of all files it finds and the count of files.  The user
+ an
+ * lws_dir_du_t struct should be zeroed before starting the walk.
+ */
+LWS_VISIBLE LWS_EXTERN int
+lws_dir_du_cb(const char *dirpath, void *user, struct lws_dir_entry *lde);
+
+
 /*
  * We pass every file in the base dir through a filter, and call back on the
  * ones that match.  Directories are ignored.

lib/misc/dir.c

@@ -209,6 +209,37 @@ lws_dir_glob_check(const char *nm, const char *filt)
 	return 0;
 }
 
+int
+lws_dir_du_cb(const char *dirpath, void *user, struct lws_dir_entry *lde)
+{
+	lws_dir_du_t *du = (lws_dir_du_t *)user;
+	char path[384];
+	struct stat s;
+
+	if (!strcmp(lde->name, ".") || !strcmp(lde->name, ".."))
+		return 0;
+
+	lws_snprintf(path, sizeof(path), "%s%c%s", dirpath, csep, lde->name);
+
+	if (lde->type == LDOT_DIR) {
+		lws_dir(path, user, lws_dir_du_cb);
+
+		return 0;
+	}
+
+	if (lde->type == LDOT_FILE) {
+		if (stat(path, &s))
+			lwsl_warn("%s: stat %s failed %d\n", __func__,
+				  path, errno);
+		else {
+			du->size_in_bytes += (uint64_t)s.st_size;
+			du->count_files++;
+		}
+	}
+
+	return 0;
+}
+
 /*
  * We get passed a single filter string, like "*.txt" or "mydir/\*.rpm" or so.
  */

minimal-examples-lowlevel/api-tests/api-test-dir/CMakeLists.txt

@@ -0,0 +1,25 @@
+project(lws-api-test-dir C)
+cmake_minimum_required(VERSION 3.10)
+find_package(libwebsockets CONFIG REQUIRED)
+list(APPEND CMAKE_MODULE_PATH ${LWS_CMAKE_DIR})
+include(CheckCSourceCompiles)
+include(LwsCheckRequirements)
+
+set(SAMP lws-api-test-dir)
+set(SRCS main.c )
+
+set(requirements 1)
+require_lws_config(LWS_WITH_DIR 1 requirements)
+
+if (requirements)
+
+	add_executable(${SAMP} ${SRCS})
+	add_test(NAME api-test-dir COMMAND ${SAMP})
+
+	if (websockets_shared)
+		target_link_libraries(${SAMP} websockets_shared ${LIBWEBSOCKETS_DEP_LIBS})
+		add_dependencies(${SAMP} websockets_shared)
+	else()
+		target_link_libraries(${SAMP} websockets ${LIBWEBSOCKETS_DEP_LIBS})
+	endif()
+endif()

minimal-examples-lowlevel/api-tests/api-test-dir/main.c

@@ -0,0 +1,110 @@
+/*
+ * lws-api-test-dir
+ *
+ * Written in 2010-2019 by Andy Green <andy@warmcat.com>
+ *
+ * This file is made available under the Creative Commons CC0 1.0
+ * Universal Public Domain Dedication.
+ */
+
+#include <libwebsockets.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+
+#if defined(WIN32)
+#include <direct.h>
+#define mkdir(x,y) _mkdir(x)
+#define rmdir _rmdir
+#endif
+
+static int
+create_file(const char *path, size_t size)
+{
+	int fd = lws_open(path, O_CREAT | O_WRONLY | O_TRUNC, 0600);
+	char buf[1024];
+	size_t s = size;
+
+	if (fd < 0)
+		return 1;
+
+	memset(buf, 'A', sizeof(buf));
+
+	while (s) {
+		size_t w = sizeof(buf);
+		if (w > s)
+			w = s;
+		if (write(fd, buf, w) != (ssize_t)w) {
+			close(fd);
+			return 1;
+		}
+		s -= w;
+	}
+
+	close(fd);
+
+	return 0;
+}
+
+int main(int argc, const char **argv)
+{
+	int logs = LLL_USER | LLL_ERR | LLL_WARN | LLL_NOTICE;
+	lws_dir_du_t du;
+	int result = 0;
+
+	lwsl_user("lws-api-test-dir\n");
+	lws_set_log_level(logs, NULL);
+	lwsl_user("LWS API selftest: lws_dir du\n");
+
+	/* Create test directory structure */
+	mkdir("./test-dir", 0700);
+	mkdir("./test-dir/subdir", 0700);
+
+	if (create_file("./test-dir/file1", 10)) {
+		lwsl_err("Failed to create file1\n");
+		result = 1;
+		goto cleanup;
+	}
+	if (create_file("./test-dir/file2", 20)) {
+		lwsl_err("Failed to create file2\n");
+		result = 1;
+		goto cleanup;
+	}
+	if (create_file("./test-dir/subdir/file3", 30)) {
+		lwsl_err("Failed to create file3\n");
+		result = 1;
+		goto cleanup;
+	}
+
+	memset(&du, 0, sizeof(du));
+	if (!lws_dir("./test-dir", &du, lws_dir_du_cb)) {
+		lwsl_err("lws_dir failed\n");
+		result = 1;
+		goto cleanup;
+	}
+
+	lwsl_user("Total size: %llu, total files: %u\n",
+		  (unsigned long long)du.size_in_bytes, du.count_files);
+
+	if (du.size_in_bytes != 60) {
+		lwsl_err("size_in_bytes is %llu, expected 60\n",
+			 (unsigned long long)du.size_in_bytes);
+		result = 1;
+	}
+
+	if (du.count_files != 3) {
+		lwsl_err("count_files is %u, expected 3\n", du.count_files);
+		result = 1;
+	}
+
+cleanup:
+	/* Clean up test directory structure */
+	lws_dir("./test-dir", NULL, lws_dir_rm_rf_cb);
+	rmdir("./test-dir");
+
+	if (!result)
+		lwsl_user("Completed successfully\n");
+	else
+		lwsl_err("Failed\n");
+
+	return result;
+}

minimal-examples-lowlevel/api-tests/api-test-lws_spawn/CMakeLists.txt

@@ -4,6 +4,7 @@ find_package(libwebsockets CONFIG REQUIRED)
 list(APPEND CMAKE_MODULE_PATH ${LWS_CMAKE_DIR})
 include(CheckCSourceCompiles)
 include(LwsCheckRequirements)
+include(CTest)
 
 set(SAMP lws-api-test-lws_spawn)
 set(SRCS main.c)
@@ -15,6 +16,7 @@ require_lws_config(LWS_WITH_SPAWN 1 requirements)
 if (requirements)
 
 	add_executable(${SAMP} ${SRCS})
+	add_test(NAME api-test-lws_spawn COMMAND ${SAMP})
 
 	if (websockets_shared)
 		target_link_libraries(${SAMP} websockets_shared ${LIBWEBSOCKETS_DEP_LIBS})