diff options
author | Eric Andersen <andersen@codepoet.org> | 2001-02-23 00:05:56 +0000 |
---|---|---|
committer | Eric Andersen <andersen@codepoet.org> | 2001-02-23 00:05:56 +0000 |
commit | 41492d6c2371e8afafec67ad30657ab939ed2d70 (patch) | |
tree | 7500a7caa9017089bb732ac0fdd5fe1bf4b9c221 | |
parent | c163e5107f0af0f395f9998ee195896f6fa1b2e1 (diff) | |
download | busybox-w32-41492d6c2371e8afafec67ad30657ab939ed2d70.tar.gz busybox-w32-41492d6c2371e8afafec67ad30657ab939ed2d70.tar.bz2 busybox-w32-41492d6c2371e8afafec67ad30657ab939ed2d70.zip |
I should be more careful...
-rw-r--r-- | applets/usage.h | 2 | ||||
-rw-r--r-- | include/usage.h | 2 | ||||
-rw-r--r-- | init.c | 6 | ||||
-rw-r--r-- | init/init.c | 6 | ||||
-rw-r--r-- | usage.h | 2 |
5 files changed, 11 insertions, 7 deletions
diff --git a/applets/usage.h b/applets/usage.h index a7cb9a6be..76492e0a7 100644 --- a/applets/usage.h +++ b/applets/usage.h | |||
@@ -91,7 +91,7 @@ | |||
91 | #define date_full_usage \ | 91 | #define date_full_usage \ |
92 | "Displays the current time in the given FORMAT, or sets the system date.\n" \ | 92 | "Displays the current time in the given FORMAT, or sets the system date.\n" \ |
93 | "\nOptions:\n" \ | 93 | "\nOptions:\n" \ |
94 | \t-R\t\tOutputs RFC-822 compliant date string\n" \ | 94 | "\t-R\t\tOutputs RFC-822 compliant date string\n" \ |
95 | "\t-d STRING\tdisplay time described by STRING, not `now'\n" \ | 95 | "\t-d STRING\tdisplay time described by STRING, not `now'\n" \ |
96 | "\t-s\t\tSets time described by STRING\n" \ | 96 | "\t-s\t\tSets time described by STRING\n" \ |
97 | "\t-u\t\tPrints or sets Coordinated Universal Time" | 97 | "\t-u\t\tPrints or sets Coordinated Universal Time" |
diff --git a/include/usage.h b/include/usage.h index a7cb9a6be..76492e0a7 100644 --- a/include/usage.h +++ b/include/usage.h | |||
@@ -91,7 +91,7 @@ | |||
91 | #define date_full_usage \ | 91 | #define date_full_usage \ |
92 | "Displays the current time in the given FORMAT, or sets the system date.\n" \ | 92 | "Displays the current time in the given FORMAT, or sets the system date.\n" \ |
93 | "\nOptions:\n" \ | 93 | "\nOptions:\n" \ |
94 | \t-R\t\tOutputs RFC-822 compliant date string\n" \ | 94 | "\t-R\t\tOutputs RFC-822 compliant date string\n" \ |
95 | "\t-d STRING\tdisplay time described by STRING, not `now'\n" \ | 95 | "\t-d STRING\tdisplay time described by STRING, not `now'\n" \ |
96 | "\t-s\t\tSets time described by STRING\n" \ | 96 | "\t-s\t\tSets time described by STRING\n" \ |
97 | "\t-u\t\tPrints or sets Coordinated Universal Time" | 97 | "\t-u\t\tPrints or sets Coordinated Universal Time" |
@@ -93,8 +93,9 @@ static const int RB_AUTOBOOT = 0x01234567; | |||
93 | #endif | 93 | #endif |
94 | #endif | 94 | #endif |
95 | 95 | ||
96 | #undef _PATH_STDPATH | 96 | #ifndef _PATH_STDPATH |
97 | #define _PATH_STDPATH "/usr/bin:/bin:/usr/sbin:/sbin" | 97 | #define _PATH_STDPATH "/usr/bin:/bin:/usr/sbin:/sbin" |
98 | #endif | ||
98 | 99 | ||
99 | 100 | ||
100 | #if defined BB_FEATURE_INIT_COREDUMPS | 101 | #if defined BB_FEATURE_INIT_COREDUMPS |
@@ -133,7 +134,8 @@ static _syscall2(int, bdflush, int, func, int, data); | |||
133 | #define INIT_SCRIPT "/etc/init.d/rcS" /* Default sysinit script. */ | 134 | #define INIT_SCRIPT "/etc/init.d/rcS" /* Default sysinit script. */ |
134 | #endif | 135 | #endif |
135 | 136 | ||
136 | static const int MAXENV = 16; /* Number of env. vars */ | 137 | #define MAXENV 16 /* Number of env. vars */ |
138 | //static const int MAXENV = 16; /* Number of env. vars */ | ||
137 | static const int LOG = 0x1; | 139 | static const int LOG = 0x1; |
138 | static const int CONSOLE = 0x2; | 140 | static const int CONSOLE = 0x2; |
139 | 141 | ||
diff --git a/init/init.c b/init/init.c index 4284600c4..0620e1ea1 100644 --- a/init/init.c +++ b/init/init.c | |||
@@ -93,8 +93,9 @@ static const int RB_AUTOBOOT = 0x01234567; | |||
93 | #endif | 93 | #endif |
94 | #endif | 94 | #endif |
95 | 95 | ||
96 | #undef _PATH_STDPATH | 96 | #ifndef _PATH_STDPATH |
97 | #define _PATH_STDPATH "/usr/bin:/bin:/usr/sbin:/sbin" | 97 | #define _PATH_STDPATH "/usr/bin:/bin:/usr/sbin:/sbin" |
98 | #endif | ||
98 | 99 | ||
99 | 100 | ||
100 | #if defined BB_FEATURE_INIT_COREDUMPS | 101 | #if defined BB_FEATURE_INIT_COREDUMPS |
@@ -133,7 +134,8 @@ static _syscall2(int, bdflush, int, func, int, data); | |||
133 | #define INIT_SCRIPT "/etc/init.d/rcS" /* Default sysinit script. */ | 134 | #define INIT_SCRIPT "/etc/init.d/rcS" /* Default sysinit script. */ |
134 | #endif | 135 | #endif |
135 | 136 | ||
136 | static const int MAXENV = 16; /* Number of env. vars */ | 137 | #define MAXENV 16 /* Number of env. vars */ |
138 | //static const int MAXENV = 16; /* Number of env. vars */ | ||
137 | static const int LOG = 0x1; | 139 | static const int LOG = 0x1; |
138 | static const int CONSOLE = 0x2; | 140 | static const int CONSOLE = 0x2; |
139 | 141 | ||
@@ -91,7 +91,7 @@ | |||
91 | #define date_full_usage \ | 91 | #define date_full_usage \ |
92 | "Displays the current time in the given FORMAT, or sets the system date.\n" \ | 92 | "Displays the current time in the given FORMAT, or sets the system date.\n" \ |
93 | "\nOptions:\n" \ | 93 | "\nOptions:\n" \ |
94 | \t-R\t\tOutputs RFC-822 compliant date string\n" \ | 94 | "\t-R\t\tOutputs RFC-822 compliant date string\n" \ |
95 | "\t-d STRING\tdisplay time described by STRING, not `now'\n" \ | 95 | "\t-d STRING\tdisplay time described by STRING, not `now'\n" \ |
96 | "\t-s\t\tSets time described by STRING\n" \ | 96 | "\t-s\t\tSets time described by STRING\n" \ |
97 | "\t-u\t\tPrints or sets Coordinated Universal Time" | 97 | "\t-u\t\tPrints or sets Coordinated Universal Time" |