Fix operator precendence. Include missing header. Use socklen_t.

Don't pass formatted buffers as format string. Bump revision.

8 files changed, 104 insertions, 21 deletions

diff --git a/comms/modemd/Makefile b/comms/modemd/Makefile
index dd807554a0f..bd6cb0f7b71 100644
--- a/comms/modemd/Makefile
+++ b/comms/modemd/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.22 2012/10/03 11:24:42 asau Exp $
+# $NetBSD: Makefile,v 1.23 2013/09/10 14:15:11 joerg Exp $
 
 DISTNAME=	modemd-970221
 PKGNAME=	modemd-19970221
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	comms
 MASTER_SITES=	ftp://ftp.vix.com/pub/modemd/
 
diff --git a/comms/modemd/distinfo b/comms/modemd/distinfo
index a900c61025a..892677d9f11 100644
--- a/comms/modemd/distinfo
+++ b/comms/modemd/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.12 2012/02/16 17:32:45 hans Exp $
+$NetBSD: distinfo,v 1.13 2013/09/10 14:15:11 joerg Exp $
 
 SHA1 (modemd-970221.tar.gz) = 104f8e596f711e349203b2da8c4f2ecf40d490c3
 RMD160 (modemd-970221.tar.gz) = ade5d735e5fd07b91006cf1334a41a43dca7e3d9
 Size (modemd-970221.tar.gz) = 56093 bytes
 SHA1 (patch-aa) = 093d70c98c5fa21f3c5fff8dc5092ca0afa365ef
-SHA1 (patch-ab) = 711b600d5dfa11e859f6af1124aaa18224b37ad3
+SHA1 (patch-ab) = 9e797451de1de1e3515562281d9ae8e16f2c0de6
 SHA1 (patch-ac) = fe3898ea85204631e31c49a8872855c0e7c09e9d
 SHA1 (patch-ad) = f18d3ffe0658ef2709eb28d342b31361b86b1b0b
 SHA1 (patch-ae) = 44e38979c686f66a22e3fd3b027cb9129b6266ba
@@ -14,16 +14,17 @@ SHA1 (patch-ah) = 9294419cd64c3b5cc9ebadc3a4c135a0a969262d
 SHA1 (patch-ai) = 8e81c1e522979f616f2f4aafd5dd65400a6330fa
 SHA1 (patch-aj) = 2837ce9ac377aa6b4f7a8c96f63ff80fcdee9b17
 SHA1 (patch-ak) = 0d60a615020abad77dae56d783667e49112593e5
-SHA1 (patch-al) = 0c24d9ea8ef1d5bc0dc56de7f2d07a7e39062693
+SHA1 (patch-al) = 13259e7c330aecd800cf108eec292d23c6d369b7
 SHA1 (patch-am) = d740f41abf89f760431f32ca7ffa25bf1b3bd4e1
 SHA1 (patch-an) = 3369e7dc8db3f837bc4f71ec72e6f7882462c2a7
 SHA1 (patch-ao) = 64271c0955600d1ad9bc7f4c74273a537d33f71c
-SHA1 (patch-ap) = ed747dc8ef3419bc4431d934aaf4692cadd0ade4
-SHA1 (patch-aq) = f77b4b16b12ca74e897372f328e850a3d9b52229
-SHA1 (patch-ar) = 0fc63025d29a0bd626ec8a51f8c6a461bdbb84a4
+SHA1 (patch-ap) = d5a8dfe6fe162879a1a3185aaa55596df579c47f
+SHA1 (patch-aq) = 5653ce5b0251b6d3fb35972869c8fb6eabae77cb
+SHA1 (patch-ar) = ae25a728c094f94a992b625fd405daedd096c5fd
 SHA1 (patch-as) = 5ac081a2200b72321973004803d15dd3b9d387b3
 SHA1 (patch-cf_sunos4.h) = efe0b9c58ad20247cbc313c1569f9d0be8901d14
+SHA1 (patch-common_dialog.c) = 2dd6fadd2a83eede976d63e15364650955cf9cca
 SHA1 (patch-incoming_login.c) = 62784076e0ac1e23e2e7a6f8c248f3e1fa6b6293
 SHA1 (patch-outgoing_tn.c) = 133c714eb6d33912f6edfcd12034b3155707d701
