Remove nmeaattch(8), which is superseeded by ldattach(8).

ok deraadt

4 files changed, 2 insertions, 277 deletions

diff --git a/sbin/Makefile b/sbin/Makefile
index 579315fa527..71576e6c1c9 100644
--- a/sbin/Makefile
+++ b/sbin/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.87 2008/05/07 11:43:20 henning Exp $
+#	$OpenBSD: Makefile,v 1.88 2008/06/09 22:23:18 mbalmer Exp $
 
 SUBDIR=	atactl badsect bioctl brconfig ccdconfig clri dhclient \
 	disklabel dmesg dump dumpfs fdisk fsck fsck_ext2fs fsck_ffs  \
@@ -7,7 +7,7 @@ SUBDIR=	atactl badsect bioctl brconfig ccdconfig clri dhclient \
 	mount_cd9660 mount_ext2fs mount_ffs mount_msdos \
 	mount_nfs mount_ntfs mount_portal mount_procfs mount_udf \
 	mount_vnd mount_xfs mountd ncheck_ffs newfs newfs_msdos \
-	nfsd nmeaattach nologin pdisk pfctl pflogd ping ping6 quotacheck \
+	nfsd nologin pdisk pfctl pflogd ping ping6 quotacheck \
 	raidctl reboot restore route rtsol savecore scan_ffs \
 	scsi shutdown slattach swapctl sysctl ttyflags tunefs \
 	umount wpa-psk wsconsctl
