diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2008-06-13 20:44:05 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2008-06-13 20:44:05 +0000 |
| commit | 21765fa063830923d13426ec6989c16da9210e49 (patch) | |
| tree | b564726ae79740552bff9bf6412e97f1ae34fbfd /include | |
| parent | 76f812803b72b5ccca764cdc7bfc42276fd70413 (diff) | |
udhcpc: kill undocumented -W, it was a no-op.
fix option parsing in the case some CONFIG_x are off.
disable -b on NOMMU, make backgrounding work correctly
(if a bit differently from MMU case). Previously,
it wasn't working at all.
stop using global data for flags in main(), opt
bitfield works as well.
function old new delta
cryptpw_main 177 153 -24
packed_usage 24478 24452 -26
client_background 26 - -26
udhcpc_main 2462 2372 -90
------------------------------------------------------------------------------
(add/remove: 0/1 grow/shrink: 0/3 up/down: 0/-166) Total: -166 bytes
Diffstat (limited to 'include')
| -rw-r--r-- | include/platform.h | 2 | ||||
| -rw-r--r-- | include/usage.h | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/include/platform.h b/include/platform.h index 21224fabf..cdc1151ad 100644 --- a/include/platform.h +++ b/include/platform.h @@ -248,12 +248,10 @@ typedef unsigned smalluint; (defined __UCLIBC__ && __UCLIBC_MAJOR__ >= 0 && __UCLIBC_MINOR__ >= 9 && \ __UCLIBC_SUBLEVEL__ > 28 && !defined __ARCH_USE_MMU__) #define BB_MMU 0 -#define BB_NOMMU 1 #define USE_FOR_NOMMU(...) __VA_ARGS__ #define USE_FOR_MMU(...) #else #define BB_MMU 1 -/* BB_NOMMU is not defined in this case! */ #define USE_FOR_NOMMU(...) #define USE_FOR_MMU(...) __VA_ARGS__ #endif diff --git a/include/usage.h b/include/usage.h index 3eb5b4867..4fba0e34e 100644 --- a/include/usage.h +++ b/include/usage.h @@ -4246,7 +4246,9 @@ "\n -O,--request-option=OPT Request DHCP option OPT (cumulative)" \ "\n -o,--no-default-options Do not request any options (unless -O is also given)" \ "\n -f,--foreground Run in foreground" \ + USE_FOR_MMU( \ "\n -b,--background Background if lease is not immediately obtained" \ + ) \ "\n -S,--syslog Log to syslog too" \ "\n -n,--now Exit with failure if lease is not immediately obtained" \ "\n -q,--quit Quit after obtaining lease" \ @@ -4273,7 +4275,9 @@ "\n -O OPT Request DHCP option OPT (cumulative)" \ "\n -o Do not request any options (unless -O is also given)" \ "\n -f Run in foreground" \ + USE_FOR_MMU( \ "\n -b Background if lease is not immediately obtained" \ + ) \ "\n -S Log to syslog too" \ "\n -n Exit with failure if lease is not immediately obtained" \ "\n -q Quit after obtaining lease" \ |