===================================================================
RCS file: /home/cvs/OpenXM_contrib2/fep/fep_main.c,v
retrieving revision 1.2
retrieving revision 1.5
diff -u -p -r1.2 -r1.5
--- OpenXM_contrib2/fep/fep_main.c	2002/09/09 12:11:51	1.2
+++ OpenXM_contrib2/fep/fep_main.c	2005/01/18 14:20:19	1.5
@@ -2,7 +2,7 @@
 
 #ifndef lint
 static char rcsid[]=
-"$Id: fep_main.c,v 1.2 2002/09/09 12:11:51 noro Exp $ (SRA)";
+"$Id: fep_main.c,v 1.5 2005/01/18 14:20:19 ohara Exp $ (SRA)";
 #endif /* lint */
 
 #include <stdio.h>
@@ -10,6 +10,10 @@ static char rcsid[]=
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
+#if defined(sun)
+#include <sys/fcntl.h>
+#include <sys/ttold.h>
+#endif
 #ifdef TERMIOS
 #include <termios.h>
 #if defined(__linux__) || defined(__CYGWIN__)
@@ -57,7 +61,11 @@ int	histlen = -1;			/* history length */
 int	debug = OFF;			/* debug switch */
 int	auto_tty_fix = ON;		/* fix tty mode automaticaly */
 FILE	*script_fp = NULL;		/* script file pointer */
+#if defined(sun)
+void	catchsig (int);		/* function take care SIGCHILD */
+#else
 void	catchsig __P((int));		/* function take care SIGCHILD */
+#endif
 
 #ifdef TERMIOS
 #define ttystruct termios
@@ -72,7 +80,11 @@ int	lines;				/* terminal line size */
 int	columns;			/* terminal coulumn size */
 char	*term_clear;			/* terminal clear code */
 
+#if defined(sun)
+void	(*sighup)(int), (*sigchld)(int), (*sigtstp)(int);
+#else
 void	(*sighup) __P((int)), (*sigchld) __P((int)), (*sigtstp) __P((int));
+#endif
 					/* function buffer for signal */
 
 #ifdef TIOCSETN
@@ -245,7 +257,11 @@ DEFAULT:
     commandv = &argv[1];
 
     if (! isatty (0)) {
+#if defined(__INTERIX)
+	execvp (*commandv, commandv);
+#else
 	execvp (*commandv, commandv, 0);
+#endif
 	perror (*commandv);
 	exit (1);
     }
@@ -296,8 +312,12 @@ DEFAULT:
 fix_signal ()
 {
 #ifdef SIGWINCH
+#if defined(sun)
+    void sigwinch (int);
+#else
     void sigwinch __P((int));
 #endif
+#endif
 
     sighup = signal (SIGHUP, terminate);
     sigchld = signal (SIGCHLD, catchsig);
@@ -657,6 +677,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;
@@ -686,7 +710,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);
@@ -705,7 +729,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);
 }
@@ -965,7 +993,11 @@ recover_tty()
 suspend()
 {
     long	pid;
+#if defined(sun)
+    void	(*func) (int);
+#else
     void	(*func) __P((int));
+#endif
 #ifndef __CYGWIN32__
     int		omask;
 #endif
@@ -977,7 +1009,7 @@ suspend()
     signal (SIGTSTP, SIG_DFL);
     recover_tty();
 #define	mask(s)	(1 << ((s)-1))
-#ifndef __CYGWIN32__
+#if !defined(__CYGWIN32__) && !defined(sun)
     omask = sigsetmask (sigblock (0) & ~mask (SIGTSTP));
 #endif
     kill (0, SIGTSTP);
@@ -990,7 +1022,7 @@ suspend()
     kill (0, SIGCONT);
     signal (SIGCHLD, func);
     signal (SIGTSTP, SIG_IGN);
-#ifndef __CYGWIN32__
+#if !defined(__CYGWIN32__) && !defined(sun)
     sigblock (mask (SIGTSTP));
 #endif
     fix_tty ();
@@ -1029,7 +1061,7 @@ usageAndExit()
 /*
  * Propagate window size changes to the slave tty.
  */
-sigwinch()
+void sigwinch(int dummy)
 {
 #ifdef TIOCGWINSZ			/* 4.3BSD */
     struct winsize win;