changeset 1662:c1715c752e89

AOSP master has <pty.h> and builds netcat/nc.
author Elliott Hughes <enh@google.com>
date Fri, 16 Jan 2015 13:49:23 -0600
parents d4bc084916fd
children 988f3d13b925
files lib/portability.h scripts/genconfig.sh toys/other/netcat.c toys/pending/telnetd.c
diffstat 4 files changed, 2 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/lib/portability.h	Fri Jan 16 13:43:09 2015 -0600
+++ b/lib/portability.h	Fri Jan 16 13:49:23 2015 -0600
@@ -206,11 +206,8 @@
 #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...
--- a/scripts/genconfig.sh	Fri Jan 16 13:43:09 2015 -0600
+++ b/scripts/genconfig.sh	Fri Jan 16 13:49:23 2015 -0600
@@ -58,14 +58,7 @@
     }
 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[]) {
--- a/toys/other/netcat.c	Fri Jan 16 13:43:09 2015 -0600
+++ b/toys/other/netcat.c	Fri Jan 16 13:49:23 2015 -0600
@@ -26,7 +26,6 @@
   bool "netcat server options (-let)"
   default y
   depends on NETCAT
-  depends on TOYBOX_PTY
   help
     usage: netcat [-t] [-lL COMMAND...]
 
--- a/toys/pending/telnetd.c	Fri Jan 16 13:43:09 2015 -0600
+++ b/toys/pending/telnetd.c	Fri Jan 16 13:49:23 2015 -0600
@@ -8,7 +8,6 @@
 config TELNETD
   bool "telnetd"
   default n
-  depends on TOYBOX_PTY
   help
     Handle incoming telnet connections