/[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.260 Revision 1.261
1/* 1/*
2 * Copyright 2003-2012 Gentoo Foundation 2 * Copyright 2003-2012 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/Attic/scanelf.c,v 1.260 2014/01/11 00:28:49 vapier Exp $ 4 * $Header: /var/cvsroot/gentoo-projects/pax-utils/Attic/scanelf.c,v 1.261 2014/03/20 07:59:27 vapier Exp $
5 * 5 *
6 * Copyright 2003-2012 Ned Ludd - <solar@gentoo.org> 6 * Copyright 2003-2012 Ned Ludd - <solar@gentoo.org>
7 * Copyright 2004-2012 Mike Frysinger - <vapier@gentoo.org> 7 * Copyright 2004-2012 Mike Frysinger - <vapier@gentoo.org>
8 */ 8 */
9 9
10static const char rcsid[] = "$Id: scanelf.c,v 1.260 2014/01/11 00:28:49 vapier Exp $"; 10static const char rcsid[] = "$Id: scanelf.c,v 1.261 2014/03/20 07:59:27 vapier Exp $";
11const char argv0[] = "scanelf"; 11const char 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 == '+')
1895 const char *ldpath; 1895 const char *ldpath;
1896 1896
1897 _load_ld_cache_config(fname); 1897 _load_ld_cache_config(fname);
1898 1898
1899 scan_l = scan_ul = scan_ull = false; 1899 scan_l = scan_ul = scan_ull = false;
1900 if (array_cnt(ldpaths)) {
1901 array_for_each(ldpaths, n, ldpath) { 1900 array_for_each(ldpaths, n, ldpath) {
1902 if (!scan_l && !strcmp(ldpath, "/lib")) scan_l = true; 1901 if (!scan_l && !strcmp(ldpath, "/lib")) scan_l = true;
1903 if (!scan_ul && !strcmp(ldpath, "/usr/lib")) scan_ul = true; 1902 if (!scan_ul && !strcmp(ldpath, "/usr/lib")) scan_ul = true;
1904 if (!scan_ull && !strcmp(ldpath, "/usr/local/lib")) scan_ull = true; 1903 if (!scan_ull && !strcmp(ldpath, "/usr/local/lib")) scan_ull = true;
1905 }
1906 } 1904 }
1907 1905
1908 if (!scan_l) xarraypush_str(ldpaths, "/lib"); 1906 if (!scan_l) xarraypush_str(ldpaths, "/lib");
1909 if (!scan_ul) xarraypush_str(ldpaths, "/usr/lib"); 1907 if (!scan_ul) xarraypush_str(ldpaths, "/usr/lib");
1910 if (!scan_ull) xarraypush_str(ldpaths, "/usr/local/lib"); 1908 if (!scan_ull) xarraypush_str(ldpaths, "/usr/local/lib");
2266 } 2264 }
2267 xarraypush(find_sym_regex_arr, &preg, sizeof(preg)); 2265 xarraypush(find_sym_regex_arr, &preg, sizeof(preg));
2268 } 2266 }
2269 } 2267 }
2270 /* flatten arrays for display */ 2268 /* flatten arrays for display */
2271 if (array_cnt(find_sym_arr))
2272 find_sym = array_flatten_str(find_sym_arr); 2269 find_sym = array_flatten_str(find_sym_arr);
2273 if (array_cnt(find_lib_arr))
2274 find_lib = array_flatten_str(find_lib_arr); 2270 find_lib = array_flatten_str(find_lib_arr);
2275 if (array_cnt(find_section_arr))
2276 find_section = array_flatten_str(find_section_arr); 2271 find_section = array_flatten_str(find_section_arr);
2277 /* let the format option override all other options */ 2272 /* let the format option override all other options */
2278 if (out_format) { 2273 if (out_format) {
2279 show_pax = show_phdr = show_textrel = show_rpath = \ 2274 show_pax = show_phdr = show_textrel = show_rpath = \
2280 show_needed = show_interp = show_bind = show_soname = \ 2275 show_needed = show_interp = show_bind = show_soname = \
2281 show_textrels = show_perms = show_endian = show_size = \ 2276 show_textrels = show_perms = show_endian = show_size = \

Legend:
Removed from v.1.260  
changed lines
  Added in v.1.261

  ViewVC Help
Powered by ViewVC 1.1.20