 @@ -1,66 +1,68 @@
-$NetBSD: patch-aj,v 1.9 2006/01/17 21:23:01 kristerw Exp $
+$NetBSD: patch-aj,v 1.10 2011/09/29 20:22:26 wiz Exp $
 --- fep_main.c.orig	1993-06-10 02:53:06.000000000 +0000
-+++ fep_main.c	2006-01-03 18:13:49.000000000 +0000
++++ fep_main.c	2011-09-29 20:16:05.000000000 +0000
-@@ -6 +6 @@
+@@ -6,15 +6,24 @@
 -#endif lint
 +#endif /* lint */
@@ -10,11 +10,20 @@
  #include <stdio.h>
  #include <signal.h>
  #include <sys/types.h>
  #include <sys/stat.h>
  #include <sys/ioctl.h>
 -#include <sys/file.h>
 +#ifdef TERMIOS
 +#include <stdlib.h>
 +#include <fcntl.h>
 +#include <termios.h>
 +#ifndef _POSIX_VDISABLE
 +#define _POSIX_VDISABLE '\0'
 +#endif
 +#else
  #include <sgtty.h>
 +#include <sys/file.h>
 +#endif
  #include <sys/time.h>
  #include <sys/resource.h>
 -#include <sys/errno.h>
 +#include <errno.h>
  #include "fep_defs.h"
  #include "fep_glob.h"
-@@ -30,7 +39,7 @@ static char rcsid[]=
+@@ -30,7 +39,7 @@
  #ifdef STAT
    static char fep_statrc[] = FEP_STAT;
  #endif
 -#endif lint
 +#endif /* lint */
  char	*myself;			/* the command name */
  char	*prompt = "";			/* prompt string */
-@@ -38,9 +47,9 @@ char	*delimiters = DEFAULT_DELIMITERS;
+@@ -38,9 +47,9 @@
  					/* delimiter characters */
  int	master;				/* file discriptor for pty master */
  int	slave;				/* file discriptor for pty slave */
 -int	mastermask;			/* 1<<master */
 -int	stdinmask;			/* 1<<fileno(stdin) */
 -int	selectmask;			/* stdinmask | mastermask */
 +fd_set	mastermask;			/* 1<<master */
 +fd_set	stdinmask;			/* 1<<fileno(stdin) */
 +fd_set	selectmask;			/* stdinmask | mastermask */
  int	selectnfds;			/* max (fileno(stdin), master) + 1*/
  int	child_pid;			/* child pid */
  int	ptyflag = ON;			/* flag to use pty or not */
-@@ -48,27 +57,34 @@ int	histlen = -1;			/* history length */
+@@ -48,27 +57,34 @@
  int	debug = OFF;			/* debug switch */
  int	auto_tty_fix = ON;		/* fix tty mode automaticaly */
  FILE	*script_fp = NULL;		/* script file pointer */
 -int	catchsig();			/* function take care SIGCHILD */
 +void	catchsig __P((int));		/* function take care SIGCHILD */
 -struct	sgttyb initial_ttymode;		/* initial tty mode */
 -struct	sgttyb master_ttymode;		/* master tty mode */
 -struct	sgttyb slave_ttymode;		/* slave tty mode */
 +#ifdef TERMIOS
 +#define ttystruct termios
 +#elif defined(TIOCSETN)
 +#define ttystruct sgttyb
 @@ -81,154 +83,181 @@ $NetBSD: patch-aj,v 1.9 2006/01/17 21:23
  struct	tchars tchars_buf;		/* tty characters */
  struct	ltchars ltchars_buf;		/* tty characters */
 +#endif
  int	lmode_buf;			/* local mode */
  int	line_desc;			/* line descipline */
  #ifdef KANJI
  struct	jtchars jtchars_buf;		/* kanji tty characters */
  int	kmode_buf;			/* kanji mode */
 -#endif KANJI
 +#endif /* KANJI */
  char	master_tty[16];			/* master tty name */
  char	slave_tty[16];			/* slave tty name */
-@@ -112,6 +128,10 @@ main(argc, argv)
+@@ -112,6 +128,10 @@
      myself = argv[0];
 +    setvbuf(stdin, NULL, _IONBF, 0);
 +    setvbuf(stdout, NULL, _IONBF, 0);
 +    setvbuf(stderr, NULL, _IONBF, 0);
++
      /*
       * Initialize binding table
       */
-@@ -172,7 +192,7 @@ main(argc, argv)
+@@ -172,7 +192,7 @@
  		    histlen = atoi (argv[1]);
