===================================================================
RCS file: /home/cvs/OpenXM_contrib2/fep/fep_main.c,v
retrieving revision 1.4
retrieving revision 1.8
diff -u -p -r1.4 -r1.8
--- OpenXM_contrib2/fep/fep_main.c	2004/12/01 17:40:16	1.4
+++ OpenXM_contrib2/fep/fep_main.c	2011/06/16 08:17:15	1.8
@@ -2,10 +2,12 @@
 
 #ifndef lint
 static char rcsid[]=
-"$Id: fep_main.c,v 1.4 2004/12/01 17:40:16 ohara Exp $ (SRA)";
+"$Id: fep_main.c,v 1.8 2011/06/16 08:17:15 noro Exp $ (SRA)";
 #endif /* lint */
 
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <signal.h>
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -257,7 +259,11 @@ DEFAULT:
     commandv = &argv[1];
 
     if (! isatty (0)) {
+#if defined(__INTERIX)
+	execvp (*commandv, commandv);
+#else
 	execvp (*commandv, commandv, 0);
+#endif
 	perror (*commandv);
 	exit (1);
     }
@@ -335,7 +341,7 @@ recover_signal ()
 input_handler()
 {
     char   *inputline;
-    char   *getline ();
+    char   *mygetline ();
 
     /*
      * Get slave tty descriptor for auto-tty-fix
@@ -343,7 +349,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 +365,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.
 	 */
 
@@ -541,7 +547,7 @@ int set_buffer (bp, size)
     BUFFER *bp;
     int size;
 {
-    char *newbuf, *malloc(), *realloc();
+    char *newbuf;
 
     if (bp->b_buf)
 	newbuf = (char *) realloc (bp->b_buf, size);
@@ -673,6 +679,10 @@ swallow_output()
 #include <sys/m_wait.h>
 #endif
 
+#if defined(__INTERIX)
+#define wait3(s,opt,rp)   (waitpid((-1),(s),(opt)))
+#endif
+
 void
 catchsig(n)
     int n;
@@ -702,7 +712,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,7 +731,11 @@ exec_to_command(argv)
 #elif defined(TIOCSETN)
     ioctl (0, TIOCSETN, (char *) & slave_ttymode);
 #endif
+#if defined(__INTERIX)
+    execvp (*argv, argv);
+#else
     execvp (*argv, argv, 0);
+#endif
     perror (*argv);
     exit (1);
 }
@@ -854,16 +868,26 @@ get_pty_master()
 	master = 1;
 	return;
     }
-#ifdef __CYGWIN32__
+#if defined(__CYGWIN32__) || defined(__linux__)
     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;
+	}
+#else
 	char *name;
 	name = (char *)ptsname(master);
 	if ( name != 0 ) {
 	    strcpy(slave_tty, name);
 	    goto FOUND;
 	}
+#endif
     }
 #else
     for (c = 'p'; c <= 's'; c++) {