8f6ce094d
Denys Vlasenko
2011-07-08
Subject
a few tweaks for bionic
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
libbb/inet_common.c+2 -1
| @@ -175,7 +175,8 @@ int FAST_FUNC INET6_resolve(const char *name, struct sockaddr_in6 *sin6) | |
| return -1; | |
| } | |
| memcpy(sin6, ai->ai_addr, sizeof(*sin6)); | |
| - | freeaddrinfo(ai); |
| + | if (ai) |
| + | freeaddrinfo(ai); |
| return 0; | |
| } | |
libbb/obscure.c+2 -0
| @@ -109,10 +109,12 @@ static const char *obscure_msg(const char *old_p, const char *new_p, const struc | |
| if (string_checker(new_p, pw->pw_name)) { | |
| return "similar to username"; | |
| } | |
| + | #ifndef __BIONIC__ |
| /* no gecos as-is, as sub-string, reversed, capitalized, doubled */ | |
| if (pw->pw_gecos[0] && string_checker(new_p, pw->pw_gecos)) { | |
| return "similar to gecos"; | |
| } | |
| + | #endif |
| /* hostname as-is, as sub-string, reversed, capitalized, doubled */ | |
| hostname = safe_gethostname(); | |
| i = string_checker(new_p, hostname); | |
miscutils/adjtimex.c+5 -1
| @@ -23,7 +23,11 @@ | |
| //usage: "\n -p TCONST" | |
| #include "libbb.h" | |
| - | #include <sys/timex.h> |
| + | #ifdef __BIONIC__ |
| + | # include <linux/timex.h> |
| + | #else |
| + | # include <sys/timex.h> |
| + | #endif |
| static const uint16_t statlist_bit[] = { | |
| STA_PLL, | |
miscutils/setserial.c+1 -1
| @@ -11,7 +11,7 @@ | |
| //config:config SETSERIAL | |
| //config: bool "setserial" | |
| //config: default y | |
| - | //config: depends on PLATFORM_LINUX |
| + | //config: select PLATFORM_LINUX |
| //config: help | |
| //config: Retrieve or set Linux serial port. | |