[gentoo-commits] proj/openrc:openrc-0.11.x commit in: src/rc/

[gentoo-commits] proj/openrc:openrc-0.11.x commit in: src/rc/

[William Hubbs]

commit:     f53645b7c728492a8d3e6bb7f2fe8bcbce92cf7d
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Wed Oct 24 17:29:29 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sun Oct 28 20:02:41 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=f53645b7

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 <AT> gmx.net>
X-Gentoo-Bug: 439010
X-Gentoo-Bug-URL: http://bugs.gentoo.org/show_bug.cgi?id=439010

---
 src/rc/mountinfo.c |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/src/rc/mountinfo.c b/src/rc/mountinfo.c
index eaace13..43d9c83 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;
 	}

[gentoo-commits] proj/openrc:openrc-0.11.x commit in: src/rc/

[William Hubbs]

commit:     78a25883f35bbb657e2baf7c2e9181f91e35333c
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Sat Oct 27 17:59:58 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sun Oct 28 20:02:41 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=78a25883

Checkpath: print the path when correcting the owner

Checkpath was printing the path it was working with unless it was
correcting the owner. In this case, it was printing "checkpath", which
is not very useful.

Reported-by: <devurandom <AT> gmx.net>
X-Gentoo-Bug: 439014
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=439014

---
 src/rc/checkpath.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/rc/checkpath.c b/src/rc/checkpath.c
index 518d237..5aea597 100644
--- a/src/rc/checkpath.c
+++ b/src/rc/checkpath.c
@@ -133,7 +133,7 @@ do_check(char *path, uid_t uid, gid_t gid, mode_t mode, inode_t type,
 	}
 
 	if (mode && (st.st_mode & 0777) != mode) {
-		einfo("%s: correcting mode", applet);
+		einfo("%s: correcting mode", path);
 		if (chmod(path, mode)) {
 			eerror("%s: chmod: %s", applet, strerror(errno));
 			return -1;