===================================================================
RCS file: /home/cvs/OpenXM_contrib2/fep/fep_main.c,v
retrieving revision 1.3
retrieving revision 1.13
diff -u -p -r1.3 -r1.13
--- OpenXM_contrib2/fep/fep_main.c	2002/09/18 10:03:28	1.3
+++ OpenXM_contrib2/fep/fep_main.c	2021/03/24 06:22:04	1.13
@@ -1,11 +1,20 @@
 /*	Copyright (c) 1987, 1988 by Software Research Associates, Inc.	*/
 
+#if defined(ANDROID)
+#include <strings.h>
+#define index(s,c) strchr(s,c)
+#define rindex(s,c) strrchr(s,c)
+#endif
+
 #ifndef lint
 static char rcsid[]=
-"$Id: fep_main.c,v 1.3 2002/09/18 10:03:28 noro Exp $ (SRA)";
+"$Id: fep_main.c,v 1.13 2021/03/24 06:22:04 fujimoto Exp $ (SRA)";
 #endif /* lint */
 
 #include <stdio.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <string.h>
 #include <signal.h>
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -128,9 +137,7 @@ struct cmdinfo {
 	{0,			0}
 };
 
-main(argc, argv)
-    int argc;
-    char *argv[];
+int main(int argc, char *argv[])
 {
     int     i;
     char    *cp;
@@ -246,7 +253,11 @@ DEFAULT:
      * Set variable of command name.
      */
     {
+#if defined(ANDROID)
+	char *cp = argv[1];
+#else
 	char *cp = argv[1], *rindex();
+#endif
 
 	if (any ('/', cp))
 	    cp = rindex (cp, '/') + 1;
@@ -257,7 +268,11 @@ DEFAULT:
     commandv = &argv[1];
 
     if (! isatty (0)) {
-	execvp (*commandv, commandv, 0);
+#if defined(__INTERIX)
+	execvp (*commandv, commandv);
+#else
+	execvp (*commandv, commandv);
+#endif
 	perror (*commandv);
 	exit (1);
     }
@@ -305,7 +320,7 @@ DEFAULT:
     input_handler ();
 }
 
-fix_signal ()
+void fix_signal ()
 {
 #ifdef SIGWINCH
 #if defined(sun)
@@ -324,7 +339,7 @@ fix_signal ()
 #endif
 }
 
-recover_signal ()
+void recover_signal ()
 {
 
     (void) signal (SIGHUP, sighup);
@@ -332,10 +347,10 @@ recover_signal ()
     (void) signal (SIGTSTP, sigtstp);
 }
 
-input_handler()
+void input_handler()
 {
     char   *inputline;
-    char   *getline ();
+    char   *mygetline ();
 
     /*
      * Get slave tty descriptor for auto-tty-fix
@@ -343,7 +358,7 @@ input_handler()
     if ((slave = open (slave_tty, O_RDONLY)) < 0)
 	perror ("open");
 
-    while (inputline = getline ()) {
+    while (inputline = mygetline ()) {
 	/*
 	 * XXX: nbyte should be greater than 0 only for ^@ input in emacs.
 	 * This solution is very ugly.. but it will takes a half day
@@ -359,7 +374,7 @@ input_handler()
 
 	/*
 	 * NOTE:
-	 * Saving command line to output buffer is done in getline().
+	 * Saving command line to output buffer is done in mygetline().
 	 * Because inputline here is converted by alias.
 	 */
 
@@ -417,7 +432,7 @@ struct timeval *notimeout[] = {
 	TIMEOUT_FOREVER
 };
 
-getcharacter()
+int getcharacter()
 {
     char c;
     int n;
@@ -537,11 +552,9 @@ RETRY:
     goto RETRY;
 }
 
-int set_buffer (bp, size)
-    BUFFER *bp;
-    int size;
+int set_buffer (BUFFER *bp, int size)
 {
-    char *newbuf, *malloc(), *realloc();
+    char *newbuf;
 
     if (bp->b_buf)
 	newbuf = (char *) realloc (bp->b_buf, size);
@@ -564,9 +577,10 @@ int set_buffer (bp, size)
     return (1);
 }
 	
-int buf_read (fd, bp)
-    int fd;			/* file discriptor */
-    BUFFER *bp;			/* buffer pointer */
+/*    int fd;			file discriptor */
+/*    BUFFER *bp;		buffer pointer */
+
+int buf_read (int fd, BUFFER *bp)
 {
     int nbyte;
 
@@ -604,9 +618,12 @@ int buf_read (fd, bp)
     return (nbyte);
 }
 
-buf_put (bp, s)
-    BUFFER *bp;			/* buffer pointer */
-    char *s;			/* string pointer */
+/*
+    BUFFER *bp;			buffer pointer
+    char *s;			string pointer
+*/
+
+void buf_put (BUFFER *bp, char *s)
 {
     int nbyte;
     int slen;
@@ -631,7 +648,7 @@ buf_put (bp, s)
     }
 }
 
-swallow_output()
+void swallow_output()
 {
     fd_set readfd = mastermask;
     int r;
@@ -673,9 +690,11 @@ swallow_output()
 #include <sys/m_wait.h>
 #endif
 
-void
-catchsig(n)
-    int n;
+#if defined(__INTERIX) || defined(ANDROID)
+#define wait3(s,opt,rp)   (waitpid((-1),(s),(opt)))
+#endif
+
+void catchsig(int n)
 {
     int status;
     struct rusage   ru;
@@ -692,8 +711,7 @@ catchsig(n)
     terminate (0);
 }
 
-exec_to_command(argv)
-    char *argv[];
+void exec_to_command(char *argv[])
 {
     int t;
 
@@ -702,7 +720,7 @@ exec_to_command(argv)
      */
     t = open ("/dev/tty", 2);
     if (t >= 0) {
-#ifndef __CYGWIN32__
+#if !defined(__CYGWIN32__) && !defined(__INTERIX)
 	ioctl (t, TIOCNOTTY, (char *) 0);
 #endif
 	(void) close (t);
@@ -721,13 +739,17 @@ exec_to_command(argv)
 #elif defined(TIOCSETN)
     ioctl (0, TIOCSETN, (char *) & slave_ttymode);
 #endif
-    execvp (*argv, argv, 0);
+#if defined(__INTERIX)
+    execvp (*argv, argv);
+#else
+    execvp (*argv, argv);
+#endif
     perror (*argv);
     exit (1);
 }
 
 #ifdef TERMIOS
-fix_tty()
+void fix_tty()
 {
     int i;
     master_ttymode = initial_ttymode;
@@ -747,7 +769,7 @@ fix_tty()
 
 #elif defined(TIOCSETN)
 
-fix_tty()
+void fix_tty()
 {
     struct tchars tcbuf;
     struct ltchars lcbuf;
@@ -786,16 +808,14 @@ fix_tty()
 }
 #endif
 
-kill_process()
+void kill_process()
 {
 
     if (child_pid)
 	(void) killpg (child_pid, SIGTERM);
 }
 
-void
-terminate(n)
-    int n;
+void terminate(int n)
 {
     extern int errno;
 
@@ -837,14 +857,14 @@ terminate(n)
     exit (0);
 }
 
-send_int_sig() {
+int send_int_sig() {
 #ifndef __CYGWIN__
     kill(child_pid,SIGINT);
 #endif
 	return 0;
 }
 
-get_pty_master()
+void get_pty_master()
 {
     char    c;
     struct stat stb;
@@ -854,16 +874,34 @@ get_pty_master()
 	master = 1;
 	return;
     }
-#ifdef __CYGWIN32__
+#if defined(__CYGWIN32__) || defined(__linux__) || defined(__APPLE__)
     sprintf (master_tty, "/dev/ptmx");
     master = open (master_tty, O_RDWR);
     if (master >= 0) {
+#if defined(__linux__)
+	char name[BUFSIZ];
+	grantpt(master);
+	unlockpt(master);
+	if ( !ptsname_r(master,name,sizeof(name)) ) {
+	    strcpy(slave_tty, name);
+	    goto FOUND;
+	}
+#elif defined(__APPLE__)
+        char *name;
+	grantpt(master);
+	unlockpt(master);
+	if ( name = (char *)ptsname(master) ) {
+	    strcpy(slave_tty, name);
+	    goto FOUND;
+	}
+#else
 	char *name;
 	name = (char *)ptsname(master);
 	if ( name != 0 ) {
 	    strcpy(slave_tty, name);
 	    goto FOUND;
 	}
+#endif
     }
 #else
     for (c = 'p'; c <= 's'; c++) {
@@ -929,7 +967,7 @@ get_pty_master()
     return;
 }
 
-get_pty_slave()
+void get_pty_slave()
 {
 
     slave = open (slave_tty, 2);
@@ -967,7 +1005,7 @@ get_pty_slave()
 #endif
 }
 
-recover_tty()
+void recover_tty()
 {
 #ifdef TERMIOS
     tcsetattr(0, TCSANOW, &initial_ttymode);
@@ -978,7 +1016,7 @@ recover_tty()
 #endif
 }
 
-suspend()
+int suspend()
 {
     long	pid;
 #if defined(sun)
@@ -1018,8 +1056,7 @@ suspend()
 	fep_repaint(0);
 }
 
-look_cmdinfo (command)
-    char *command;
+void look_cmdinfo (char *command)
 {
     struct cmdinfo *p;
     char *allocAndCopyThere();
@@ -1038,7 +1075,7 @@ look_cmdinfo (command)
 }
 
 
-usageAndExit()
+void usageAndExit()
 {
 
     printf ("Usage: %s [-emacs|-vi] command\n", myself);
@@ -1049,8 +1086,9 @@ usageAndExit()
 /*
  * Propagate window size changes to the slave tty.
  */
-sigwinch()
+void sigwinch(int dummy)
 {
+    char *itoa(int i);
 #ifdef TIOCGWINSZ			/* 4.3BSD */
     struct winsize win;