aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2015-01-16 13:49:23 -0600
committerElliott Hughes <enh@google.com>2015-01-16 13:49:23 -0600
commitc2415d16a8991e2192bda002baab840bfa4d5d79 (patch)
treec8ad3f35c90d2c7d25cbc95b7ce9dfbec72416a6
parent3b915991f8c8648f939498777f4d76aad04f2817 (diff)
downloadtoybox-c2415d16a8991e2192bda002baab840bfa4d5d79.tar.gz
AOSP master has <pty.h> and builds netcat/nc.
-rw-r--r--lib/portability.h5
-rwxr-xr-xscripts/genconfig.sh9
-rw-r--r--toys/other/netcat.c1
-rw-r--r--toys/pending/telnetd.c1
4 files changed, 2 insertions, 14 deletions
diff --git a/lib/portability.h b/lib/portability.h
index 4097defa..9a7b349b 100644
--- a/lib/portability.h
+++ b/lib/portability.h
@@ -206,11 +206,8 @@ ssize_t getline(char **lineptr, size_t *n, FILE *stream);
#if CFG_TOYBOX_UTMPX
#include <utmpx.h>
#endif
-#if CFG_TOYBOX_PTY
+
#include <pty.h>
-#else
-pid_t forkpty(int *amaster, char *name, void *termp, void *winp);
-#endif
// Some systems don't define O_NOFOLLOW, and it varies by architecture, so...
diff --git a/scripts/genconfig.sh b/scripts/genconfig.sh
index e59aa392..ead5b8a2 100755
--- a/scripts/genconfig.sh
+++ b/scripts/genconfig.sh
@@ -58,14 +58,7 @@ EOF
}
EOF
- # Android is missing shadow.h and pty.h
- probesymbol TOYBOX_PTY -c << EOF
- #include <pty.h>
- int main(int argc, char *argv[]) {
- int master; return forkpty(&master, 0, 0, 0);
- }
-EOF
-
+ # Android is missing shadow.h
probesymbol TOYBOX_SHADOW -c << EOF
#include <shadow.h>
int main(int argc, char *argv[]) {
diff --git a/toys/other/netcat.c b/toys/other/netcat.c
index dcb982d4..616822b7 100644
--- a/toys/other/netcat.c
+++ b/toys/other/netcat.c
@@ -26,7 +26,6 @@ config NETCAT_LISTEN
bool "netcat server options (-let)"
default y
depends on NETCAT
- depends on TOYBOX_PTY
help
usage: netcat [-t] [-lL COMMAND...]
diff --git a/toys/pending/telnetd.c b/toys/pending/telnetd.c
index f9f34224..4198e63f 100644
--- a/toys/pending/telnetd.c
+++ b/toys/pending/telnetd.c
@@ -8,7 +8,6 @@ USE_TELNETD(NEWTOY(telnetd, "w#<0b:p#<0>65535=23f:l:FSKi[!wi]", TOYFLAG_USR|TOYF
config TELNETD
bool "telnetd"
default n
- depends on TOYBOX_PTY
help
Handle incoming telnet connections