/[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.138 Revision 1.139
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.138 2006/03/31 06:07:47 vapier Exp $ 4 * $Header: /var/cvsroot/gentoo-projects/pax-utils/scanelf.c,v 1.139 2006/04/11 02:47:34 vapier 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#ifdef __linux__ 11#ifdef __linux__
12 #include <glob.h> 12 #include <glob.h>
13#endif 13#endif
14static const char *rcsid = "$Id: scanelf.c,v 1.138 2006/03/31 06:07:47 vapier Exp $"; 14static const char *rcsid = "$Id: scanelf.c,v 1.139 2006/04/11 02:47:34 vapier Exp $";
15#define argv0 "scanelf" 15#define argv0 "scanelf"
16 16
17#define IS_MODIFIER(c) (c == '%' || c == '#' || c == '+') 17#define IS_MODIFIER(c) (c == '%' || c == '#' || c == '+')
18 18
19#define do_state(option, flag) \ 19#define do_state(option, flag) \
1681 /* now lets actually do the scanning */ 1681 /* now lets actually do the scanning */
1682 if (scan_ldpath || use_ldcache) 1682 if (scan_ldpath || use_ldcache)
1683 load_ld_so_conf(0, "/etc/ld.so.conf"); 1683 load_ld_so_conf(0, "/etc/ld.so.conf");
1684 if (scan_ldpath) scanelf_ldpath(); 1684 if (scan_ldpath) scanelf_ldpath();
1685 if (scan_envpath) scanelf_envpath(); 1685 if (scan_envpath) scanelf_envpath();
1686 if (!from_file && ttyname(0) == NULL) 1686 if (!from_file && optind == argc && ttyname(0) == NULL)
1687 from_file = "-"; 1687 from_file = "-";
1688 if (from_file) { 1688 if (from_file) {
1689 scanelf_from_file(from_file); 1689 scanelf_from_file(from_file);
1690 from_file = *argv; 1690 from_file = *argv;
1691 } 1691 }

Legend:
Removed from v.1.138  
changed lines
  Added in v.1.139

  ViewVC Help
Powered by ViewVC 1.1.20