new file mode 100644

@@ -0,0 +1 @@

+readdir

@@ -1,8 +1,12 @@

 # Not exactly an advanceed Makefile...

 PREFIX = /usr/local

+CC = gcc

 all:

+readdir: readdir.c

+	$(CC) readdir.c -o readdir

+

 install: combinedfs.py

 	install -C combinedfs.py "$(PREFIX)/sbin/combinedfs"

@@ -223,22 +223,25 @@ class CombinedFS(Operations):

 		# Deal only with directories:

 		if filename:

 			raise FuseOSError(errno.ENOTDIR)

+		# Extra attributes, just what it takes to support dirent->d_type:

+		dir_attrs = {'st_mode': stat.S_IFDIR }

+		reg_attrs = {'st_mode': stat.S_IFREG }

 		# Yield common directory entries:

-		yield '.'

-		yield '..'

+		yield '.', dir_attrs, 0

+		yield '..', dir_attrs, 0

 		if not cert:

 			# Top-level directory

 			flat_mode = self.separator != '/'

 			for cert in (d for d in os.listdir(self.root) if self.filter_cert(d)):

 				if flat_mode:

 					for filename in self.files:

-						yield cert + self.separator + filename

+						yield cert + self.separator + filename, reg_attrs, 0

 				else:

-					yield cert

+					yield cert, dir_attrs, 0

 		else:

 			# Second-level directory

 			for filename in self.files:

-				yield filename

+				yield filename, reg_attrs, 0

 	def open(self, path, flags):

 		cert, filename, file_spec = self.analyse_path(path)

new file mode 100644

@@ -0,0 +1,47 @@

+// Dummy program to test whether dirent->d_type was set by the underlying filesystem.

+

+#include <dirent.h>

+#include <errno.h>

+#include <stdio.h>

+#include <string.h>

+

+const char *pr_d_type(unsigned char d_type) {

+	switch (d_type) {

+		case DT_BLK: return "DT_BLK";

+		case DT_CHR: return "DT_CHR";

+		case DT_DIR: return "DT_DIR";

+		case DT_FIFO: return "DT_FIFO";

+		case DT_LNK: return "DT_LNK";

+		case DT_REG: return "DT_REG";

+		case DT_SOCK: return "DT_SOCK";

+		case DT_UNKNOWN: return "DT_UNKNOWN";

+	}

+	return "DT_UNKNOWN?";

+}

+

+int main(int argc, char **argv) {

+	DIR *directory;

+	struct dirent *entry;

+

+	if (argc != 2) return 0;

+

+	directory = opendir(argv[1]);

+	if (!directory) {

+		fprintf(stderr, "Error opening directory %s: %s\n", argv[1], strerror(errno));

+		return 2;

+	}

+

+	for (;;) {

+		errno = 0;

+		entry = readdir(directory);

+		if (!entry && errno) {

+			fprintf(stderr, "Error listing directory %s: %s\n", argv[1], strerror(errno));

+			return 1;

+		}

+		if (!entry) {

+			break;

+		}

+		printf("%d %d %d=%s %s\n", entry->d_ino, entry->d_off, entry->d_type, pr_d_type(entry->d_type), entry->d_name);

+	}

+	return 0;

+}