/[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.152 Revision 1.153
1/* 1/*
2 * Copyright 2003-2006 Gentoo Foundation 2 * Copyright 2003-2006 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.152 2006/05/14 23:49:56 vapier Exp $ 4 * $Header: /var/cvsroot/gentoo-projects/pax-utils/scanelf.c,v 1.153 2006/05/17 21:45:20 solar Exp $
5 * 5 *
6 * Copyright 2003-2006 Ned Ludd - <solar@gentoo.org> 6 * Copyright 2003-2006 Ned Ludd - <solar@gentoo.org>
7 * Copyright 2004-2006 Mike Frysinger - <vapier@gentoo.org> 7 * Copyright 2004-2006 Mike Frysinger - <vapier@gentoo.org>
8 */ 8 */
9 9
10#include "paxinc.h" 10#include "paxinc.h"
11 11
12static const char *rcsid = "$Id: scanelf.c,v 1.152 2006/05/14 23:49:56 vapier Exp $"; 12static const char *rcsid = "$Id: scanelf.c,v 1.153 2006/05/17 21:45:20 solar Exp $";
13#define argv0 "scanelf" 13#define argv0 "scanelf"
14 14
15#define IS_MODIFIER(c) (c == '%' || c == '#' || c == '+') 15#define IS_MODIFIER(c) (c == '%' || c == '#' || c == '+')
16 16
17#define do_state(option, flag) \ 17#define do_state(option, flag) \
1828 /* now lets actually do the scanning */ 1828 /* now lets actually do the scanning */
1829 if (scan_ldpath || use_ldcache) 1829 if (scan_ldpath || use_ldcache)
1830 load_ld_cache_config(0, __PAX_UTILS_DEFAULT_LD_CACHE_CONFIG); 1830 load_ld_cache_config(0, __PAX_UTILS_DEFAULT_LD_CACHE_CONFIG);
1831 if (scan_ldpath) scanelf_ldpath(); 1831 if (scan_ldpath) scanelf_ldpath();
1832 if (scan_envpath) scanelf_envpath(); 1832 if (scan_envpath) scanelf_envpath();
1833 if (!from_file && optind == argc && ttyname(0) == NULL) 1833 if (!from_file && optind == argc && ttyname(0) == NULL && !scan_ldpath && !scan_envpath)
1834 from_file = "-"; 1834 from_file = "-";
1835 if (from_file) { 1835 if (from_file) {
1836 scanelf_from_file(from_file); 1836 scanelf_from_file(from_file);
1837 from_file = *argv; 1837 from_file = *argv;
1838 } 1838 }

Legend:
Removed from v.1.152  
changed lines
  Added in v.1.153

  ViewVC Help
Powered by ViewVC 1.1.20