aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Hubbs <w.d.hubbs@gmail.com>2017-01-04 18:18:27 -0600
committerWilliam Hubbs <w.d.hubbs@gmail.com>2017-01-04 18:18:37 -0600
commitb73941f0c3020e3dbd1684d09685e114c678b520 (patch)
tree025689602ed7c5fa116561085575cb89f638fb3e
parentClean up warnings that can use the _unused macro (diff)
downloadopenrc-b73941f0c3020e3dbd1684d09685e114c678b520.zip
openrc-b73941f0c3020e3dbd1684d09685e114c678b520.tar.gz
openrc-b73941f0c3020e3dbd1684d09685e114c678b520.tar.bz2
mountinfo: make the path to /proc/mounts a constant
This path should not be hard coded in the open call. Linux prior to 2.4.19 did not have /proc/self/mounts, so for now I'm making this value /proc/mounts everywhere, but that may change to /proc/self/mounts on linux; I'm not sure we should care about <2.4.19. X-Gentoo-Bug: 604646 X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=604646
-rw-r--r--src/rc/mountinfo.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/rc/mountinfo.c b/src/rc/mountinfo.c
index 29eb160..d9c25a3 100644
--- a/src/rc/mountinfo.c
+++ b/src/rc/mountinfo.c
@@ -46,6 +46,7 @@
#include "_usage.h"
const char *applet = NULL;
+const char *procmounts = "/proc/mounts";
const char *extraopts = "[mount1] [mount2] ...";
const char *getoptstring = "f:F:n:N:o:O:p:P:iste:E:" getoptstring_COMMON;
const struct option longopts[] = {
@@ -323,7 +324,7 @@ find_mounts(struct args *args)
int netdev;
RC_STRINGLIST *list;
- if ((fp = fopen("/proc/self/mounts", "r")) == NULL)
+ if ((fp = fopen(procmounts, "r")) == NULL)
eerrorx("getmntinfo: %s", strerror(errno));
list = rc_stringlist_new();