From 0ae352daa7cc94b028cf90c11f540e6cf5822e84 Mon Sep 17 00:00:00 2001 From: Philippe Charnier Date: Mon, 3 Aug 1998 06:32:57 +0000 Subject: [PATCH] Correct use of .Nm and .Ev. Add rcsid, rmove unused #include. Spelling. --- sbin/startslip/startslip.1 | 52 ++++++++++++++++++++------------------ sbin/startslip/startslip.c | 13 +++++----- 2 files changed, 34 insertions(+), 31 deletions(-) diff --git a/sbin/startslip/startslip.1 b/sbin/startslip/startslip.1 index 7b39ca7936da..94a996eb2142 100644 --- a/sbin/startslip/startslip.1 +++ b/sbin/startslip/startslip.1 @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)startslip.1 8.1 (Berkeley) 6/5/93 -.\" $Id$ +.\" $Id: startslip.1,v 1.13 1997/02/22 14:33:20 peter Exp $ .\" .Dd June 5, 1993 .Dt STARTSLIP 1 @@ -58,14 +58,13 @@ .Op Fl K Ar keepalive .Op Fl O Ar outfill .Op Fl S Ar unit -.Ar device user passwd +.Ar device user password .Sh DESCRIPTION -.Pp .Nm Startslip opens the specified .Ar device . Once carrier is asserted (if modem control is enabled) -.Nm startslip +.Nm attempts to login as the specified .Ar user with the given @@ -80,32 +79,32 @@ and goes to wait mode. If carrier drops (modem control enabled) or a .Dv SIGHUP is sent to -.Nm startslip , +.Nm Ns , it closes the device, calls .Ar downscript and attempts to repeat the dialup and login sequence. If a .Dv SIGTERM is send to -.Nm startslip , +.Nm Ns , it closes the device, calls .Ar downscript and exits. When -.Nm startslip +.Nm called twice on the same device, previous copy killed by a .Dv SIGTERM before any operation. .Pp -Available options: -.Bl -tag -width Ar +The following options are available: +.Bl -tag -width indent .It Fl d .Nm Startslip prints out debugging information about what it is trying to do. .It Fl b Ar speed -Determines the baud rate used for -.Ar device . -Default value is 9600. +Determine the baud rate used for +.Ar device , +default value is 9600. .It Fl t Ar script_timeout Set login script timeout in seconds, default value is 90. .It Fl w Ar retry_pause @@ -133,7 +132,7 @@ assumes it is connecting to a Xylogics Annex box and engages in an appropriate dialog using the .Ar user and -.Ar passwd +.Ar password arguments. The .Ar annexname @@ -148,22 +147,27 @@ Disable modem control (waiting for carrier and carrier drop sense) for .Ar device . Modem control is enabled by default. .It Fl U Ar upscript -Specifies a script to run when a SLIP interface becomes connected. This may -contain ifconfig, route, and other appropriate commands. The arguments that +Specify a script to run when a SLIP interface becomes connected. This may +contain +.Xr ifconfig 8 , +.Xr route 8 , +and other appropriate commands. The arguments that are passed to the script are "slX up". -Default value is "/sbin/ifconfig". +Default value is +.Pa /sbin/ifconfig . Dial sequence number (see .Fl s ) passed via -.Dv LINE +.Ev LINE environment variable. .It Fl D Ar downscript -Specifies a script to run when a SLIP connection goes away. The arguments that -are passed to the script are "slX down". Default value is "/sbin/ifconfig". +Specify a script to run when a SLIP connection goes away. The arguments that +are passed to the script are "slX down". Default value is +.Pa /sbin/ifconfig . Dial sequence number (see .Fl s ) passed via -.Dv LINE +.Ev LINE environment variable. .It Fl K Ar keepalive Set SLIP "keep alive" timeout in seconds. If FRAME_END not received during this @@ -181,7 +185,7 @@ interfaces with same number made. Default is dynamic assignment. .It Fl L Use uucp-style device locking. You need it unless you start -.Nm startslip +.Nm from external program which already does uucp locking. Default case is no uucp locking to satisfy such programs. .El @@ -189,13 +193,13 @@ Default case is no uucp locking to satisfy such programs. .Bl -tag -width /var/run/startslip..pid -compact .It Pa /var/run/startslip..pid pid stored here +.It Pa /usr/share/examples/startslip/* .Sh SEE ALSO .Xr uustat 1 , .Xr slattach 8 , -.Xr sliplogin 8 , -/usr/share/examples/startslip +.Xr sliplogin 8 .Sh HISTORY The -.Nm startslip +.Nm appeared in .Bx 4.4 . diff --git a/sbin/startslip/startslip.c b/sbin/startslip/startslip.c index b89305082a2a..da9d808873f0 100644 --- a/sbin/startslip/startslip.c +++ b/sbin/startslip/startslip.c @@ -29,18 +29,20 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $Id: startslip.c,v 1.28 1998/06/28 20:40:51 bde Exp $ */ #ifndef lint -static char copyright[] = +static const char copyright[] = "@(#) Copyright (c) 1990, 1991, 1993\n\ The Regents of the University of California. All rights reserved.\n"; #endif /* not lint */ #ifndef lint +#if 0 static char sccsid[] = "@(#)startslip.c 8.1 (Berkeley) 6/5/93"; +#endif +static const char rcsid[] = + "$Id$"; #endif /* not lint */ #include @@ -57,7 +59,6 @@ static char sccsid[] = "@(#)startslip.c 8.1 (Berkeley) 6/5/93"; #include #include #include -#include #include #include @@ -113,8 +114,6 @@ main(argc, argv) int argc; char **argv; { - extern char *optarg; - extern int optind; char *cp, **ap; int ch, disc; void sighup(), sigterm(), sigurg(); @@ -379,7 +378,7 @@ main(argc, argv) syslog(LOG_ERR, "%s: tcsetattr(%s): %m", username, devicename); down(2); } - /* Only now we able to receive HUP on carier drop! */ + /* Only now we able to receive HUP on carrier drop! */ } /*