From 823aabe9b4e791e407f7e859b405545676d7c16f Mon Sep 17 00:00:00 2001
From: Ingo Schwarze <schwarze@openbsd.org>
Date: Mon, 11 Aug 2014 03:19:39 +0000
Subject: work around lack of d_namlen and ALIGN/ALIGNBYTES on Linux

---
 Makefile             |  6 ++++--
 compat_fts.c         | 31 ++++++++++++++++---------------
 configure            |  1 +
 test-dirent-namlen.c | 10 ++++++++++
 4 files changed, 31 insertions(+), 17 deletions(-)
 create mode 100644 test-dirent-namlen.c

diff --git a/Makefile b/Makefile
index 3bfe2fac..ea3da1fd 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.437 2014/08/11 01:39:00 schwarze Exp $
+# $Id: Makefile,v 1.438 2014/08/11 03:19:39 schwarze Exp $
 #
 # Copyright (c) 2010, 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
 # Copyright (c) 2011, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -115,7 +115,9 @@ CGIBIN		 = man.cgi
 
 DBLIB		+= -lsqlite3
 
-TESTSRCS	 = test-fgetln.c \
+TESTSRCS	 = test-dirent-namlen.c \
+		   test-fgetln.c \
+		   test-fts.c \
 		   test-getsubopt.c \
 		   test-mmap.c \
 		   test-ohash.c \
diff --git a/compat_fts.c b/compat_fts.c
index 91e9d60c..6756ad49 100644
--- a/compat_fts.c
+++ b/compat_fts.c
@@ -404,7 +404,7 @@ fts_build(FTS *sp)
 	FTSENT *cur, *tail;
 	DIR *dirp;
 	void *oldaddr;
-	size_t len, maxlen;
+	size_t dlen, len, maxlen;
 	int nitems, cderrno, descend, level, nlinks, nostat, doadjust;
 	int saved_errno;
 	char *cp;
@@ -489,11 +489,17 @@ fts_build(FTS *sp)
 		if (ISDOT(dp->d_name))
 			continue;
 
-		if (!(p = fts_alloc(sp, dp->d_name, (size_t)dp->d_namlen)))
+#ifdef HAVE_DIRENT_NAMLEN
+		dlen = dp->d_namlen;
+#else
+		dlen = strlen(dp->d_name);
+#endif
+
+		if (!(p = fts_alloc(sp, dp->d_name, dlen)))
 			goto mem1;
-		if (dp->d_namlen >= maxlen) {	/* include space for NUL */
+		if (dlen >= maxlen) {	/* include space for NUL */
 			oldaddr = sp->fts_path;
-			if (fts_palloc(sp, dp->d_namlen +len + 1)) {
+			if (fts_palloc(sp, dlen + len + 1)) {
 				/*
 				 * No more memory for path or structures.  Save
 				 * errno, free up the current structure and the
@@ -520,7 +526,7 @@ mem1:				saved_errno = errno;
 
 		p->fts_level = level;
 		p->fts_parent = sp->fts_cur;
-		p->fts_pathlen = len + dp->d_namlen;
+		p->fts_pathlen = len + dlen;
 		if (p->fts_pathlen < len) {
 			/*
 			 * If we wrap, free up the current structure and
@@ -680,23 +686,18 @@ fts_alloc(FTS *sp, const char *name, size_t namelen)
 	FTSENT *p;
 	size_t len;
 
-	/*
-	 * The file name is a variable length array and no stat structure is
-	 * necessary if the user has set the nostat bit.  Allocate the FTSENT
-	 * structure, the file name and the stat structure in one chunk, but
-	 * be careful that the stat structure is reasonably aligned.  Since the
-	 * fts_name field is declared to be of size 1, the fts_name pointer is
-	 * namelen + 2 before the first possible address of the stat structure.
-	 */
 	len = sizeof(FTSENT) + namelen;
-	len += sizeof(struct stat) + ALIGNBYTES;
 	if ((p = calloc(1, len)) == NULL)
 		return (NULL);
 
 	p->fts_path = sp->fts_path;
 	p->fts_namelen = namelen;
 	p->fts_instr = FTS_NOINSTR;
-	p->fts_statp = (struct stat *)ALIGN(p->fts_name + namelen + 2);
+	p->fts_statp = malloc(sizeof(struct stat));
+	if (p->fts_statp == NULL) {
+		free(p);
+		return (NULL);
+	}
 	memcpy(p->fts_name, name, namelen);
 
 	return (p);
diff --git a/configure b/configure
index 71c3517b..0ae06d53 100755
--- a/configure
+++ b/configure
@@ -32,6 +32,7 @@ runtest() {
 cat config.h.pre
 echo
 echo "#define VERSION \"${VERSION}\""
+runtest dirent-namlen DIRENT_NAMLEN
 runtest fgetln FGETLN
 runtest fts FTS
 runtest getsubopt GETSUBOPT
diff --git a/test-dirent-namlen.c b/test-dirent-namlen.c
new file mode 100644
index 00000000..4a007892
--- /dev/null
+++ b/test-dirent-namlen.c
@@ -0,0 +1,10 @@
+#include <sys/types.h>
+#include <dirent.h>
+
+int
+main(void)
+{
+	struct dirent	 entry;
+
+	return (sizeof(entry.d_namlen) == 0);
+}
-- 
cgit v1.2.3-56-ge451