diff --git a/sbin/nmeaattach/Makefile b/sbin/nmeaattach/Makefile
deleted file mode 100644
index db3c58ce9ba..00000000000
--- a/sbin/nmeaattach/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-#	$OpenBSD: Makefile,v 1.1 2006/07/04 05:31:54 mbalmer Exp $
-
-PROG=	nmeaattach
-MAN=	nmeaattach.8
-
-.include <bsd.prog.mk>
diff --git a/sbin/nmeaattach/nmeaattach.8 b/sbin/nmeaattach/nmeaattach.8
deleted file mode 100644
index 38daa7cc290..00000000000
--- a/sbin/nmeaattach/nmeaattach.8
+++ /dev/null
@@ -1,103 +0,0 @@
-.\"	$OpenBSD: nmeaattach.8,v 1.7 2008/06/09 22:07:29 mbalmer Exp $
-.\"
-.\" Copyright (c) 2006 - 2008 Marc Balmer <mbalmer@openbsd.org>
-.\"
-.\" Permission to use, copy, modify, and distribute this software for any
-.\" purpose with or without fee is hereby granted, provided that the above
-.\" copyright notice and this permission notice appear in all copies.
-.\"
-.\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-.\"
-.Dd $Mdocdate: June 9 2008 $
-.Dt NMEAATTACH 8
-.Os
-.Sh NAME
-.Nm nmeaattach
-.Nd attach serial lines as timedelta sensors
-.Sh SYNOPSIS
-.Nm nmeaattach
-.Op Fl dhm
-.Op Fl s Ar baudrate
-.Op Fl t Ar cond
-.Ar device
-.Sh DESCRIPTION
-.Nm
-is used to designate a serial line with a device that outputs NMEA 0183 data as
-a source of timedelta sensors.
-.Pp
-The
-.Nm
-command is deprecated and might be removed from a later version of
-.Ox .
-Please use the
-.Xr ldattach 8
-command instead.
-.Pp
-The following operands are supported by
-.Nm nmeaattach :
-.Bl -tag -width Ar
-.It Fl d
-Do not daemonize.
-.It Fl h
-Turn on RTS/CTS flow control.
-By default, no flow control is done.
-.It Fl m
-Maintain modem control signals after closing the line.
-Specifically, this disables HUPCL.
-.It Fl s Ar baudrate
-Specifies the speed of the connection.
-If not specified, the default of 4800 baud is used.
-.It Fl t Ar cond
-Chooses the condition which will cause the current system time to be
-immediately copied to the terminal timestamp storage for subsequent use by
-.Xr nmea 4 .
-Only one can be used.
-.Pp
-.Bl -tag -width DCDXX -offset indent -compact
-.It dcd
-Copy the timestamp when DCD is asserted.
-.It !dcd
-Copy the timestamp when DCD is deasserted.
-.It cts
-Copy the timestamp when CTS is asserted.
-.It !cts
-Copy the timestamp when CTS is deasserted.
-.El
-.Pp
-If no condition is specified, the
-.Xr nmea 4
-line discipline will timestamp on receiving the leading
-.Sq $
-character of each GPRMC sentence.
-.Pp
-Configuring the NMEA device to issue a PPS signal is device specific and
-should be done by device specific applications.
-.It Ar device
-Specifies the name of the serial line.
-.Ar device
-should be a string of the form
-.Dq cuaXX ,
-or
-.Dq /dev/cuaXX .
-.El
-.Pp
-Only the superuser may designate NMEA devices.
-.Pp
-To detach the interface, kill off the
-.Nm
-process.
-.Sh SEE ALSO
-.Xr ldattach 8,
-.Xr nmea 4 ,
-.Xr tty 4
-.Sh HISTORY
-The
-.Nm
-command first appeared in
-.Ox 4.0 .
diff --git a/sbin/nmeaattach/nmeaattach.c b/sbin/nmeaattach/nmeaattach.c
deleted file mode 100644
index eade0e029fa..00000000000
--- a/sbin/nmeaattach/nmeaattach.c
+++ /dev/null
@@ -1,166 +0,0 @@
-/*	$OpenBSD: nmeaattach.c,v 1.9 2007/10/13 16:28:24 mbalmer Exp $	*/
-/*
- * Copyright (c) 1988, 1993
- *	The Regents of the University of California.  All rights reserved.
- * Copyright (c) 2006 Marc Balmer <mbalmer@openbsd.org>
- *
- * This code is derived from software contributed to Berkeley by
- * Rick Adams.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * 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.
- */
-
-#include <sys/ioctl.h>
-#include <sys/ttycom.h>
-
-#include <err.h>
-#include <fcntl.h>
-#include <paths.h>
-#include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <termios.h>
-#include <unistd.h>
-
-int	speed = B4800;
-
-char	devicename[32];
-
-__dead void	usage(void);
-void 		coroner(int);
-
-volatile sig_atomic_t dying = 0;
-
-__dead void
-usage(void)
-{
-	extern char *__progname;
-
-	fprintf(stderr, "usage: %s [-dhm] [-s baudrate] [-t cond] device\n",
-	    __progname);
-	exit(1);
-}
-
-int
-main(int argc, char *argv[])
-{
-	int fd;
-	char *dev;
-	struct termios tty;
-	struct tstamps tstamps;
-	const char *errstr;
-	tcflag_t cflag = HUPCL;
-	int ch;
-	sigset_t sigset;
-	int nmeadisc = NMEADISC;
-	int nodaemon = 0;
-
-	tstamps.ts_set = tstamps.ts_clr = 0;
-
-	while ((ch = getopt(argc, argv, "dhms:t:")) != -1) {
-		switch (ch) {
-		case 'd':
-			nodaemon = 1;
-			break;
-		case 'h':
-			cflag |= CRTSCTS;
-			break;
-		case 'm':
-			cflag &= ~HUPCL;
-			break;
-		case 's':
-			speed = (int)strtonum(optarg, 50, 115200, &errstr);
-			if (errstr)
-				errx(1, "speed is %s: %s", errstr, optarg);
-			break;
-		case 't':
-			if (!strcasecmp(optarg, "dcd"))
-				tstamps.ts_set |= TIOCM_CAR;
-			else if (!strcasecmp(optarg, "!dcd"))
-				tstamps.ts_clr |= TIOCM_CAR;
-			else if (!strcasecmp(optarg, "cts"))
-				tstamps.ts_set |= TIOCM_CTS;
-			else if (!strcasecmp(optarg, "!cts"))
-				tstamps.ts_clr |= TIOCM_CTS;
-			else
-				errx(1, "'%s' not supported for timestamping",
-				    optarg);
-			break;
-		default:
-			usage();
-		}
-	}
-	argc -= optind;
-	argv += optind;
-
-	if (argc != 1)
-		usage();
-
-	dev = *argv;
-	if (strncmp(_PATH_DEV, dev, sizeof(_PATH_DEV) - 1)) {
-		(void)snprintf(devicename, sizeof(devicename),
-		    "%s%s", _PATH_DEV, dev);
-		dev = devicename;
-	}
-	if ((fd = open(dev, O_RDWR)) < 0)
-		err(1, "open: %s", dev);
-
-	tty.c_cflag = CREAD | CS8 | cflag;
-	tty.c_iflag = 0;
-	tty.c_lflag = 0;
-	tty.c_oflag = 0;
-	tty.c_cc[VMIN] = 1;
-	tty.c_cc[VTIME] = 0;
-	cfsetspeed(&tty, speed);
-	if (tcsetattr(fd, TCSADRAIN, &tty) < 0)
-		err(1, "tcsetattr");
-	if (ioctl(fd, TIOCSDTR, 0) < 0)
-		warn("TIOCSDTR");
-	if (ioctl(fd, TIOCSETD, &nmeadisc) < 0)
-		err(1, "TIOCSETD");
-	if (ioctl(fd, TIOCSTSTAMP, &tstamps) < 0)
-		err(1, "TIOCSTSTAMP");
-
-	if (!nodaemon && daemon(0, 0))
-		errx(1, "can't daemonize");
-
-	signal(SIGHUP, coroner);
-	signal(SIGTERM, coroner);
-
-	sigemptyset(&sigset);
-	for (;;) {
-		sigsuspend(&sigset);
-		if (dying)
-			return 0;
-	}
-}
-
-/* ARGSUSED */
-void
-coroner(int useless)
-{
-	dying = 1;
-}