From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1LimE9-0005qD-Pa for garchives@archives.gentoo.org; Sun, 15 Mar 2009 09:01:50 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3DB52E01A8; Sun, 15 Mar 2009 09:01:49 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 18C92E01A8 for ; Sun, 15 Mar 2009 09:01:49 +0000 (UTC) Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTP id AB929643AE for ; Sun, 15 Mar 2009 09:01:48 +0000 (UTC) Received: from vapier by stork.gentoo.org with local (Exim 4.69) (envelope-from ) id 1LimE8-0006fq-8v for gentoo-commits@lists.gentoo.org; Sun, 15 Mar 2009 09:01:48 +0000 From: "Mike Frysinger (vapier)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, vapier@gentoo.org Subject: [gentoo-commits] gentoo-projects commit in pax-utils: scanelf.c X-VCS-Repository: gentoo-projects X-VCS-Files: scanelf.c X-VCS-Directories: pax-utils X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger Content-Type: text/plain; charset=utf8 Message-Id: Sender: Mike Frysinger Date: Sun, 15 Mar 2009 09:01:48 +0000 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 8e27988f-9947-4ecd-9227-8e76ea1b0e96 X-Archives-Hash: 3aa86eb05a0117628073dd291322d9d3 vapier 09/03/15 09:01:48 Modified: scanelf.c Log: fix dragonfly define check and tweak whitespace in scanelf_ldpath Revision Changes Path 1.211 pax-utils/scanelf.c file : http://sources.gentoo.org/viewcvs.py/gentoo-projects/pax-utils/sca= nelf.c?rev=3D1.211&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-projects/pax-utils/sca= nelf.c?rev=3D1.211&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-projects/pax-utils/sca= nelf.c?r1=3D1.210&r2=3D1.211 Index: scanelf.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-projects/pax-utils/scanelf.c,v retrieving revision 1.210 retrieving revision 1.211 diff -u -r1.210 -r1.211 --- scanelf.c 15 Mar 2009 08:56:14 -0000 1.210 +++ scanelf.c 15 Mar 2009 09:01:48 -0000 1.211 @@ -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.210 200= 9/03/15 08:56:14 vapier Exp $ + * $Header: /var/cvsroot/gentoo-projects/pax-utils/scanelf.c,v 1.211 200= 9/03/15 09:01:48 vapier Exp $ * * Copyright 2003-2007 Ned Ludd - * Copyright 2004-2007 Mike Frysinger - */ =20 -static const char *rcsid =3D "$Id: scanelf.c,v 1.210 2009/03/15 08:56:14= vapier Exp $"; +static const char *rcsid =3D "$Id: scanelf.c,v 1.211 2009/03/15 09:01:48= vapier Exp $"; const char * const argv0 =3D "scanelf"; =20 #include "paxinc.h" @@ -1505,7 +1505,7 @@ return i; } =20 -#elif defined(__FreeBSD__) || (__DragonFly__) +#elif defined(__FreeBSD__) || defined(__DragonFly__) =20 static int load_ld_cache_config(int i, const char *fname) { @@ -1571,8 +1571,8 @@ scan_l =3D scan_ul =3D scan_ull =3D 0; =20 while (ldpaths[i]) { - if (!scan_l && !strcmp(ldpaths[i], "/lib")) scan_l =3D 1; - if (!scan_ul && !strcmp(ldpaths[i], "/usr/lib")) scan_ul =3D 1; + if (!scan_l && !strcmp(ldpaths[i], "/lib")) scan_l =3D 1= ; + if (!scan_ul && !strcmp(ldpaths[i], "/usr/lib")) scan_ul =3D 1= ; if (!scan_ull && !strcmp(ldpaths[i], "/usr/local/lib")) scan_ull =3D 1= ; scanelf_dir(ldpaths[i]); ++i;