emo/openrc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mountinfo: make the path to /proc/mounts a constant

Browse Source 
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
This commit is contained in:
William Hubbs 2017-01-04 18:18:27 -06:00
parent c304522131
commit b73941f0c3
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/rc/mountinfo.c
View File

@ -46,6 +46,7 @@
#include "_usage.h" #include "_usage.h"
const char *applet = NULL; const char *applet = NULL;
const char *procmounts = "/proc/mounts";
const char *extraopts = "[mount1] [mount2] ..."; const char *extraopts = "[mount1] [mount2] ...";
const char *getoptstring = "f:F:n:N:o:O:p:P:iste:E:" getoptstring_COMMON; const char *getoptstring = "f:F:n:N:o:O:p:P:iste:E:" getoptstring_COMMON;
const struct option longopts[] = { const struct option longopts[] = {
@ -323,7 +324,7 @@ find_mounts(struct args *args)
int netdev; int netdev;
RC_STRINGLIST *list; RC_STRINGLIST *list;
if ((fp = fopen("/proc/self/mounts", "r")) == NULL) if ((fp = fopen(procmounts, "r")) == NULL)
eerrorx("getmntinfo: %s", strerror(errno)); eerrorx("getmntinfo: %s", strerror(errno));
list = rc_stringlist_new(); list = rc_stringlist_new();