Fix build on NetBSD-current (getline).

3 files changed, 77 insertions, 39 deletions

diff --git a/misc/fep/distinfo b/misc/fep/distinfo
index 6e394fb6bed..7598384e950 100644
--- a/misc/fep/distinfo
+++ b/misc/fep/distinfo
@@ -1,4 +1,4 @@
-$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
@@ -7,12 +7,12 @@ 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
diff --git a/misc/fep/patches/patch-ae b/misc/fep/patches/patch-ae
index cb27e21b621..f0a9eb4aa86 100644
--- a/misc/fep/patches/patch-ae
+++ b/misc/fep/patches/patch-ae
@@ -1,11 +1,11 @@
-$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	2005-12-10 16:59:27.000000000 -0500
-@@ -6 +6 @@
+--- fep_edit.c.orig	1995-01-20 08:16:37.000000000 +0000
++++ fep_edit.c	2011-09-29 20:19:55.000000000 +0000
+@@ -6,10 +6,22 @@
 -#endif lint
 +#endif /* lint */
-@@ -8,8 +8,20 @@
+ 
  #include <stdio.h>
  #include <sys/types.h>
  #include <sys/stat.h>
@@ -109,6 +109,15 @@ $NetBSD: patch-ae,v 1.7 2006/01/17 21:23:01 kristerw Exp $
  
  #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();
diff --git a/misc/fep/patches/patch-aj b/misc/fep/patches/patch-aj
index 81d996578e2..3df5ea34cdd 100644
--- a/misc/fep/patches/patch-aj
+++ b/misc/fep/patches/patch-aj
@@ -1,11 +1,13 @@
-$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
-@@ -6 +6 @@
++++ fep_main.c	2011-09-29 20:16:05.000000000 +0000
+@@ -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>
@@ -28,7 +30,7 @@ $NetBSD: patch-aj,v 1.9 2006/01/17 21:23:01 kristerw Exp $
  
  #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
@@ -37,7 +39,7 @@ $NetBSD: patch-aj,v 1.9 2006/01/17 21:23:01 kristerw Exp $
  
  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 */
@@ -50,7 +52,7 @@ $NetBSD: patch-aj,v 1.9 2006/01/17 21:23:01 kristerw Exp $
  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 */
@@ -91,7 +93,7 @@ $NetBSD: patch-aj,v 1.9 2006/01/17 21:23:01 kristerw Exp $
  
  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];
  
@@ -102,7 +104,7 @@ $NetBSD: patch-aj,v 1.9 2006/01/17 21:23:01 kristerw Exp $
      /*
       * Initialize binding table
       */
-@@ -172,7 +192,7 @@ main(argc, argv)
+@@ -172,7 +192,7 @@
  		    histlen = atoi (argv[1]);
  		}
  		else {
@@ -111,7 +113,7 @@ $NetBSD: patch-aj,v 1.9 2006/01/17 21:23:01 kristerw Exp $
  		}
  		break;
  
-@@ -276,7 +296,7 @@ DEFAULT:
+@@ -276,7 +296,7 @@
  fix_signal ()
  {
  #ifdef SIGWINCH
@@ -120,7 +122,34 @@ $NetBSD: patch-aj,v 1.9 2006/01/17 21:23:01 kristerw Exp $
  #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);
      }
@@ -129,7 +158,7 @@ $NetBSD: patch-aj,v 1.9 2006/01/17 21:23:01 kristerw Exp $
  }
  
  #define INPUT_BUFFER_SIZE 1024
