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 1RcBdz-0000L2-2p for garchives@archives.gentoo.org; Sun, 18 Dec 2011 07:58:51 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8832921C04B; Sun, 18 Dec 2011 07:58:42 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 5BA1D21C04B for ; Sun, 18 Dec 2011 07:58:42 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BFA6C1B4001 for ; Sun, 18 Dec 2011 07:58:41 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 559) id 923D62004B; Sun, 18 Dec 2011 07:58:40 +0000 (UTC) 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 portage-utils: qcheck.c X-VCS-Repository: gentoo-projects X-VCS-Files: qcheck.c X-VCS-Directories: portage-utils X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger Content-Type: text/plain; charset=utf8 Message-Id: <20111218075840.923D62004B@flycatcher.gentoo.org> Date: Sun, 18 Dec 2011 07:58:40 +0000 (UTC) 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: c3264e25-7a85-4fed-8133-23818d02c191 X-Archives-Hash: ac093ed21e0ae555cf5227d7c4043a80 vapier 11/12/18 07:58:40 Modified: qcheck.c Log: push down "exact" from global scope to per-applet state Revision Changes Path 1.53 portage-utils/qcheck.c file : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils= /qcheck.c?rev=3D1.53&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils= /qcheck.c?rev=3D1.53&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/portage-utils= /qcheck.c?r1=3D1.52&r2=3D1.53 Index: qcheck.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/portage-utils/qcheck.c,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- qcheck.c 18 Dec 2011 01:17:14 -0000 1.52 +++ qcheck.c 18 Dec 2011 07:58:40 -0000 1.53 @@ -1,7 +1,7 @@ /* * Copyright 2005-2011 Gentoo Foundation * Distributed under the terms of the GNU General Public License v2 - * $Header: /var/cvsroot/gentoo-projects/portage-utils/qcheck.c,v 1.52 2= 011/12/18 01:17:14 vapier Exp $ + * $Header: /var/cvsroot/gentoo-projects/portage-utils/qcheck.c,v 1.53 2= 011/12/18 07:58:40 vapier Exp $ * * Copyright 2005-2010 Ned Ludd - * Copyright 2005-2011 Mike Frysinger - @@ -34,7 +34,7 @@ "Undo prelink when calculating checksums", COMMON_OPTS_HELP }; -static const char qcheck_rcsid[] =3D "$Id: qcheck.c,v 1.52 2011/12/18 01= :17:14 vapier Exp $"; +static const char qcheck_rcsid[] =3D "$Id: qcheck.c,v 1.53 2011/12/18 07= :58:40 vapier Exp $"; #define qcheck_usage(ret) usage(ret, QCHECK_FLAGS, qcheck_long_opts, qch= eck_opts_help, lookup_applet_idx("qcheck")) =20 #define qcprintf(fmt, args...) if (!state->bad_only) printf(_(fmt), ## a= rgs) @@ -50,6 +50,7 @@ bool chk_hash; bool chk_mtime; bool undo_prelink; + bool exact; }; =20 static int qcheck_process_contents(q_vdb_pkg_ctx *pkg_ctx, struct qcheck= _opt_state *state) @@ -290,7 +291,7 @@ for (i =3D optind; i < state->argc; ++i) { free(buf); xasprintf(&buf, "%s/%s", catname, pkgname); - if (!exact) { + if (!state->exact) { if (rematch(state->argv[i], buf, REG_EXTENDED) =3D=3D 0) break; if (rematch(state->argv[i], pkgname, REG_EXTENDED) =3D=3D 0) @@ -336,6 +337,7 @@ .chk_hash =3D true, .chk_mtime =3D true, .undo_prelink =3D false, + .exact =3D false, }; =20 DBG("argc=3D%d argv[0]=3D%s argv[1]=3D%s", @@ -345,7 +347,7 @@ switch (i) { COMMON_GETOPTS_CASES(qcheck) case 'a': state.search_all =3D true; break; - case 'e': exact =3D 1; break; + case 'e': state.exact =3D true; break; case 's': { regex_t regex; xregcomp(®ex, optarg, REG_EXTENDED|REG_NOSUB);