+ 		}
  		else {
 -		    histlen = atoi (&argv[1] + 2);
 +		    histlen = atoi (argv[1] + 2);
+ 		}
  		break;
-@@ -276,7 +296,7 @@ DEFAULT:
+@@ -276,7 +296,7 @@
  fix_signal ()
+ {
  #ifdef SIGWINCH
 -    int sigwinch();
 +    void sigwinch __P((int));
  #endif
      sighup = signal (SIGHUP, terminate);
-@@ -336,7 +356,7 @@ input_handler()
+@@ -298,7 +318,7 @@
  input_handler()
+ {
      char   *inputline;
 -    char   *getline ();
 +    char   *get_line ();
      /*
       * Get slave tty descriptor for auto-tty-fix
@@ -306,7 +326,7 @@
      if ((slave = open (slave_tty, O_RDONLY)) < 0)
  	perror ("open");
 -    while (inputline = getline ()) {
 +    while (inputline = get_line ()) {
  	/*
  	 * XXX: nbyte should be greater than 0 only for ^@ input in emacs.
  	 * This solution is very ugly.. but it will takes a half day
@@ -322,7 +342,7 @@
  	/*
  	 * NOTE:
 -	 * Saving command line to output buffer is done in getline().
 +	 * Saving command line to output buffer is done in get_line().
  	 * Because inputline here is converted by alias.
  	 */
@@ -336,7 +356,7 @@
  	if (Through == OFF && Transparency == OFF && script_fp)
  	    fwrite (inputline, sizeof(CHAR), strlen (inputline), script_fp);
+     }
 -    terminate ();
 +    terminate (0);
+ }
  #define INPUT_BUFFER_SIZE 1024
