diff options
| -rw-r--r-- | lib/lsm.h | 2 | ||||
| -rw-r--r-- | lib/portability.h | 8 | ||||
| -rw-r--r-- | toys/net/ftpget.c | 2 |
3 files changed, 10 insertions, 2 deletions
@@ -55,7 +55,7 @@ static inline char *lsm_name(void) static inline char *lsm_context(void) { int ok = 0; - char *result; + char *result = 0; if (CFG_TOYBOX_SMACK) ok = smack_new_label_from_self(&result) > 0; else ok = getcon(&result) == 0; diff --git a/lib/portability.h b/lib/portability.h index 39e61810..0404c85e 100644 --- a/lib/portability.h +++ b/lib/portability.h @@ -256,3 +256,11 @@ extern CODE prioritynames[], facilitynames[]; #include <sys/random.h> #endif void xgetrandom(void *buf, unsigned len, unsigned flags); + +// android NDK doesn't have confstr +#ifndef _CS_PATH +#define _CS_PATH 0 +#define _CS_V7_ENV 1 +#include <string.h> +static inline void confstr(int a, char *b, int c) {strcpy(b, a ? "POSIXLY_CORRECT=1" : "/bin:/usr/bin");} +#endif diff --git a/toys/net/ftpget.c b/toys/net/ftpget.c index f41e05b9..9d6f6fd7 100644 --- a/toys/net/ftpget.c +++ b/toys/net/ftpget.c @@ -93,7 +93,7 @@ static int ftp_line(char *cmd, char *arg, int must) void ftpget_main(void) { struct sockaddr_in6 si6; - int rc, ii = 1, port; + int rc, ii = 1, port = 0; socklen_t sl = sizeof(si6); char *s, *remote = toys.optargs[2]; unsigned long long lenl = 0, lenr; |