/[gentoo-projects]/pax-utils/scanelf.c
Gentoo

Diff of /pax-utils/scanelf.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1.210 Revision 1.211
1/* 1/*
2 * Copyright 2003-2007 Gentoo Foundation 2 * Copyright 2003-2007 Gentoo Foundation
3 * Distributed under the terms of the GNU General Public License v2 3 * Distributed under the terms of the GNU General Public License v2
4 * $Header: /var/cvsroot/gentoo-projects/pax-utils/scanelf.c,v 1.210 2009/03/15 08:56:14 vapier Exp $ 4 * $Header: /var/cvsroot/gentoo-projects/pax-utils/scanelf.c,v 1.211 2009/03/15 09:01:48 vapier Exp $
5 * 5 *
6 * Copyright 2003-2007 Ned Ludd - <solar@gentoo.org> 6 * Copyright 2003-2007 Ned Ludd - <solar@gentoo.org>
7 * Copyright 2004-2007 Mike Frysinger - <vapier@gentoo.org> 7 * Copyright 2004-2007 Mike Frysinger - <vapier@gentoo.org>
8 */ 8 */
9 9
10static const char *rcsid = "$Id: scanelf.c,v 1.210 2009/03/15 08:56:14 vapier Exp $"; 10static const char *rcsid = "$Id: scanelf.c,v 1.211 2009/03/15 09:01:48 vapier Exp $";
11const char * const argv0 = "scanelf"; 11const char * const argv0 = "scanelf";
12 12
13#include "paxinc.h" 13#include "paxinc.h"
14 14
15#define IS_MODIFIER(c) (c == '%' || c == '#' || c == '+') 15#define IS_MODIFIER(c) (c == '%' || c == '#' || c == '+')
1503 1503
1504 fclose(fp); 1504 fclose(fp);
1505 return i; 1505 return i;
1506} 1506}
1507 1507
1508#elif defined(__FreeBSD__) || (__DragonFly__) 1508#elif defined(__FreeBSD__) || defined(__DragonFly__)
1509 1509
1510static int load_ld_cache_config(int i, const char *fname) 1510static int load_ld_cache_config(int i, const char *fname)
1511{ 1511{
1512 FILE *fp = NULL; 1512 FILE *fp = NULL;
1513 char *b = NULL, *p; 1513 char *b = NULL, *p;
1569 err("Unable to load any paths from ld.so.conf"); 1569 err("Unable to load any paths from ld.so.conf");
1570 1570
1571 scan_l = scan_ul = scan_ull = 0; 1571 scan_l = scan_ul = scan_ull = 0;
1572 1572
1573 while (ldpaths[i]) { 1573 while (ldpaths[i]) {
1574 if (!scan_l && !strcmp(ldpaths[i], "/lib")) scan_l = 1; 1574 if (!scan_l && !strcmp(ldpaths[i], "/lib")) scan_l = 1;
1575 if (!scan_ul && !strcmp(ldpaths[i], "/usr/lib")) scan_ul = 1; 1575 if (!scan_ul && !strcmp(ldpaths[i], "/usr/lib")) scan_ul = 1;
1576 if (!scan_ull && !strcmp(ldpaths[i], "/usr/local/lib")) scan_ull = 1; 1576 if (!scan_ull && !strcmp(ldpaths[i], "/usr/local/lib")) scan_ull = 1;
1577 scanelf_dir(ldpaths[i]); 1577 scanelf_dir(ldpaths[i]);
1578 ++i; 1578 ++i;
1579 } 1579 }
1580 1580

Legend:
Removed from v.1.210  
changed lines
  Added in v.1.211

  ViewVC Help
Powered by ViewVC 1.1.20