-@@ -384,21 +404,19 @@ getcharacter()
+@@ -384,21 +404,19 @@
+ {
      char c;
      int n;
 -    int nfound, readfd, writefd = 0, execptfd = 0;
 +    int nfound;
 +    fd_set readfd, writefd, exceptfd;
  #ifdef USE_TIMEOUT
      struct timeval **timeout = auto_tty_fix ? timeout_list : notimeout;
  #else
      struct timeval **timeout = notimeout;
  #endif
 -    extern int errno;
+-
      /*
       * Sorry, this cording depends to an implementation of getc().
       */
 -#   define CHAR_IN_BUFFER (stdin->_cnt)
 -    if (CHAR_IN_BUFFER)
 -	goto RETURNCHAR;
 +    FD_ZERO(&writefd);
 +    FD_ZERO(&exceptfd);
  RETRY:
      readfd = selectmask;
-@@ -409,13 +427,13 @@ RETRY:
+@@ -409,13 +427,13 @@
      while ((nfound = select (selectnfds, &readfd, 0, 0, *timeout)) < 0)
  	if (errno != EINTR) {
  		perror ("select");
 -		terminate();
 +		terminate(1);
+ 	}
      /*
       * Found output from pty.
       */
 -    if (readfd & mastermask) {
 +    if (FD_ISSET(master, &readfd)) {
  	int nbyte;
  	/*
-@@ -451,7 +469,7 @@ RETRY:
+@@ -451,7 +469,7 @@
      /*
       * Found input from terminal
       */
 -    if (CHAR_IN_BUFFER || readfd & stdinmask) {
 +    if (FD_ISSET(fileno(stdin), &readfd)) {
  #ifndef USE_TIMEOUT
  	/*
-@@ -467,8 +485,8 @@ RETRY:
+@@ -467,8 +485,8 @@
  	RETURNCHAR:
  	if ((c = getc (stdin)) == EOF) {
  	    if (debug)
 -		printf ("EOF chatched\n");
 -	    terminate ();
 +		printf ("EOF catched\n");
 +	    terminate (1);
+ 	}
  	else
  	    return (c & CHARMASK);
-@@ -504,7 +522,7 @@ int set_buffer (bp, size)
+@@ -504,7 +522,7 @@
      BUFFER *bp;
      int size;
+ {
 -    char *newbuf, *malloc(), *realloc();
 +    char *newbuf;
      if (bp->b_buf)
  	newbuf = (char *) realloc (bp->b_buf, size);
-@@ -596,7 +614,7 @@ buf_put (bp, s)
+@@ -596,7 +614,7 @@
  swallow_output()
+ {
 -    int readfd = mastermask;
 +    fd_set readfd = mastermask;
      int r;
      int nbyte;
      int ncount = 10;
-@@ -604,7 +622,7 @@ swallow_output()
+@@ -604,7 +622,7 @@
      while (
  	ncount-- &&
  	select (selectnfds, &readfd, 0, 0, TIMEOUT_NOBLOCK) > 0 &&
 -	readfd & mastermask
 +	FD_ISSET(master, &mastermask)
      ) {
  	nbyte = buf_read (master, output_buffer);
  	if (nbyte > 0) {
-@@ -636,21 +654,23 @@ swallow_output()
+@@ -636,21 +654,23 @@
  #include <sys/m_wait.h>
  #endif
 -catchsig()
 +void
 +catchsig(n)
 +    int n;
+ {
 -    union wait status;
 +    int status;
      struct rusage   ru;
      if (wait3 (&status, WNOHANG | WUNTRACED, &ru) != child_pid)
 @@ -236,27 +265,27 @@ $NetBSD: patch-aj,v 1.9 2006/01/17 21:23
      if (WIFSTOPPED (status) /* || WIFSIGNALED (status) */) {
  	if (debug) {
 -	    message ("Child has sttoped!!\n");
 +	    message ("Child has stopped!!\n");
+ 	}
  	suspend ();
  	return;
+     }
 -    terminate ();
 +    terminate (WEXITSTATUS(status));
+ }
  exec_to_command(argv)
-@@ -675,13 +695,37 @@ exec_to_command(argv)
+@@ -675,13 +695,37 @@
      dup2 (slave, 2);
      (void) close (slave);
 +#ifdef TERMIOS
 +    tcsetattr(0, TCSANOW, &slave_ttymode);
 +#elif defined(TIOCSETN)
      ioctl (0, TIOCSETN, (char *) & slave_ttymode);
+-
 +#endif
      execvp (*argv, argv, 0);
      perror (*argv);
      exit (1);
+ }
 @@ -275,64 +304,64 @@ $NetBSD: patch-aj,v 1.9 2006/01/17 21:23
 +    master_ttymode.c_cc[VMIN] = 1;
 +    master_ttymode.c_cc[VTIME] = 0;
 +    slave_ttymode.c_lflag &= ~(ECHO|ECHOE|ECHOK);
 +    slave_ttymode.c_iflag &= ~(ICRNL);
 +    slave_ttymode.c_oflag &= ~(ONLCR);
 +    tcsetattr(0, TCSANOW, &master_ttymode);
 +}
++
 +#elif defined(TIOCSETN)
++
  fix_tty()
+ {
      struct tchars tcbuf;
-@@ -719,6 +763,7 @@ fix_tty()
+@@ -719,6 +763,7 @@
      ioctl (0, TIOCSETC, (char *) & tcbuf);
      ioctl (0, TIOCSLTC, (char *) & lcbuf);
+ }
 +#endif
  kill_process()
+ {
-@@ -727,9 +772,10 @@ kill_process()
+@@ -727,9 +772,10 @@
  	(void) killpg (child_pid, SIGTERM);
+ }
 -terminate()
 +void
 +terminate(n)
 +    int n;
+ {
 -    extern int errno;
      /*
       * Save history if 'history-file' is set
-@@ -759,10 +805,14 @@ terminate()
+@@ -759,10 +805,14 @@
  	    if (killpg (child_pid, SIGKILL) < 0)
  		perror ("kill");
 +#ifdef TERMIOS
 +    tcsetattr(0, TCSANOW, &initial_ttymode);
 +#elif defined(TIOCSETN)
      ioctl (0, TIOCSETN, (char *) & initial_ttymode);
      ioctl (0, TIOCSETC, (char *) & tchars_buf);
      ioctl (0, TIOCSLTC, (char *) & ltchars_buf);
 -    exit (0);
 +#endif
 +    exit (n);
+ }
  get_pty_master()
-@@ -775,6 +825,41 @@ get_pty_master()
+@@ -775,6 +825,41 @@
  	master = 1;
  	return;
+     }
 +#ifdef HAVE_PTMX
 +    if ((master = open("/dev/ptmx", O_RDWR)) == -1) {
 +	perror ("Couldn't open pseudo tty");
 +	kill_process ();
 +	exit (1);
 +    }
 +    if (grantpt (master) == -1) {
 +	perror ("grantpt");
 +	kill_process ();
 +	exit (1);
 @@ -354,122 +383,122 @@ $NetBSD: patch-aj,v 1.9 2006/01/17 21:23
 +	if ((ptr = ptsname (master)) == NULL) {
 +	    perror ("ptsname");
 +	    kill_process ();
 +	    exit (1);
 +	}
 +	(void)strncpy (slave_tty, ptr, sizeof(slave_tty));
 +	slave_tty[sizeof(slave_tty) - 1] = '\0';
 +#endif
 +    }
 +#else
      for (c = 'p'; c <= 's'; c++) {
  	for (i = 0; i < 16; i++) {
  	    sprintf (master_tty, "/dev/pty%c%x", c, i);
-@@ -796,11 +881,16 @@ get_pty_master()
+@@ -796,11 +881,16 @@
+     }
   FOUND:
 +#endif
 +#ifdef TERMIOS
 +    tcgetattr(0, &initial_ttymode);
 +#elif defined(TIOCSETN)
      ioctl (0, TIOCGETP, (char *) &initial_ttymode);
      ioctl (0, TIOCGETC, (char *) &tchars_buf);
      ioctl (0, TIOCGETD, (char *) &line_desc);
      ioctl (0, TIOCGLTC, (char *) &ltchars_buf);
      ioctl (0, TIOCLGET, (char *) &lmode_buf);
 +#endif
  #ifdef TIOCGWINSZ
+     {
-@@ -820,11 +910,15 @@ get_pty_master()
+@@ -820,11 +910,15 @@
  # if defined(TIOCKGETC) && defined(TIOCKSETC)
      ioctl (0, TIOCKGETC, (char *) &jtchars_buf);
  # endif
 -#endif KANJI
 +#endif /* KANJI */
 -    stdinmask = 1 << fileno (stdin);
 -    mastermask = 1 << master;
 -    selectmask = stdinmask | mastermask;
 +    FD_ZERO(&stdinmask);
 +    FD_ZERO(&mastermask);
 +    FD_ZERO(&selectmask);
 +    FD_SET(fileno(stdin), &stdinmask);
 +    FD_SET(master, &mastermask);
 +    FD_SET(fileno(stdin), &selectmask);
 +    FD_SET(master, &selectmask);
      selectnfds = max (fileno(stdin), master) + 1;
      return;
-@@ -838,11 +932,20 @@ get_pty_slave()
+@@ -838,11 +932,20 @@
  	perror (slave_tty);
  	exit (1);
+     }
 +    if (setsid() == -1)
 +	perror ("setsid");
 +    if (ioctl (slave, TIOCSCTTY, 1) == -1)
 +	perror ("ioctl");
++
 +#ifdef TERMIOS
 +    tcsetattr(slave, TCSANOW, &initial_ttymode);
 +#elif defined(TIOCSETN)
      ioctl (slave, TIOCSETN, (char *) &initial_ttymode);
      ioctl (slave, TIOCSETC, (char *) &tchars_buf);
      ioctl (slave, TIOCSLTC, (char *) &ltchars_buf);
      ioctl (slave, TIOCLSET, (char *) &lmode_buf);
      ioctl (slave, TIOCSETD, (char *) &line_desc);
 +#endif
  #ifdef KANJI
  # if defined(TIOCKGET) && defined(TIOCKSET)
-@@ -851,7 +954,7 @@ get_pty_slave()
+@@ -851,7 +954,7 @@
  # if defined(TIOCKGETC) && defined(TIOCKSETC)
      ioctl (slave, TIOCKSETC, (char *) &jtchars_buf);
  # endif
 -#endif KANJI
 +#endif /* KANJI */
  #ifdef TIOCSWINSZ
+     {
-@@ -866,18 +969,20 @@ get_pty_slave()
+@@ -866,18 +969,20 @@
  recover_tty()
+ {
+-
 +#ifdef TERMIOS
 +    tcsetattr(0, TCSANOW, &initial_ttymode);
 +#elif defined(TIOCSETN)
      ioctl (0, TIOCSETN, (char *) & initial_ttymode);
      ioctl (0, TIOCSETC, (char *) & tchars_buf);
      ioctl (0, TIOCSLTC, (char *) & ltchars_buf);
 +#endif
+ }
  suspend()
+ {
      long	pid;
 -    void	(*func) ();
 +    void	(*func) __P((int));
      int		omask;
 -    extern int	errno;
      pid = getpid ();
   /* reset signal handler so kill below stops us */
-@@ -890,7 +995,7 @@ suspend()
+@@ -890,7 +995,7 @@
      if (kill (child_pid, SIGCONT) < 0 && errno == ESRCH) {
  	printf ("Where my child has gone?!\n");
 -	terminate ();
 +	terminate (1);
+     }
      killpg (child_pid, SIGCONT);
      kill (0, SIGCONT);
-@@ -933,7 +1038,7 @@ usageAndExit()
+@@ -933,7 +1038,7 @@
  /*
   * Propagate window size changes to the slave tty.
   */
 -sigwinch()
 +sigwinch(int num)
+ {
  #ifdef TIOCGWINSZ			/* 4.3BSD */
      struct winsize win;

 @@ -1,18 +1,18 @@
-$NetBSD: distinfo,v 1.14 2009/12/10 23:49:03 abs Exp $
+$NetBSD: distinfo,v 1.15 2011/09/29 20:22:26 wiz Exp $
 SHA1 (fep.tar.gz) = 73fa55337b12dba3b91c9895e2c9adbbdfa9d960
 RMD160 (fep.tar.gz) = 2a8b9eeecd5c76bec5cdb524ae6c650f298ccbde
 Size (fep.tar.gz) = 40137 bytes
 SHA1 (patch-aa) = 33cb713a2fc7d084a3769b7b9b61c7810ebacdd0
 SHA1 (patch-ab) = 2b6f6cff25a21b374dce4b0162dc06a6d0b6c24f
 SHA1 (patch-ac) = a306ac6a1fa580238e3ac89ea785fefe138ebb65
 SHA1 (patch-ad) = 78d5fd59d51542d304d3adcdde3a7ac48790d857
-SHA1 (patch-ae) = 16a34dbf37dfeeab3c0c76ec651ac19037fa600a
+SHA1 (patch-ae) = 4f632e44ca5ba552c70b99f153e68a8370f79a98
 SHA1 (patch-af) = 77d32f96314a8657e3b575d93def4156e29af2af
 SHA1 (patch-ag) = 2e1d76994ddd50c040383c93f4776ddd7bb2f934
 SHA1 (patch-ah) = 5fd76d412877dc5db166dad274a765b68182c875
 SHA1 (patch-ai) = eda04c0d295a425e6929ade003314cc5ea340368
-SHA1 (patch-aj) = 12c456f62a84fd61b049a1c4091f92fbaa059205
+SHA1 (patch-aj) = 543837ec84af69b283285ae5abafc2eeddd89e30
 SHA1 (patch-ak) = 97f14ed899fc2afc4f27a3730084355ec42649af
 SHA1 (patch-al) = 43cadd61a36ea6783df419caeb1c2b9fab5090e1
 SHA1 (patch-am) = 26915755c5c06fc68cba722349b2a4d585787fb7

 @@ -1,21 +1,21 @@
-$NetBSD: patch-ae,v 1.7 2006/01/17 21:23:01 kristerw Exp $
+$NetBSD: patch-ae,v 1.8 2011/09/29 20:22:26 wiz Exp $
---- fep_edit.c.orig	1995-01-20 03:16:37.000000000 -0500
+--- fep_edit.c.orig	1995-01-20 08:16:37.000000000 +0000
-+++ fep_edit.c	2005-12-10 16:59:27.000000000 -0500
++++ fep_edit.c	2011-09-29 20:19:55.000000000 +0000
-@@ -6 +6 @@
+@@ -6,10 +6,22 @@
 -#endif lint
 +#endif /* lint */
@@ -8,8 +8,20 @@
  #include <stdio.h>
  #include <sys/types.h>
  #include <sys/stat.h>
 +#include <sys/ioctl.h>
 +#include <inttypes.h>
 +#ifdef TERMIOS
 +#include <termios.h>
 +#ifdef __linux__
 +#ifndef _POSIX_VDISABLE
 +#define _POSIX_VDISABLE '\0'
 +#endif
 +#endif
 +#else
 @@ -99,26 +99,35 @@ $NetBSD: patch-ae,v 1.7 2006/01/17 21:23
 +    import (cft, initial_ttymode.c_cc[VKILL], delete_line);
 +#else
      /* Now, using cbreak mode
      import (cft, tchars_buf.t_startc, ignore);
      import (cft, tchars_buf.t_stopc, ignore);
 @@ -212,6 +248,7 @@
      import (cft, ltchars_buf.t_lnextc, literal_next);
      import (cft, initial_ttymode.sg_erase, delete_previous_character);
      import (cft, initial_ttymode.sg_kill, delete_line);
 +#endif
  #undef import
@@ -227,7 +264,7 @@
   * Main function of front end program
   */
  CHAR *
 -getline()
 +get_line()
+ {
      int c;
      CHAR *execute_command, *check_alias();
 @@ -257,7 +294,7 @@
  	 */
  	swallow_output();
 -	if (fgets (CommandLine, MAXCOMLEN, redirect_fp)) {
 +	if (fgets (CommandLine, MAXCMDLEN, redirect_fp)) {
  	    ++redirect_line;
  	    execute_command = CommandLine;
  	    goto RETURN;
 @@ -301,7 +338,11 @@
  	 * call send_eof
  	 */
  	if (