diff options
| author | Tomas Heinrich | 2009-11-05 08:42:47 +0100 |
|---|---|---|
| committer | Denys Vlasenko | 2009-11-05 08:42:47 +0100 |
| commit | 85bb843f47342b19c4f0814331c1f4c78b0011ad (patch) | |
| tree | 84bbb356114a9645981dbc39fe83cfc517151225 | |
| parent | 05ed00f09aef68f2b5f67c4f4a56dc7fcd50aefb (diff) | |
| download | busybox-85bb843f47342b19c4f0814331c1f4c78b0011ad.zip busybox-85bb843f47342b19c4f0814331c1f4c78b0011ad.tar.gz | |
dumpleases: unicode spport
Signed-off-by: Tomas Heinrich <heinrich.tomas@gmail.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| -rw-r--r-- | networking/udhcp/dumpleases.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/networking/udhcp/dumpleases.c b/networking/udhcp/dumpleases.c index cbf9f58..017c801 100644 --- a/networking/udhcp/dumpleases.c +++ b/networking/udhcp/dumpleases.c @@ -5,6 +5,7 @@ #include "common.h" #include "dhcpd.h" +#include "unicode.h" #if BB_LITTLE_ENDIAN static inline uint64_t hton64(uint64_t v) @@ -42,6 +43,8 @@ int dumpleases_main(int argc UNUSED_PARAM, char **argv) applet_long_options = dumpleases_longopts; #endif + check_unicode_in_env(); + opt_complementary = "=0:a--r:r--a"; opt = getopt32(argv, "arf:", &file); @@ -67,7 +70,12 @@ int dumpleases_main(int argc UNUSED_PARAM, char **argv) addr.s_addr = lease.lease_nip; /* actually, 15+1 and 19+1, +1 is a space between columns */ /* lease.hostname is char[20] and is always NUL terminated */ +#if ENABLE_FEATURE_ASSUME_UNICODE + printf(" %-16s%s%*s", inet_ntoa(addr), lease.hostname, + 20 - (int)bb_mbstrlen(lease.hostname), ""); +#else printf(" %-16s%-20s", inet_ntoa(addr), lease.hostname); +#endif expires_abs = ntohl(lease.expires) + written_at; if (expires_abs <= curr) { puts("expired"); |