fincore: add recursive directory scanning

teknoraver · teknoraver · commit 87dc1a032cfa · 2025-04-18T18:54:54.000+02:00
Add a --recursive flag to fincore which allows to recursively scan
directories.
diff --git a/bash-completion/fincore b/bash-completion/fincore
@@ -32,6 +32,7 @@ _fincore_module()
 				--output
 				--output-all
 				--raw
+				--recursive
 				--help
 				--version
 			"
diff --git a/configure.ac b/configure.ac
@@ -822,6 +822,10 @@ AS_IF([test x"$have_dirfd" = xno], [
 
 AM_CONDITIONAL([HAVE_DIRFD], [test "x$have_dirfd" = xyes || test "x$have_ddfd" = xyes])
 
+have_fts_open=no
+AC_CHECK_FUNCS([fts_open], [have_fts_open=yes], [have_fts_open=no])
+AM_CONDITIONAL([HAVE_FTS_OPEN], [test "x$have_fts_open" = xyes])
+
 MQ_LIBS=
 AC_CHECK_LIB([rt], [mq_open], [MQ_LIBS="-lrt"])
 AC_SUBST([MQ_LIBS])
diff --git a/misc-utils/fincore.1.adoc b/misc-utils/fincore.1.adoc
@@ -47,6 +47,9 @@ Produce output in raw format. All potentially unsafe characters are hex-escaped
 *-J*, *--json*::
 Use JSON output format.
 
+*-R*, *--recursive*::
+recursively check all files in directories.
+
 include::man-common/help-version.adoc[]
 
 == AUTHORS
diff --git a/misc-utils/fincore.c b/misc-utils/fincore.c
@@ -26,6 +26,10 @@
 #include <stdio.h>
 #include <string.h>
 
+#ifdef HAVE_FTS_OPEN
+#include <fts.h>
+#endif
+
 #include "c.h"
 #include "cctype.h"
 #include "nls.h"
@@ -125,12 +129,13 @@ struct fincore_control {
 	unsigned int bytes : 1,
 		     noheadings : 1,
 		     raw : 1,
-		     json : 1;
+		     json : 1,
+		     recursive : 1;
 
 };
 
 struct fincore_state {
-	const char * const name;
+	const char * name;
 	long long unsigned int file_size;
 
 	struct cachestat cstat;
@@ -356,40 +361,50 @@ static int fincore_fd (struct fincore_control *ctl,
 /*
  * Returns: <0 on error, 0 success, 1 ignore.
  */
-static int fincore_name(struct fincore_control *ctl, const char *name)
+static int fincore_name(struct fincore_control *ctl,
+			const char *filename,
+			const char *showname,
+			struct stat *statp)
 {
 	int fd;
 	int rc = 0;
-	struct stat sb;
-	struct fincore_state _st = { .name = name }, *st = &_st;
+	struct stat sb, *stp = statp ?: &sb;
+	struct fincore_state st = { .name = filename };
 
-	if ((fd = open (st->name, O_RDONLY)) < 0) {
-		warn(_("failed to open: %s"), st->name);
+	if ((fd = open(filename, O_RDONLY)) < 0) {
+		warn(_("failed to open: %s"), showname);
 		return -errno;
 	}
 
-	if (fstat (fd, &sb) < 0) {
-		warn(_("failed to do fstat: %s"), st->name);
-		close (fd);
-		return -errno;
+	if (!statp) {
+		if (fstat (fd, &sb) < 0) {
+			warn(_("failed to do fstat: %s"), showname);
+			close (fd);
+			return -errno;
+		}
 	}
-	st->file_size = sb.st_size;
 
-	if (S_ISBLK(sb.st_mode)) {
-		rc = blkdev_get_size(fd, &st->file_size);
+	if (S_ISBLK(stp->st_mode)) {
+		rc = blkdev_get_size(fd, &st.file_size);
 		if (rc)
-			warn(_("failed ioctl to get size: %s"), st->name);
-	} else if (S_ISREG(sb.st_mode)) {
-		st->file_size = sb.st_size;
+			warn(_("failed ioctl to get size: %s"), showname);
+	} else if (S_ISREG(stp->st_mode)) {
+		st.file_size = stp->st_size;
+	} else {
+		rc = 1;			  /* ignore things like symlinks
+					   * and directories*/
 	}
 
-	if (!rc)
-		rc = fincore_fd(ctl, fd, st);
+	if (!rc) {
+		rc = fincore_fd(ctl, fd, &st);
+	}
 
 	close(fd);
 
-	if (!rc)
-		rc = add_output_data(ctl, st);
+	if (!rc) {
+		st.name = showname;
+		rc = add_output_data(ctl, &st);
+	}
 
 	return rc;
 }
@@ -409,6 +424,7 @@ static void __attribute__((__noreturn__)) usage(void)
 	fputs(_(" -o, --output <list>   output columns\n"), out);
 	fputs(_("     --output-all      output all columns\n"), out);
 	fputs(_(" -r, --raw             use raw output format\n"), out);
+	fputs(_(" -R, --recursive       recursively check all files in directories\n"), out);
 
 	fputs(USAGE_SEPARATOR, out);
 	fprintf(out, USAGE_HELP_OPTIONS(23));
@@ -446,6 +462,7 @@ int main(int argc, char ** argv)
 		{ "help",	no_argument, NULL, 'h' },
 		{ "json",       no_argument, NULL, 'J' },
 		{ "raw",        no_argument, NULL, 'r' },
+		{ "recursive",	no_argument, NULL, 'R' },
 		{ NULL, 0, NULL, 0 },
 	};
 
@@ -454,7 +471,7 @@ int main(int argc, char ** argv)
 	textdomain(PACKAGE);
 	close_stdout_atexit();
 
-	while ((c = getopt_long (argc, argv, "bno:JrVh", longopts, NULL)) != -1) {
+	while ((c = getopt_long (argc, argv, "bno:JrRVh", longopts, NULL)) != -1) {
 		switch (c) {
 		case 'b':
 			ctl.bytes = 1;
@@ -475,6 +492,12 @@ int main(int argc, char ** argv)
 		case 'r':
 			ctl.raw = 1;
 			break;
+		case 'R':
+#ifndef HAVE_FTS_OPEN
+			errx(0, _("recursive option is not supported"));
+#endif
+			ctl.recursive = 1;
+			break;
 		case 'V':
 			print_version(EXIT_SUCCESS);
 		case 'h':
@@ -538,10 +561,33 @@ int main(int argc, char ** argv)
 		}
 	}
 
-	for(; optind < argc; optind++) {
-		rc = fincore_name(&ctl, argv[optind]);
-		if (rc)
-			break;
+	if (ctl.recursive) {
+#ifdef HAVE_FTS_OPEN
+		FTS *fts = fts_open(argv + optind, FTS_PHYSICAL, NULL);
+		FTSENT *ent;
+
+		if (!fts) {
+			warn(_("failed to iterate tree"));
+			rc = EXIT_FAILURE;
+		} else {
+			while ((ent = fts_read(fts)) != NULL) {
+				if (ent->fts_info == FTS_F || ent->fts_info == FTS_DEFAULT) {
+					/* fts changes directory when iterating,
+					 * so we need to use .fts_accpath to access
+					 * the file named .fts_path */
+					rc = fincore_name(&ctl, ent->fts_accpath, ent->fts_path, ent->fts_statp);
+					if (rc)
+						break;
+				}
+			}
+		}
+#endif
+	} else {
+		for(; optind < argc; optind++) {
+			rc = fincore_name(&ctl, argv[optind], argv[optind], NULL);
+			if (rc)
+				break;
+		}
 	}
 
 	if (rc == 0)

Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,7 @@ _fincore_module()`
`32`	`32`	`--output`
`33`	`33`	`--output-all`
`34`	`34`	`--raw`
	`35`	`+ --recursive`
`35`	`36`	`--help`
`36`	`37`	`--version`
`37`	`38`	`"`