Turned some stuff into features that really are features, not apps.

 -Erik

7 files changed, 28 insertions, 23 deletions

diff --git a/busybox.def.h b/busybox.def.h
index 81e5f1070..9b5a85b3e 100644
--- a/busybox.def.h
+++ b/busybox.def.h
@@ -44,7 +44,6 @@
 #define BB_INSMOD
 #define BB_KILL
 #define BB_KILLALL
-#define BB_KLOGD
 #define BB_LENGTH
 #define BB_LN
 #define BB_LOADACM
@@ -55,7 +54,7 @@
 #define BB_LS
 #define BB_LSMOD
 #define BB_MAKEDEVS
-//#define BB_MD5SUM
+#define BB_MD5SUM
 #define BB_MKDIR
 #define BB_MKFIFO
 #define BB_MKFS_MINIX
@@ -159,7 +158,7 @@
 #define BB_FEATURE_LS_RECURSIVE
 //
 // Change ping implementation -- simplified, featureless, but really small.
-//#define BB_SIMPLE_PING
+//#define BB_FEATURE_SIMPLE_PING
 //
 // Make init use a simplified /etc/inittab file (recommended).
 #define BB_FEATURE_USE_INITTAB
@@ -178,6 +177,9 @@
 //Make sure nothing is printed to the console on boot
 #define BB_FEATURE_EXTRA_QUIET
 //
+//Should syslogd also provide klogd support?
+#define BB_FEATURE_KLOGD
+//
 //Simple tail implementation (2k vs 6k for the full one).  Still
 //provides 'tail -f' support -- but for only one file at a time.
 #define BB_FEATURE_SIMPLE_TAIL
@@ -220,6 +222,9 @@
 //Turn on extra fbset options
 //#define BB_FEATURE_FBSET_FANCY
 //
+//Turn on fbset readmode support
+//#define BB_FEATURE_FBSET_READMODE
+//
 // You must enable one or both of these features
 // Support installing modules from pre 2.1 kernels
 //#define BB_FEATURE_INSMOD_OLD_KERNEL
diff --git a/fbset.c b/fbset.c
index 6b6b84c04..3f36a7011 100644
--- a/fbset.c
+++ b/fbset.c
@@ -140,7 +140,7 @@ struct cmdoptions_t {
 static int readmode(struct fb_var_screeninfo *base, const char *fn,
 					const char *mode)
 {
-#ifdef BB_FBSET_READMODE
+#ifdef BB_FEATURE_FBSET_READMODE
 	FILE *f;
 	char buf[256];
 	char *p = buf;
diff --git a/networking/ping.c b/networking/ping.c
index 6386c0e42..b9e8d0fd2 100644
--- a/networking/ping.c
+++ b/networking/ping.c
@@ -1,6 +1,6 @@
 /* vi: set sw=4 ts=4: */
 /*
- * $Id: ping.c,v 1.17 2000/06/19 18:51:53 andersen Exp $
+ * $Id: ping.c,v 1.18 2000/07/06 23:10:29 andersen Exp $
  * Mini ping implementation for busybox
  *
  * Copyright (C) 1999 by Randolph Chung <tausq@debian.org>
@@ -173,7 +173,7 @@ static int in_cksum(unsigned short *buf, int sz)
 }
 
 /* simple version */
-#ifdef BB_SIMPLE_PING
+#ifdef BB_FEATURE_SIMPLE_PING
 static const char *ping_usage = "ping host\n"
 #ifndef BB_FEATURE_TRIVIAL_HELP
 	"\nSend ICMP ECHO_REQUEST packets to network hosts\n"
@@ -265,7 +265,7 @@ extern int ping_main(int argc, char **argv)
 	exit(TRUE);
 }
 
-#else /* ! BB_SIMPLE_PING */
+#else /* ! BB_FEATURE_SIMPLE_PING */
 /* full(er) version */
 static const char *ping_usage = "ping [OPTION]... host\n"
 #ifndef BB_FEATURE_TRIVIAL_HELP
@@ -561,7 +561,7 @@ extern int ping_main(int argc, char **argv)
 	ping(*argv);
 	return(TRUE);
 }
-#endif /* ! BB_SIMPLE_PING */
+#endif /* ! BB_FEATURE_SIMPLE_PING */
 
 /*
  * Copyright (c) 1989 The Regents of the University of California.
diff --git a/ping.c b/ping.c
index 6386c0e42..b9e8d0fd2 100644
--- a/ping.c
+++ b/ping.c
@@ -1,6 +1,6 @@
 /* vi: set sw=4 ts=4: */
 /*
- * $Id: ping.c,v 1.17 2000/06/19 18:51:53 andersen Exp $
+ * $Id: ping.c,v 1.18 2000/07/06 23:10:29 andersen Exp $
  * Mini ping implementation for busybox
  *
  * Copyright (C) 1999 by Randolph Chung <tausq@debian.org>
@@ -173,7 +173,7 @@ static int in_cksum(unsigned short *buf, int sz)
 }
 
 /* simple version */
-#ifdef BB_SIMPLE_PING
+#ifdef BB_FEATURE_SIMPLE_PING
 static const char *ping_usage = "ping host\n"
 #ifndef BB_FEATURE_TRIVIAL_HELP
 	"\nSend ICMP ECHO_REQUEST packets to network hosts\n"