-SHA1 (patch-outgoing_tnstate.c) = da65871a0397c13e1cd345c1832e3cfbe188f629
+SHA1 (patch-outgoing_tnstate.c) = 7ecc5645e2b4d854a784a7a52487fbef024fa51a
 SHA1 (patch-outgoing_tnutil.c) = ef8b3f32a6e491d6fa56ba3a8f8c4ee64a368cc9
diff --git a/comms/modemd/patches/patch-ab b/comms/modemd/patches/patch-ab
index 099b5480147..de3b5cff971 100644
--- a/comms/modemd/patches/patch-ab
+++ b/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... */
diff --git a/comms/modemd/patches/patch-al b/comms/modemd/patches/patch-al
index b067bd159f7..e43dc4c51c4 100644
--- a/comms/modemd/patches/patch-al
+++ b/comms/modemd/patches/patch-al
@@ -1,4 +1,4 @@
-$NetBSD: patch-al,v 1.5 2010/12/30 09:02:52 obache Exp $
+$NetBSD: patch-al,v 1.6 2013/09/10 14:15:11 joerg Exp $
 
 --- incoming/modemd.c.orig	1996-09-10 00:34:58.000000000 +0000
 +++ incoming/modemd.c
@@ -10,3 +10,12 @@ $NetBSD: patch-al,v 1.5 2010/12/30 09:02:52 obache Exp $
  
  static char *ttyName;
  static char progName [1024];
+@@ -86,7 +87,7 @@ int main (argc, argv, envp)
+     }
+   sprintf (progName, "modemd %s", ttyNameP);
+   openlog (progName, LOG_NDELAY, LOG_LOCAL3);
+-  /* setlogmask(LOG_UPTO (LOG_INFO)); /* */
++  /* setlogmask(LOG_UPTO (LOG_INFO)); */
+   syslog (LOG_DEBUG, "Log Mask is %x", LOG_UPTO (LOG_INFO));
+ 
+   /* If the arguments were bogus... */
diff --git a/comms/modemd/patches/patch-ap b/comms/modemd/patches/patch-ap
index d8462b8e802..cfc7568f7fc 100644
--- a/comms/modemd/patches/patch-ap
+++ b/comms/modemd/patches/patch-ap
@@ -1,4 +1,4 @@
-$NetBSD: patch-ap,v 1.3 2011/11/25 21:34:34 joerg Exp $
+$NetBSD: patch-ap,v 1.4 2013/09/10 14:15:11 joerg Exp $
 
 --- outgoing/listen.c.orig	1996-04-30 07:02:48.000000000 +0000
 +++ outgoing/listen.c
@@ -21,3 +21,12 @@ $NetBSD: patch-ap,v 1.3 2011/11/25 21:34:34 joerg Exp $
  
  void listener (port, addr, forkp)
       int port;
