diff options
| author | Elliott Hughes <enh@google.com> | 2014-11-21 21:49:05 -0600 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2014-11-21 21:49:05 -0600 |
| commit | 6a29bb1ebe62ada2dad5fb50f84f23a497cd677a (patch) | |
| tree | aa85037839d28c40ea459d96edd3feb0b3e9de76 | |
| parent | 3280d995b3447b7a94af006ac26d7d3656aee961 (diff) | |
| download | toybox-6a29bb1ebe62ada2dad5fb50f84f23a497cd677a.tar.gz | |
A patch against your current ToT that builds in AOSP master.
| -rw-r--r-- | lib/portability.c | 14 | ||||
| -rw-r--r-- | lib/portability.h | 3 | ||||
| -rw-r--r-- | toys/other/pivot_root.c | 3 |
3 files changed, 3 insertions, 17 deletions
diff --git a/lib/portability.c b/lib/portability.c index 17efc916..910b1ea9 100644 --- a/lib/portability.c +++ b/lib/portability.c @@ -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 @@ ssize_t getline(char **linep, size_t *np, FILE *stream) { 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) diff --git a/lib/portability.h b/lib/portability.h index 548c128f..2f2421d8 100644 --- a/lib/portability.h +++ b/lib/portability.h @@ -187,9 +187,6 @@ ssize_t getline(char **lineptr, size_t *n, FILE *stream); #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> diff --git a/toys/other/pivot_root.c b/toys/other/pivot_root.c index 3e4beacb..9a1f56ca 100644 --- a/toys/other/pivot_root.c +++ b/toys/other/pivot_root.c @@ -22,7 +22,8 @@ config PIVOT_ROOT #define FOR_pivot_root #include "toys.h" -#include <linux/unistd.h> +#include <sys/syscall.h> +#include <unistd.h> void pivot_root_main(void) { |