From f113dce38feb52031d2fdda40efa80a729eaa4aa Mon Sep 17 00:00:00 2001
From: Thomas Osterried <thomas@osterried.de>
Date: Tue, 20 Jan 2009 18:31:25 +0000
Subject: 	Unix98 support. 	Thanks to dk2crn.

---
 6pack/m6pack.8 |  8 ++++----
 6pack/m6pack.c | 10 +++++++---
 2 files changed, 11 insertions(+), 7 deletions(-)

(limited to '6pack')

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;
-- 
cgit v1.2.3