Unix98 support.

	Thanks to dk2crn.

4 files changed, 16 insertions, 12 deletions

diff --git a/6pack/m6pack.8 b/6pack/m6pack.8
index cb7c382..7ed202c 100644
--- a/6pack/m6pack.8
+++ b/6pack/m6pack.8
@@ -2,7 +2,7 @@
 .SH NAME
 m6pack \- Attach multiples 6PACK interfaces
 .SH SYNOPSIS
-.B m6pack [-l] [-s speed] [-v] ttyinterface [-x <n> | pty ..]
+.B m6pack [-l] [-s speed] [-x n_ptmx] [-v] ttyinterface pty ..
 .SH DESCRIPTION
 .LP
 .B m6pack
@@ -38,11 +38,11 @@ Enables system logging, the default is off.
 .BI "\-s speed"
 Set the speed of the serial port.
 .TP 10
-.BI "\-x number"
-This option is for Unix98 PTYs. It allocates "number" ptys; their names are written to stdout.
-.TP 10
 .BI \-v
 Display the version.
+.TP 10
+.BI "\-x number"
+This option is for Unix98 PTYs. It allocates "number" ptys; their names are written to stdout. When -x is used, the pty arguments are optional.
 .SH "SEE ALSO"
 .BR spattach (8),
 .BR ifconfig (8),
diff --git a/6pack/m6pack.c b/6pack/m6pack.c
index 0911601..bbd8cd6 100644
--- a/6pack/m6pack.c
+++ b/6pack/m6pack.c
@@ -6,7 +6,7 @@
  * Fake out AX.25 code into supporting 6pack TNC rings by routing serial
  * port data to/from pseudo ttys.
  *
- * @(#)m6pack.c  $Revision: 1.2 $  $Date: 2009/01/20 16:18:02 $
+ * @(#)m6pack.c  $Revision: 1.3 $  $Date: 2009/01/20 18:31:25 $
  *
  * Author(s):
  *
@@ -15,6 +15,10 @@
  * History:
  *
  * $Log: m6pack.c,v $
+ * Revision 1.3  2009/01/20 18:31:25  dl9sau
+ * 	Unix98 support.
+ * 	Thanks to dk2crn.
+ *
  * Revision 1.2  2009/01/20 16:18:02  dl9sau
  * 	Unix98 PTY support for mkiss and m6pack.
  *
@@ -91,7 +95,7 @@
 
 #include <config.h>
 
-static char *version ="$Id: m6pack.c,v 1.2 2009/01/20 16:18:02 dl9sau Exp $";
+static char *version ="$Id: m6pack.c,v 1.3 2009/01/20 18:31:25 dl9sau Exp $";
 
 typedef unsigned char __u8;
 typedef enum {data, command} frame_t;
@@ -108,7 +112,7 @@ static __u8 obuf[SIZE];	/* buffer for sixpack_tx() */
 
 static int invalid_ports = 0;
 
-static char *usage_string = "usage: m6pack [-l] [-s speed] [-v] tyinterface [-x <num_ptmx_devices> | pty ..]\n";
+static char *usage_string = "usage: m6pack [-l] [-s speed] [-x num_ptmx_devices] [-v] tyinterface pty ..\n";
 
 static int dump_report = FALSE;
 static int logging = FALSE;
diff --git a/kiss/mkiss.8 b/kiss/mkiss.8
index 0178ede..82b0fa5 100644
--- a/kiss/mkiss.8
+++ b/kiss/mkiss.8
@@ -2,7 +2,7 @@
 .SH NAME
 mkiss \- Attach a multi KISS interface
 .SH SYNOPSIS
-.B mkiss [-c] [-f] [-h] [-l] [-s speed] [-p pollrate] [-v] ttyinterface [ -x <n> | pty ..]
+.B mkiss [-c] [-f] [-h] [-l] [-s speed] [-p pollrate] [-v] [-x n_ptmx] ttyinterface pty ..
 .SH DESCRIPTION
 .LP
 .B Mkiss
@@ -58,11 +58,11 @@ Enables polling. Polled mode is used by G8BPQ KISS roms to prevent
 contention on systems where multiple TNCs share the same serial line.
 Pollrate is interval between polls (in 100ms units).
 .TP 10
-.BI "\-x number"
-This option is for Unix98 PTYs. It allocates "number" ptys; their names are written to stdout.
-.TP 10
 .BI \-v
 Display the version.
+.TP 10
+.BI "\-x number"
+This option is for Unix98 PTYs. It allocates "number" ptys; their names are written to stdout. When -x is used, the pty arguments are optional.
 .SH "SEE ALSO"
 .BR kissattach (8),
 .BR ifconfig (8),
diff --git a/kiss/mkiss.c b/kiss/mkiss.c
index 169de49..30e258c 100644
--- a/kiss/mkiss.c
+++ b/kiss/mkiss.c
@@ -82,7 +82,7 @@ static int crc_errors		= 0;
 static int invalid_ports	= 0;
 static int return_polls		= 0;
 
-static char *usage_string	= "usage: mkiss [-p interval] [-c] [-f] [-h] [-l] [-s speed] [-v] ttyinterface [-x <num_ptmx_devices> | pty ..]\n";
+static char *usage_string	= "usage: mkiss [-p interval] [-c] [-f] [-h] [-l] [-s speed] [-v] [-x <num_ptmx_devices>] ttyinterface pty ..\n";
 
 static int dump_report		= FALSE;