diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2006-10-08 12:49:22 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2006-10-08 12:49:22 +0000 |
| commit | 1385899416a4396385ad421ae1f532be7103738a (patch) | |
| tree | fc4d14a910593d1235318bb36abe5e9f72d2039e /networking/udhcp/files.c | |
| parent | 5625415085e68ac5e150f54e685417c866620d76 (diff) | |
| download | busybox-w32-1385899416a4396385ad421ae1f532be7103738a.tar.gz busybox-w32-1385899416a4396385ad421ae1f532be7103738a.tar.bz2 busybox-w32-1385899416a4396385ad421ae1f532be7103738a.zip | |
attempt to regularize atoi mess.
Diffstat (limited to 'networking/udhcp/files.c')
| -rw-r--r-- | networking/udhcp/files.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/networking/udhcp/files.c b/networking/udhcp/files.c index d9dfb8965..52d383869 100644 --- a/networking/udhcp/files.c +++ b/networking/udhcp/files.c | |||
| @@ -35,7 +35,8 @@ static int read_ip(const char *line, void *arg) | |||
| 35 | int retval = 1; | 35 | int retval = 1; |
| 36 | 36 | ||
| 37 | if (!inet_aton(line, addr)) { | 37 | if (!inet_aton(line, addr)) { |
| 38 | if ((host = gethostbyname(line))) | 38 | host = gethostbyname(line); |
| 39 | if (host) | ||
| 39 | addr->s_addr = *((unsigned long *) host->h_addr_list[0]); | 40 | addr->s_addr = *((unsigned long *) host->h_addr_list[0]); |
| 40 | else retval = 0; | 41 | else retval = 0; |
| 41 | } | 42 | } |
| @@ -72,10 +73,7 @@ static int read_str(const char *line, void *arg) | |||
| 72 | 73 | ||
| 73 | static int read_u32(const char *line, void *arg) | 74 | static int read_u32(const char *line, void *arg) |
| 74 | { | 75 | { |
| 75 | uint32_t *dest = arg; | 76 | return safe_strtou32(line, (uint32_t*)arg) == 0; |
| 76 | char *endptr; | ||
| 77 | *dest = strtoul(line, &endptr, 0); | ||
| 78 | return endptr[0] == '\0'; | ||
| 79 | } | 77 | } |
| 80 | 78 | ||
| 81 | 79 | ||