-@@ -384,21 +404,19 @@ getcharacter()
+@@ -384,21 +404,19 @@
  {
      char c;
      int n;
@@ -155,7 +184,7 @@ $NetBSD: patch-aj,v 1.9 2006/01/17 21:23:01 kristerw Exp $
  
  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");
@@ -171,7 +200,7 @@ $NetBSD: patch-aj,v 1.9 2006/01/17 21:23:01 kristerw Exp $
  	int nbyte;
  
  	/*
-@@ -451,7 +469,7 @@ RETRY:
+@@ -451,7 +469,7 @@
      /*
       * Found input from terminal
       */
@@ -180,7 +209,7 @@ $NetBSD: patch-aj,v 1.9 2006/01/17 21:23:01 kristerw Exp $
  
  #ifndef USE_TIMEOUT
  	/*
-@@ -467,8 +485,8 @@ RETRY:
+@@ -467,8 +485,8 @@
  	RETURNCHAR:
  	if ((c = getc (stdin)) == EOF) {
  	    if (debug)
@@ -191,7 +220,7 @@ $NetBSD: patch-aj,v 1.9 2006/01/17 21:23:01 kristerw Exp $
  	}
  	else
  	    return (c & CHARMASK);
-@@ -504,7 +522,7 @@ int set_buffer (bp, size)
+@@ -504,7 +522,7 @@
      BUFFER *bp;
      int size;
  {
@@ -200,7 +229,7 @@ $NetBSD: patch-aj,v 1.9 2006/01/17 21:23:01 kristerw Exp $
  
      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()
  {
@@ -209,7 +238,7 @@ $NetBSD: patch-aj,v 1.9 2006/01/17 21:23:01 kristerw Exp $
      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 &&
@@ -218,7 +247,7 @@ $NetBSD: patch-aj,v 1.9 2006/01/17 21:23:01 kristerw Exp $
      ) {
  	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
  
@@ -246,7 +275,7 @@ $NetBSD: patch-aj,v 1.9 2006/01/17 21:23:01 kristerw Exp $
  }
  
  exec_to_command(argv)
-@@ -675,13 +695,37 @@ exec_to_command(argv)
+@@ -675,13 +695,37 @@
      dup2 (slave, 2);
      (void) close (slave);
  
@@ -285,7 +314,7 @@ $NetBSD: patch-aj,v 1.9 2006/01/17 21:23:01 kristerw Exp $
  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);
  }
@@ -293,7 +322,7 @@ $NetBSD: patch-aj,v 1.9 2006/01/17 21:23:01 kristerw Exp $
  
  kill_process()
  {
-@@ -727,9 +772,10 @@ kill_process()
+@@ -727,9 +772,10 @@
  	(void) killpg (child_pid, SIGTERM);
  }
  
@@ -306,7 +335,7 @@ $NetBSD: patch-aj,v 1.9 2006/01/17 21:23:01 kristerw Exp $
  
      /*
       * Save history if 'history-file' is set
-@@ -759,10 +805,14 @@ terminate()
+@@ -759,10 +805,14 @@
  	    if (killpg (child_pid, SIGKILL) < 0)
  		perror ("kill");
  
@@ -322,7 +351,7 @@ $NetBSD: patch-aj,v 1.9 2006/01/17 21:23:01 kristerw Exp $
  }
  
  get_pty_master()
-@@ -775,6 +825,41 @@ get_pty_master()
+@@ -775,6 +825,41 @@
  	master = 1;
  	return;
      }
@@ -364,7 +393,7 @@ $NetBSD: patch-aj,v 1.9 2006/01/17 21:23:01 kristerw Exp $
      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:
@@ -381,7 +410,7 @@ $NetBSD: patch-aj,v 1.9 2006/01/17 21:23:01 kristerw Exp $
  
  #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
@@ -401,7 +430,7 @@ $NetBSD: patch-aj,v 1.9 2006/01/17 21:23:01 kristerw Exp $
      selectnfds = max (fileno(stdin), master) + 1;
  
      return;
-@@ -838,11 +932,20 @@ get_pty_slave()
+@@ -838,11 +932,20 @@
  	perror (slave_tty);
  	exit (1);
      }
@@ -422,7 +451,7 @@ $NetBSD: patch-aj,v 1.9 2006/01/17 21:23:01 kristerw Exp $
  
  #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
@@ -431,7 +460,7 @@ $NetBSD: patch-aj,v 1.9 2006/01/17 21:23:01 kristerw Exp $
  
  #ifdef TIOCSWINSZ
      {
-@@ -866,18 +969,20 @@ get_pty_slave()
+@@ -866,18 +969,20 @@
  
  recover_tty()
  {
@@ -455,7 +484,7 @@ $NetBSD: patch-aj,v 1.9 2006/01/17 21:23:01 kristerw Exp $
  
      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");
@@ -464,7 +493,7 @@ $NetBSD: patch-aj,v 1.9 2006/01/17 21:23:01 kristerw Exp $
      }
      killpg (child_pid, SIGCONT);
      kill (0, SIGCONT);
-@@ -933,7 +1038,7 @@ usageAndExit()
+@@ -933,7 +1038,7 @@
  /*
   * Propagate window size changes to the slave tty.
   */