From 978dbe028414fc44603d3be70f2a4b226eda9916 Mon Sep 17 00:00:00 2001 From: William Hubbs Date: Wed, 24 Oct 2012 12:29:29 -0500 Subject: [PATCH] mountinfo: respect the -q command line option Previously, we were setting the quiet flag before the command line was parsed. Since the flag is only used once, we can just read the environment variable which is set by the parsing process. Reported-by: X-Gentoo-Bug: 439010 X-Gentoo-Bug-URL: http://bugs.gentoo.org/show_bug.cgi?id=439010 --- src/rc/mountinfo.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/rc/mountinfo.c b/src/rc/mountinfo.c index eaace13f..43d9c839 100644 --- a/src/rc/mountinfo.c +++ b/src/rc/mountinfo.c @@ -390,11 +390,8 @@ mountinfo(int argc, char **argv) char real_path[PATH_MAX + 1]; int opt; int result; - bool quiet; char *this_path; - quiet = rc_yesno(getenv("EINFO_QUIET")); - #define DO_REG(_var) \ if (_var) free(_var); \ _var = get_regex(optarg); @@ -483,7 +480,7 @@ mountinfo(int argc, char **argv) if (skip_point_regex && regexec(skip_point_regex, s->value, 0, NULL, 0) == 0) continue; - if (! quiet) + if (! rc_yesno(getenv("EINFO_QUIET"))) printf("%s\n", s->value); result = EXIT_SUCCESS; }