[gentoo-commits] gentoo-projects commit in portage-utils/libq: scandirat.c

[Mike Frysinger (vapier)]

vapier      13/09/29 10:07:28

  Modified:             scandirat.c
  Log:
  scandirat: use _DIRENT_HAVE_D_RECLEN to be slightly more portable #485430

Revision  Changes    Path
1.5                  portage-utils/libq/scandirat.c

file : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/libq/scandirat.c?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/libq/scandirat.c?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils/libq/scandirat.c?r1=1.4&r2=1.5

Index: scandirat.c
===================================================================
RCS file: /var/cvsroot/gentoo-projects/portage-utils/libq/scandirat.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- scandirat.c	16 Jan 2012 01:10:32 -0000	1.4
+++ scandirat.c	29 Sep 2013 10:07:28 -0000	1.5
@@ -1,7 +1,7 @@
 /*
  * Copyright 2005-2011 Gentoo Foundation
  * Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-projects/portage-utils/libq/scandirat.c,v 1.4 2012/01/16 01:10:32 vapier Exp $
+ * $Header: /var/cvsroot/gentoo-projects/portage-utils/libq/scandirat.c,v 1.5 2013/09/29 10:07:28 vapier Exp $
  *
  * Copyright 2005-2010 Ned Ludd        - <solar@g.o>
  * Copyright 2005-2011 Mike Frysinger  - <vapier@g.o>
@@ -13,7 +13,13 @@
 # endif
 #endif
 
-#if !defined(HAVE_SCANDIRAT)
+#if !defined(HAVE_SCANDIRATf)
+
+#if defined(_DIRENT_HAVE_D_RECLEN)
+# define reclen(de) ((de)->d_reclen)
+#else
+# define reclen(de) (sizeof(*(de)))
+#endif
 
 static int scandirat(int dir_fd, const char *dir, struct dirent ***dirlist,
 	int (*filter)(const struct dirent *),
@@ -39,7 +45,7 @@
 			continue;
 
 		ret = realloc(ret, sizeof(*ret) * (cnt + 1));
-		ret[cnt++] = xmemdup(de, de->d_reclen);
+		ret[cnt++] = xmemdup(de, reclen(de));
 	}
 	*dirlist = ret;