@@ -265,7 +265,7 @@ extern int ping_main(int argc, char **argv)
 	exit(TRUE);
 }
 
-#else /* ! BB_SIMPLE_PING */
+#else /* ! BB_FEATURE_SIMPLE_PING */
 /* full(er) version */
 static const char *ping_usage = "ping [OPTION]... host\n"
 #ifndef BB_FEATURE_TRIVIAL_HELP
@@ -561,7 +561,7 @@ extern int ping_main(int argc, char **argv)
 	ping(*argv);
 	return(TRUE);
 }
-#endif /* ! BB_SIMPLE_PING */
+#endif /* ! BB_FEATURE_SIMPLE_PING */
 
 /*
  * Copyright (c) 1989 The Regents of the University of California.
diff --git a/sysklogd/syslogd.c b/sysklogd/syslogd.c
index f4e7f459b..9ab228f21 100644
--- a/sysklogd/syslogd.c
+++ b/sysklogd/syslogd.c
@@ -85,7 +85,7 @@ static const char syslogd_usage[] =
 	"Options:\n"
 	"\t-m NUM\t\tInterval between MARK lines (default=20min, 0=off)\n"
 	"\t-n\t\tRun as a foreground process\n"
-#ifdef BB_KLOGD
+#ifdef BB_FEATURE_KLOGD
 	"\t-K\t\tDo not start up the klogd process\n"
 #endif
 	"\t-O FILE\t\tUse an alternate log file (default=/var/log/messages)\n"
@@ -316,7 +316,7 @@ static void doSyslogd (void)
 	}
 }
 
-#ifdef BB_KLOGD
+#ifdef BB_FEATURE_KLOGD
 
 static void klogd_signal(int sig)
 {
@@ -407,7 +407,7 @@ extern int syslogd_main(int argc, char **argv)
 	int pid, klogd_pid;
 	int doFork = TRUE;
 
-#ifdef BB_KLOGD
+#ifdef BB_FEATURE_KLOGD
 	int startKlogd = TRUE;
 #endif
 	int stopDoingThat = FALSE;
@@ -427,7 +427,7 @@ extern int syslogd_main(int argc, char **argv)
 			case 'n':
 				doFork = FALSE;
 				break;
-#ifdef BB_KLOGD
+#ifdef BB_FEATURE_KLOGD
 			case 'K':
 				startKlogd = FALSE;
 				break;
@@ -456,7 +456,7 @@ extern int syslogd_main(int argc, char **argv)
 
 	umask(0);
 
-#ifdef BB_KLOGD
+#ifdef BB_FEATURE_KLOGD
 	/* Start up the klogd process */
 	if (startKlogd == TRUE) {
 		klogd_pid = fork();
diff --git a/syslogd.c b/syslogd.c
index f4e7f459b..9ab228f21 100644
--- a/syslogd.c
+++ b/syslogd.c
@@ -85,7 +85,7 @@ static const char syslogd_usage[] =
 	"Options:\n"
 	"\t-m NUM\t\tInterval between MARK lines (default=20min, 0=off)\n"
 	"\t-n\t\tRun as a foreground process\n"
-#ifdef BB_KLOGD
+#ifdef BB_FEATURE_KLOGD
 	"\t-K\t\tDo not start up the klogd process\n"
 #endif
 	"\t-O FILE\t\tUse an alternate log file (default=/var/log/messages)\n"
@@ -316,7 +316,7 @@ static void doSyslogd (void)
 	}
 }
 
-#ifdef BB_KLOGD
+#ifdef BB_FEATURE_KLOGD
 
 static void klogd_signal(int sig)
 {
@@ -407,7 +407,7 @@ extern int syslogd_main(int argc, char **argv)
 	int pid, klogd_pid;
 	int doFork = TRUE;
 
-#ifdef BB_KLOGD
+#ifdef BB_FEATURE_KLOGD
 	int startKlogd = TRUE;
 #endif
 	int stopDoingThat = FALSE;
@@ -427,7 +427,7 @@ extern int syslogd_main(int argc, char **argv)
 			case 'n':
 				doFork = FALSE;
 				break;
-#ifdef BB_KLOGD
+#ifdef BB_FEATURE_KLOGD
 			case 'K':
 				startKlogd = FALSE;
 				break;
@@ -456,7 +456,7 @@ extern int syslogd_main(int argc, char **argv)
 
 	umask(0);
 
-#ifdef BB_KLOGD
+#ifdef BB_FEATURE_KLOGD
 	/* Start up the klogd process */
 	if (startKlogd == TRUE) {
 		klogd_pid = fork();
diff --git a/util-linux/fbset.c b/util-linux/fbset.c
index 6b6b84c04..3f36a7011 100644
--- a/util-linux/fbset.c
+++ b/util-linux/fbset.c
@@ -140,7 +140,7 @@ struct cmdoptions_t {
 static int readmode(struct fb_var_screeninfo *base, const char *fn,
 					const char *mode)
 {
-#ifdef BB_FBSET_READMODE
+#ifdef BB_FEATURE_FBSET_READMODE
 	FILE *f;
 	char buf[256];
 	char *p = buf;