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: <devurandom@gmx.net>
X-Gentoo-Bug: 439010
X-Gentoo-Bug-URL: http://bugs.gentoo.org/show_bug.cgi?id=439010
This commit is contained in:
William Hubbs 2012-10-24 12:29:29 -05:00
parent 8df18defe1
commit 978dbe0284

View File

@ -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;
}