+@@ -116,7 +119,7 @@ void listener (port, addr, forkp)
+   do {
+     int pid;
+     struct sockaddr_in name;
+-    int namelen = sizeof name;
++    socklen_t namelen = sizeof name;
+     if ((clientSock =
+ 	 accept (mpoolSock, (struct sockaddr *)&name, &namelen)) < 0)
+       {
diff --git a/comms/modemd/patches/patch-aq b/comms/modemd/patches/patch-aq
index 8c0914b8530..afd35706a8d 100644
--- a/comms/modemd/patches/patch-aq
+++ b/comms/modemd/patches/patch-aq
@@ -1,4 +1,4 @@
-$NetBSD: patch-aq,v 1.3 2011/11/25 21:34:34 joerg Exp $
+$NetBSD: patch-aq,v 1.4 2013/09/10 14:15:11 joerg Exp $
 
 --- incoming/connect.c.orig	1996-04-30 07:02:43.000000000 +0000
 +++ incoming/connect.c
@@ -20,3 +20,12 @@ $NetBSD: patch-aq,v 1.3 2011/11/25 21:34:34 joerg Exp $
  
  static void pump PROTO ((int, int));
  
+@@ -85,7 +87,7 @@ int tcp_connect (tty)
+   name.sin_family = AF_INET;
+ 
+   /* Allow numeric or symbolic port names... */
+-  if (se = getservbyname (modemcap.connect_port, "tcp"))
++  if ((se = getservbyname (modemcap.connect_port, "tcp")))
+     name.sin_port = se -> s_port;
+   else
+     name.sin_port = htons (atoi (modemcap.connect_port));
diff --git a/comms/modemd/patches/patch-ar b/comms/modemd/patches/patch-ar
index 78459f85642..a1f805370f3 100644
--- a/comms/modemd/patches/patch-ar
+++ b/comms/modemd/patches/patch-ar
@@ -1,7 +1,7 @@
-$NetBSD: patch-ar,v 1.2 2011/09/25 19:41:11 joerg Exp $
+$NetBSD: patch-ar,v 1.3 2013/09/10 14:15:11 joerg Exp $
 
 --- common/errwarn.c.orig	1996-09-10 00:12:34.000000000 +0000
-+++ common/errwarn.c	2007-10-10 16:48:18.000000000 +0000
++++ common/errwarn.c
 @@ -46,6 +46,8 @@ static char copyright[] =
  #include "global.h"
  #include <syslog.h>
@@ -11,3 +11,39 @@ $NetBSD: patch-ar,v 1.2 2011/09/25 19:41:11 joerg Exp $
  
  static void do_percentm PROTO ((char *obuf, char *ibuf));
  
+@@ -65,7 +67,7 @@ int error (ANSI_DECL(char *) fmt, VA_DOT
+   VA_start (list, fmt);
+   vsnprintf (mbuf, sizeof mbuf, fbuf, list);
+   va_end (list);
+-  syslog (LOG_ERR, mbuf);
++  syslog (LOG_ERR, "%s", mbuf);
+ 
+   cleanup ();
+   exit (1);
+@@ -86,7 +88,7 @@ int warn (ANSI_DECL (char *) fmt, VA_DOT
+   VA_start (list, fmt);
+   vsnprintf (mbuf, sizeof mbuf, fbuf, list);
+   va_end (list);
+-  syslog (LOG_ERR, mbuf);
++  syslog (LOG_ERR, "%s", mbuf);
+   return 0;
+ }
+ 
+@@ -105,7 +107,7 @@ int info (ANSI_DECL (char *) fmt, VA_DOT
+   VA_start (list, fmt);
+   vsnprintf (mbuf, sizeof mbuf, fbuf, list);
+   va_end (list);
+-  syslog (LOG_INFO, mbuf);
++  syslog (LOG_INFO, "%s", mbuf);
+   return 0;
+ }
+ 
+@@ -124,7 +126,7 @@ int debug (ANSI_DECL (char *) fmt, VA_DO
+   VA_start (list, fmt);
+   vsnprintf (mbuf, sizeof mbuf, fbuf, list);
+   va_end (list);
+-  syslog (LOG_DEBUG, mbuf);
++  syslog (LOG_DEBUG, "%s", mbuf);
+   return 0;
+ }
+ 
diff --git a/comms/modemd/patches/patch-outgoing_tnstate.c b/comms/modemd/patches/patch-outgoing_tnstate.c
index 2290a2b242e..d8b60965b24 100644
--- a/comms/modemd/patches/patch-outgoing_tnstate.c
+++ b/comms/modemd/patches/patch-outgoing_tnstate.c
@@ -1,4 +1,4 @@
-$NetBSD: patch-outgoing_tnstate.c,v 1.1 2011/12/19 13:25:22 wiz Exp $
+$NetBSD: patch-outgoing_tnstate.c,v 1.2 2013/09/10 14:15:11 joerg Exp $
 
 Add missing header files (for cleanup()).
 
@@ -13,3 +13,12 @@ Add missing header files (for cleanup()).
  
  unsigned char	doopt[] = { IAC, DO, '%', 'c', 0 };
  unsigned char	dont[] = { IAC, DONT, '%', 'c', 0 };
+@@ -105,7 +107,7 @@ telrcv()
+ 			state = TS_DATA;
+ 			/* Strip off \n or \0 after a \r */
+ 			if (his_state_is_wont(TELOPT_BINARY)
+-			    && (c == 0) || (c == '\n')) {
++			    && ((c == 0) || (c == '\n'))) {
+ 				break;
+ 			}
+ 			/* FALL THROUGH */