From: Craig Small <csmall@enc.com.au>
Date: Thu, 1 Mar 2018 10:25:04 +0000 (+1100)
Subject: sysctl: Bring procio functions out of library
X-Git-Tag: v3.3.13rc1~15
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c9be22a8c0e8a1ad47e07d405517a04efda85987;p=procps-ng

sysctl: Bring procio functions out of library

The procio functions that were in the library have been
moved into sysctl. sysctl is not linked to libprocps in
newlib and none of the other procps binaries would need
to read/write large data to the procfs.

References:
 be6b048a41b0a47ebed602d9e0993fe18c9de237
---

diff --git a/Makefile.am b/Makefile.am
index c3b5386d..dfc97383 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -195,7 +195,11 @@ pmap_SOURCES = pmap.c lib/fileutils.c
 if !CYGWIN
 pwdx_SOURCES = pwdx.c lib/fileutils.c
 pwdx_LDADD= $(CYGWINFLAGS)
-sysctl_SOURCES = sysctl.c lib/fileutils.c
+sysctl_SOURCES = \
+	sysctl.c \
+	lib/fileutils.c \
+	procio.c \
+	procio.h
 endif
 tload_SOURCES = tload.c lib/strutils.c lib/fileutils.c
 uptime_SOURCES = uptime.c lib/fileutils.c
@@ -233,8 +237,6 @@ proc_libprocps_la_SOURCES = \
 	proc/escape.h \
 	proc/numa.c \
 	proc/numa.h \
-	proc/procio.c \
-	proc/procio.h \
 	proc/procps-private.h \
 	proc/procps.h \
 	proc/pwcache.c \
@@ -260,7 +262,6 @@ proc_libprocps_la_include_HEADERS = \
 	proc/devname.h \
 	proc/escape.h \
 	proc/numa.h \
-	proc/procio.h \
 	proc/procps.h \
 	proc/pwcache.h \
 	proc/readproc.h \
@@ -272,7 +273,6 @@ proc_libprocps_la_include_HEADERS = \
 	proc/whattime.h
 
 dist_man_MANS += \
-	proc/fprocopen.3 \
 	proc/openproc.3 \
 	proc/readproc.3 \
 	proc/readproctab.3
diff --git a/proc/libprocps.sym b/proc/libprocps.sym
index 5382415c..75f334a9 100644
--- a/proc/libprocps.sym
+++ b/proc/libprocps.sym
@@ -8,7 +8,6 @@ global:
 	escape_str;
 	escape_strlist;
 	escaped_copy;
-	fprocopen;
 	free_slabinfo;
 	freeproc;
 	get_ns_id;
diff --git a/proc/procio.c b/procio.c
similarity index 100%
rename from proc/procio.c
rename to procio.c