[gentoo-commits] gentoo-projects commit in pax-utils: scanelf.c

["Mike Frysinger (vapier)" <vapier@gentoo.org>]

vapier      10/12/06 20:43:48

  Modified:             scanelf.c
  Log:
  use normal glob funcs rather than hardcoding 64bit vers since _GNU_SOURCE should transparently rewrite these to 64bit when feasible

Revision  Changes    Path
1.219                pax-utils/scanelf.c

file : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/pax-utils/scanelf.c?rev=1.219&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-projects/pax-utils/scanelf.c?rev=1.219&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/pax-utils/scanelf.c?r1=1.218&r2=1.219

Index: scanelf.c
===================================================================
RCS file: /var/cvsroot/gentoo-projects/pax-utils/scanelf.c,v
retrieving revision 1.218
retrieving revision 1.219
diff -u -r1.218 -r1.219
--- scanelf.c	15 Jan 2010 11:56:15 -0000	1.218
+++ scanelf.c	6 Dec 2010 20:43:48 -0000	1.219
@@ -1,13 +1,13 @@
 /*
  * Copyright 2003-2007 Gentoo Foundation
  * Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-projects/pax-utils/scanelf.c,v 1.218 2010/01/15 11:56:15 vapier Exp $
+ * $Header: /var/cvsroot/gentoo-projects/pax-utils/scanelf.c,v 1.219 2010/12/06 20:43:48 vapier Exp $
  *
  * Copyright 2003-2007 Ned Ludd        - <solar@gentoo.org>
  * Copyright 2004-2007 Mike Frysinger  - <vapier@gentoo.org>
  */
 
-static const char *rcsid = "$Id: scanelf.c,v 1.218 2010/01/15 11:56:15 vapier Exp $";
+static const char *rcsid = "$Id: scanelf.c,v 1.219 2010/12/06 20:43:48 vapier Exp $";
 const char * const argv0 = "scanelf";
 
 #include "paxinc.h"
@@ -1591,10 +1591,10 @@
 			*p = 0;
 		if ((p = strchr(path, '\n')) != NULL)
 			*p = 0;
-#ifdef __linux__
+
 		/* recursive includes of the same file will make this segfault. */
 		if ((memcmp(path, "include", 7) == 0) && isblank(path[7])) {
-			glob64_t gl;
+			glob_t gl;
 			size_t x;
 			char gpath[__PAX_UTILS_PATH_MAX];
 
@@ -1605,22 +1605,22 @@
 			else
 				strncpy(gpath, &path[8], sizeof(gpath));
 
-			if ((glob64(gpath, 0, NULL, &gl)) == 0) {
+			if (glob(gpath, 0, NULL, &gl) == 0) {
 				for (x = 0; x < gl.gl_pathc; ++x) {
 					/* try to avoid direct loops */
 					if (strcmp(gl.gl_pathv[x], fname) == 0)
 						continue;
 					i = load_ld_cache_config(i, gl.gl_pathv[x]);
 					if (i + 1 >= ARRAY_SIZE(ldpaths)) {
-						globfree64(&gl);
+						globfree(&gl);
 						return i;
 					}
 				}
-				globfree64 (&gl);
+				globfree(&gl);
 				continue;
 			}
 		}
-#endif
+
 		if (*path != '/')
 			continue;