From 7a95dd6f828ebf0ccf6e4636ca15f4e01c56361b Mon Sep 17 00:00:00 2001
From: Eric Andersen <andersen@codepoet.org>
Date: Mon, 12 Sep 2005 21:26:42 +0000
Subject: [PATCH] sysctl was seriously broken.  And since in some cases
 'CONFIG_SYSCTL' could be included into application space via the kernel
 config option of the same name, nasty compilation problems could result.

---
 busybox/include/applets.h       | 2 +-
 busybox/include/usage.h         | 8 +++-----
 busybox/procps/Config.in        | 2 +-
 busybox/procps/Makefile.in      | 2 +-
 busybox/sysdeps/linux/defconfig | 2 +-
 5 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/busybox/include/applets.h b/busybox/include/applets.h
index d89500e77..c0fef25c1 100644
--- a/busybox/include/applets.h
+++ b/busybox/include/applets.h
@@ -547,7 +547,7 @@
 #ifdef CONFIG_SYNC
 	APPLET(sync, sync_main, _BB_DIR_BIN, _BB_SUID_NEVER)
 #endif
-#ifdef CONFIG_SYSCTL
+#ifdef CONFIG_BB_SYSCTL
 	APPLET(sysctl, sysctl_main, _BB_DIR_SBIN, _BB_SUID_NEVER)
 #endif
 #ifdef CONFIG_SYSLOGD
diff --git a/busybox/include/usage.h b/busybox/include/usage.h
index 24a14d075..a4a1c7d5b 100644
--- a/busybox/include/usage.h
+++ b/busybox/include/usage.h
@@ -2302,24 +2302,22 @@
   #define USAGE_IPC_LOG(a)
 #endif
 
-#ifdef CONFIG_SYSCTL
 #define sysctl_trivial_usage \
 	"[OPTIONS]... [VALUE]...\n"
-#define sysctl_full_usage
-	"sysctl - configure kernel parameters at runtime\n\n" \
+#define sysctl_full_usage \
+	"configure kernel parameters at runtime\n\n" \
 	"Options:\n" \
 	"\t-n\tUse this option to disable printing of the key name when printing values.\n" \
 	"\t-w\tUse this option when you want to change a sysctl setting.\n" \
 	"\t-p\tLoad in sysctl settings from the file specified or /etc/sysctl.conf if none given.\n" \
 	"\t-a\tDisplay all values currently available.\n" \
 	"\t-A\tDisplay all values currently available in table form."
-#define sysctl_example_usage
+#define sysctl_example_usage \
 	"sysctl [-n] variable ...\n" \
 	"sysctl [-n] -w variable=value ...\n" \
 	"sysctl [-n] -a\n" \
 	"sysctl [-n] -p <file>\t(default /etc/sysctl.conf)\n" \
 	"sysctl [-n] -A\n"
-#endif
 
 #define syslogd_trivial_usage \
 	"[OPTION]..."
diff --git a/busybox/procps/Config.in b/busybox/procps/Config.in
index 8d557972c..7672582dd 100644
--- a/busybox/procps/Config.in
+++ b/busybox/procps/Config.in
@@ -72,7 +72,7 @@ config CONFIG_UPTIME
 	  the system has been running, how many users are currently logged
 	  on, and the system load averages for the past 1, 5, and 15 minutes.
 
-config CONFIG_SYSCTL
+config CONFIG_BB_SYSCTL
 	bool "sysctl"
 	default n
 	help
diff --git a/busybox/procps/Makefile.in b/busybox/procps/Makefile.in
index b9eb117fd..5207b801b 100644
--- a/busybox/procps/Makefile.in
+++ b/busybox/procps/Makefile.in
@@ -29,7 +29,7 @@ PROCPS-$(CONFIG_KILL)		+= kill.o
 PROCPS-$(CONFIG_PIDOF)		+= pidof.o
 PROCPS-$(CONFIG_PS)		+= ps.o
 PROCPS-$(CONFIG_RENICE)		+= renice.o
-PROCPS-$(CONFIG_SYSCTL)		+= sysctl.o
+PROCPS-$(CONFIG_BB_SYSCTL)	+= sysctl.o
 PROCPS-$(CONFIG_TOP)		+= top.o
 PROCPS-$(CONFIG_UPTIME)		+= uptime.o
 
diff --git a/busybox/sysdeps/linux/defconfig b/busybox/sysdeps/linux/defconfig
index fd2b118e3..5a0eddb86 100644
--- a/busybox/sysdeps/linux/defconfig
+++ b/busybox/sysdeps/linux/defconfig
@@ -333,7 +333,7 @@ CONFIG_PS=y
 # CONFIG_RENICE is not set
 # CONFIG_TOP is not set
 CONFIG_UPTIME=y
-# CONFIG_SYSCTL is not set
+# CONFIG_BB_SYSCTL is not set
 
 #
 # Another Bourne-like Shell
-- 
2.25.1