Import of pkgsrc-2014Q1

comms/modemd/patches/patch-ab

@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.5 2012/02/16 17:32:45 hans Exp $
+$NetBSD: patch-ab,v 1.6 2013/09/10 14:15:11 joerg Exp $
 
 --- common/ttio.c.orig	1997-02-21 23:06:09.000000000 +0000
 +++ common/ttio.c
-@@ -45,12 +45,19 @@ static char copyright[] =
+@@ -45,12 +45,20 @@ static char copyright[] =
  #include "osdep.h"
  #include "cdefs.h"
  #include "global.h"
@@ -14,6 +14,7 @@ $NetBSD: patch-ab,v 1.5 2012/02/16 17:32:45 hans Exp $
  #include "ttio.h"
  #include <pwd.h>
 +#include <stdlib.h>
++#include <sys/ioctl.h>
 +#ifndef __sun
 +#include <util.h>
 +#else
@@ -22,7 +23,7 @@ $NetBSD: patch-ab,v 1.5 2012/02/16 17:32:45 hans Exp $
  
  static void dectl PROTO ((char *, int, char *, int, char *));
  
-@@ -73,6 +76,16 @@ int ttsetup (name)
+@@ -73,6 +81,16 @@ int ttsetup (name)
      {
        if (chown (nbuf, pw -> pw_uid, pw -> pw_gid) < 0)
  	warn ("Can't set owner on %s: %m", nbuf);
@@ -39,7 +40,7 @@ $NetBSD: patch-ab,v 1.5 2012/02/16 17:32:45 hans Exp $
      }
  
    /* Open the terminal device. */
-@@ -131,20 +144,19 @@ int ttsetup (name)
+@@ -131,20 +149,19 @@ int ttsetup (name)
    return fd;
  }
  
@@ -63,7 +64,7 @@ $NetBSD: patch-ab,v 1.5 2012/02/16 17:32:45 hans Exp $
  {
    int i;
  
-@@ -203,10 +215,8 @@ static int tteof = 0;
+@@ -203,10 +220,8 @@ static int tteof = 0;
  
  /* Match the specified string with input from the specified tty.
     Return nonzero if input matches, zero if not. */
@@ -76,7 +77,16 @@ $NetBSD: patch-ab,v 1.5 2012/02/16 17:32:45 hans Exp $
  {
    TIME entry, now, to;
    int cur, curmatch, next;
-@@ -316,9 +326,7 @@ ttmatch (ANSI_DECL (int) tty, ANSI_DECL 
+@@ -230,7 +245,7 @@ ttmatch (ANSI_DECL (int) tty, ANSI_DECL 
+ 	 match, try reading some more data from the tty... */
+       matchID = 1;
+       VA_start (list, timeout);
+-      while (string = va_arg (list, char *))
++      while ((string = va_arg (list, char *)))
+ 	{
+ 	  syslog (LOG_DEBUG, "Matching against %s", string);
+ 	  for (cur = ttstart; cur != ttend; cur = NEXT (cur))
+@@ -316,9 +331,7 @@ ttmatch (ANSI_DECL (int) tty, ANSI_DECL 
  }
  
  /* Read a connect speed from standard in... */