Mercurial > hg > toybox
changeset 1569:da72fa267b7b draft
A patch against your current ToT that builds in AOSP master.
author | Elliott Hughes <enh@google.com> |
---|---|
date | Fri, 21 Nov 2014 21:49:05 -0600 |
parents | 272bd62cb194 |
children | d2eb3c88a724 |
files | lib/portability.c lib/portability.h toys/other/pivot_root.c |
diffstat | 3 files changed, 3 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/lib/portability.c Fri Nov 21 10:06:45 2014 -0600 +++ b/lib/portability.c Fri Nov 21 21:49:05 2014 -0600 @@ -5,11 +5,8 @@ */ #include "toys.h" -#if defined(__ANDROID__) -#include <sys/syscall.h> -#endif -#if defined(__APPLE__) || defined(__ANDROID__) +#if defined(__APPLE__) ssize_t getdelim(char **linep, size_t *np, int delim, FILE *stream) { int ch; @@ -62,16 +59,7 @@ { return getdelim(linep, np, '\n', stream); } -#endif -#if defined(__ANDROID__) -int sethostname(const char *name, size_t len) -{ - return syscall(__NR_sethostname, name, len); -} -#endif - -#if defined(__APPLE__) extern char **environ; int clearenv(void)
--- a/lib/portability.h Fri Nov 21 10:06:45 2014 -0600 +++ b/lib/portability.h Fri Nov 21 21:49:05 2014 -0600 @@ -187,9 +187,6 @@ #include <sys/swap.h> // Android is missing some headers and functions -#if defined(__ANDROID__) -int sethostname(const char *name, size_t len); -#endif // "generated/config.h" is included first #if CFG_TOYBOX_SHADOW #include <shadow.h>