The necessary proc and sysfs files are tested to be present. When
information files are missing the ipcs will use obsolted systems, and
data structures, as fallback.
Signed-off-by: Sami Kerola <kerolasa@xxxxxx>
---
include/pathnames.h | 11 +++++++++++
sys-utils/ipcs.c | 21 +++++++++++++++++++++
2 files changed, 32 insertions(+)
diff --git a/include/pathnames.h b/include/pathnames.h
index d0ed7a1..99b8417 100644
--- a/include/pathnames.h
+++ b/include/pathnames.h
@@ -150,5 +150,16 @@
/* wdctl path */
#define _PATH_WATCHDOG_DEV "/dev/watchdog"
+/* ipc paths */
+#define _PATH_PROC_IPCMSG "/proc/sysvipc/msg"
+#define _PATH_PROC_IPCSEM "/proc/sysvipc/sem"
+#define _PATH_PROC_IPCSHM "/proc/sysvipc/shm"
+#define _PATH_PROC_IPC_MSGMAX "/proc/sys/kernel/msgmax"
+#define _PATH_PROC_IPC_MSGMNB "/proc/sys/kernel/msgmnb"
+#define _PATH_PROC_IPC_MSGMNI "/proc/sys/kernel/msgmni"
+#define _PATH_PROC_IPC_MSG "/proc/sys/kernel/sem"
+#define _PATH_PROC_IPC_SHMALL "/proc/sys/kernel/shmall"
+#define _PATH_PROC_IPC_SHMMNI "/proc/sys/kernel/shmmni"
+
#endif /* PATHNAMES_H */
diff --git a/sys-utils/ipcs.c b/sys-utils/ipcs.c
index ca10c3d..900fc65 100644
--- a/sys-utils/ipcs.c
+++ b/sys-utils/ipcs.c
@@ -34,6 +34,7 @@
#include "c.h"
#include "nls.h"
#include "closestream.h"
+#include "pathnames.h"
/*
* SHM_DEST and SHM_LOCKED are defined in kernel headers, but inside
@@ -167,6 +168,21 @@ struct proc_limits {
};
/* End of the /proc & /sys structures */
+static int test_ipc_proc_paths(void)
+{
+ if (access(_PATH_PROC_IPCMSG, F_OK) == 0 &&
+ access(_PATH_PROC_IPCSEM, F_OK) == 0 &&
+ access(_PATH_PROC_IPCSHM, F_OK) == 0 &&
+ access(_PATH_PROC_IPC_MSGMAX, F_OK) == 0 &&
+ access(_PATH_PROC_IPC_MSGMNB, F_OK) == 0 &&
+ access(_PATH_PROC_IPC_MSGMNI, F_OK) == 0 &&
+ access(_PATH_PROC_IPC_MSG, F_OK) == 0 &&
+ access(_PATH_PROC_IPC_SHMALL, F_OK) == 0 &&
+ access(_PATH_PROC_IPC_SHMMNI, F_OK) == 0)
+ return 1;
+ return 0;
+}
+
void do_shm (char format);
void do_sem (char format);
void do_msg (char format);
@@ -203,6 +219,7 @@ static void __attribute__ ((__noreturn__)) usage(FILE * out)
int main (int argc, char **argv)
{
int opt, msg = 0, sem = 0, shm = 0, id=0, print=0;
+ int use_proc = 0;
char format = 0;
static const struct option longopts[] = {
{"id", required_argument, NULL, 'i'},
@@ -269,6 +286,10 @@ int main (int argc, char **argv)
}
}
+ use_proc = test_ipc_proc_paths();
+ if (!use_proc)
+ warnx(_("using unreliable syscalls"));
+
if (print) {
if (shm)
print_shm (id);
--
1.7.12.3
--
To unsubscribe from this list: send the line "unsubscribe util-linux" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
