summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Andersen2001-02-23 00:05:56 +0000
committerEric Andersen2001-02-23 00:05:56 +0000
commit41492d6c2371e8afafec67ad30657ab939ed2d70 (patch)
tree7500a7caa9017089bb732ac0fdd5fe1bf4b9c221
parentc163e5107f0af0f395f9998ee195896f6fa1b2e1 (diff)
downloadbusybox-41492d6c2371e8afafec67ad30657ab939ed2d70.zip
busybox-41492d6c2371e8afafec67ad30657ab939ed2d70.tar.gz
I should be more careful...
-rw-r--r--applets/usage.h2
-rw-r--r--include/usage.h2
-rw-r--r--init.c6
-rw-r--r--init/init.c6
-rw-r--r--usage.h2
5 files changed, 11 insertions, 7 deletions
diff --git a/applets/usage.h b/applets/usage.h
index a7cb9a6..76492e0 100644
--- a/applets/usage.h
+++ b/applets/usage.h
@@ -91,7 +91,7 @@
#define date_full_usage \
"Displays the current time in the given FORMAT, or sets the system date.\n" \
"\nOptions:\n" \
- \t-R\t\tOutputs RFC-822 compliant date string\n" \
+ "\t-R\t\tOutputs RFC-822 compliant date string\n" \
"\t-d STRING\tdisplay time described by STRING, not `now'\n" \
"\t-s\t\tSets time described by STRING\n" \
"\t-u\t\tPrints or sets Coordinated Universal Time"
diff --git a/include/usage.h b/include/usage.h
index a7cb9a6..76492e0 100644
--- a/include/usage.h
+++ b/include/usage.h
@@ -91,7 +91,7 @@
#define date_full_usage \
"Displays the current time in the given FORMAT, or sets the system date.\n" \
"\nOptions:\n" \
- \t-R\t\tOutputs RFC-822 compliant date string\n" \
+ "\t-R\t\tOutputs RFC-822 compliant date string\n" \
"\t-d STRING\tdisplay time described by STRING, not `now'\n" \
"\t-s\t\tSets time described by STRING\n" \
"\t-u\t\tPrints or sets Coordinated Universal Time"
diff --git a/init.c b/init.c
index 4284600..0620e1e 100644
--- a/init.c
+++ b/init.c
@@ -93,8 +93,9 @@ static const int RB_AUTOBOOT = 0x01234567;
#endif
#endif
-#undef _PATH_STDPATH
+#ifndef _PATH_STDPATH
#define _PATH_STDPATH "/usr/bin:/bin:/usr/sbin:/sbin"
+#endif
#if defined BB_FEATURE_INIT_COREDUMPS
@@ -133,7 +134,8 @@ static _syscall2(int, bdflush, int, func, int, data);
#define INIT_SCRIPT "/etc/init.d/rcS" /* Default sysinit script. */
#endif
-static const int MAXENV = 16; /* Number of env. vars */
+#define MAXENV 16 /* Number of env. vars */
+//static const int MAXENV = 16; /* Number of env. vars */
static const int LOG = 0x1;
static const int CONSOLE = 0x2;
diff --git a/init/init.c b/init/init.c
index 4284600..0620e1e 100644
--- a/init/init.c
+++ b/init/init.c
@@ -93,8 +93,9 @@ static const int RB_AUTOBOOT = 0x01234567;
#endif
#endif
-#undef _PATH_STDPATH
+#ifndef _PATH_STDPATH
#define _PATH_STDPATH "/usr/bin:/bin:/usr/sbin:/sbin"
+#endif
#if defined BB_FEATURE_INIT_COREDUMPS
@@ -133,7 +134,8 @@ static _syscall2(int, bdflush, int, func, int, data);
#define INIT_SCRIPT "/etc/init.d/rcS" /* Default sysinit script. */
#endif
-static const int MAXENV = 16; /* Number of env. vars */
+#define MAXENV 16 /* Number of env. vars */
+//static const int MAXENV = 16; /* Number of env. vars */
static const int LOG = 0x1;
static const int CONSOLE = 0x2;
diff --git a/usage.h b/usage.h
index a7cb9a6..76492e0 100644
--- a/usage.h
+++ b/usage.h
@@ -91,7 +91,7 @@
#define date_full_usage \
"Displays the current time in the given FORMAT, or sets the system date.\n" \
"\nOptions:\n" \
- \t-R\t\tOutputs RFC-822 compliant date string\n" \
+ "\t-R\t\tOutputs RFC-822 compliant date string\n" \
"\t-d STRING\tdisplay time described by STRING, not `now'\n" \
"\t-s\t\tSets time described by STRING\n" \
"\t-u\t\tPrints or sets Coordinated Universal Time"