From 36c53801ee91429c3e2bdf33e65aad4693e321ff Mon Sep 17 00:00:00 2001 From: Sascha Wildner Date: Thu, 6 Jul 2006 16:17:20 +0000 Subject: [PATCH] Remove the old wormcontrol(8) command and the worm(4) man page. --- etc/Makefile | 3 +- share/man/man4/Makefile | 3 +- share/man/man4/worm.4 | 110 ----------------- usr.sbin/wormcontrol/Makefile | 7 -- usr.sbin/wormcontrol/wormcontrol.8 | 182 ----------------------------- usr.sbin/wormcontrol/wormcontrol.c | 170 --------------------------- 6 files changed, 3 insertions(+), 472 deletions(-) delete mode 100644 share/man/man4/worm.4 delete mode 100644 usr.sbin/wormcontrol/Makefile delete mode 100644 usr.sbin/wormcontrol/wormcontrol.8 delete mode 100644 usr.sbin/wormcontrol/wormcontrol.c diff --git a/etc/Makefile b/etc/Makefile index 99d0cb98f2..be649e465f 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -1,6 +1,6 @@ # from: @(#)Makefile 5.11 (Berkeley) 5/21/91 # $FreeBSD: src/etc/Makefile,v 1.219.2.38 2003/03/04 09:49:00 ru Exp $ -# $DragonFly: src/etc/Makefile,v 1.118 2006/07/04 04:38:29 swildner Exp $ +# $DragonFly: src/etc/Makefile,v 1.119 2006/07/06 16:17:20 swildner Exp $ .if !defined(NO_SENDMAIL) SUBDIR= sendmail @@ -427,6 +427,7 @@ upgrade_etc: preupgrade rm -f ${DESTDIR}/var/db/port.mkversion rm -f ${DESTDIR}/share/mk/bsd.kern.mk rm -f ${DESTDIR}/modules/pcic.ko + csh -c "rm -f ${DESTDIR}/usr/share/man/{man,cat}4/worm.4.gz" ldconfig -R .if !defined(BINARY_UPGRADE) # binary upgrade just copies these nodes .if !defined(NO_MAKEDEV) diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index 7c421bdeb6..e7079c1eb8 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -1,6 +1,6 @@ # @(#)Makefile 8.1 (Berkeley) 6/18/93 # $FreeBSD: src/share/man/man4/Makefile,v 1.83.2.66 2003/06/04 17:10:30 sam Exp $ -# $DragonFly: src/share/man/man4/Makefile,v 1.39 2006/06/25 11:02:37 corecode Exp $ +# $DragonFly: src/share/man/man4/Makefile,v 1.40 2006/07/06 16:17:20 swildner Exp $ MAN= aac.4 \ acpi.4 \ @@ -257,7 +257,6 @@ MAN= aac.4 \ wlan_tkip.4 \ wlan_wep.4 \ wlan_xauth.4 \ - worm.4 \ xe.4 \ xl.4 \ xpt.4 \ diff --git a/share/man/man4/worm.4 b/share/man/man4/worm.4 deleted file mode 100644 index 94b672409e..0000000000 --- a/share/man/man4/worm.4 +++ /dev/null @@ -1,110 +0,0 @@ -.\" -.\" Copyright (C) 1996 -.\" interface business GmbH -.\" Tolkewitzer Strasse 49 -.\" D-01277 Dresden -.\" F.R. Germany -.\" -.\" All rights reserved. -.\" -.\" Written by Joerg Wunsch -.\" -.\" -.\" 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. -.\" -.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``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 AUTHOR(S) 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. -.\" -.\" $FreeBSD: src/share/man/man4/worm.4,v 1.18.2.4 2001/08/31 08:02:58 kris Exp $ -.\" $DragonFly: src/share/man/man4/Attic/worm.4,v 1.3 2006/02/17 19:37:09 swildner Exp $ -.\" " -.Dd October 15, 1998 -.Dt WORM 4 -.Os -.Sh NAME -.Nm worm -.Nd write-once (CD-R) disk driver -.Sh SYNOPSIS -None. -.Sh DESCRIPTION -The -.Nm -driver was provided under -.Fx -releases prior to -.Fx 3.0 . -.Pp -The -.Fx -.Tn SCSI -layer was replaced for -.Fx 3.0 -by a CAM-compliant -.Tn SCSI -layer. The new -.Tn SCSI -layer doesn't include a -.Xr worm 4 -driver, and isn't likely to include one in the future. Future in-kernel -support for CD-R/CD-RW/DVD drives will likely be implemented through the -.Xr cd 4 -driver. Users who wish -to write CDs on a WORM, CD-R, or CD-RW drive -should use -.Nm cdrtools , -which is in the -.Fx -ports collection. -.Pp -The -.Xr cd 4 -driver provides read-only access to CD, CD-R, and CD-RW drives, as well as -WORM drives that support the CDROM command set. Therefore, users wishing -to mount CDs in a WORM drive should use the -.Xr cd 4 -driver instead. -.Sh SEE ALSO -.Xr close 2 , -.Xr ioctl 2 , -.Xr open 2 , -.Xr write 2 , -.Xr cd 4 , -.Xr pass 4 , -.Xr xpt 4 -.Sh HISTORY -The -.Nm -driver appeared in -.Fx 2.1 , -and disappeared in -.Fx 3.0 -with the advent of the CAM -.Tn SCSI -layer. -.Sh AUTHORS -.An -nosplit -The first skeleton for a -.Nm -driver has been written by -.An Peter Dufault -in May, 1995. The driver has -then been improved and made actually usable at all by -.An J\(:org Wunsch -in January, 1996. diff --git a/usr.sbin/wormcontrol/Makefile b/usr.sbin/wormcontrol/Makefile deleted file mode 100644 index ff99a3939d..0000000000 --- a/usr.sbin/wormcontrol/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -# $FreeBSD: src/usr.sbin/wormcontrol/Makefile,v 1.1.1.1.10.1 2001/04/25 12:11:12 ru Exp $ -# $DragonFly: src/usr.sbin/wormcontrol/Attic/Makefile,v 1.2 2003/06/17 04:30:04 dillon Exp $ - -PROG= wormcontrol -MAN= wormcontrol.8 - -.include diff --git a/usr.sbin/wormcontrol/wormcontrol.8 b/usr.sbin/wormcontrol/wormcontrol.8 deleted file mode 100644 index 35005d3865..0000000000 --- a/usr.sbin/wormcontrol/wormcontrol.8 +++ /dev/null @@ -1,182 +0,0 @@ -.\" -.\" Copyright (C) 1996 -.\" interface business GmbH -.\" Tolkewitzer Strasse 49 -.\" D-01277 Dresden -.\" F.R. Germany -.\" -.\" All rights reserved. -.\" -.\" Written by Joerg Wunsch -.\" -.\" -.\" 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. -.\" -.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``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 AUTHOR(S) 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. -.\" -.\" $FreeBSD: src/usr.sbin/wormcontrol/wormcontrol.8,v 1.14.2.1 2000/12/27 13:50:37 ru Exp $ -.\" $DragonFly: src/usr.sbin/wormcontrol/Attic/wormcontrol.8,v 1.4 2006/02/17 19:40:30 swildner Exp $ -.\" -.\" arrgh, hilit19 needs this" :-( -.Dd January 27, 1996 -.Os -.Dt WORMCONTROL 8 -.Sh NAME -.Nm wormcontrol -.Nd control the CD-R driver -.Sh SYNOPSIS -.Nm -.Op Fl f Ar device -.Ar command -.Op Ar params... -.Sh DESCRIPTION -The -.Nm -utility is used to control the behaviour of the -.Xr worm 4 -driver in order to adjust various parameters of a recordable CD -.Pq CD-R . -.Pp -Unlike many other devices, CD-R's require a very strict handling order. -Prior to writing data, the speed of the drive must be selected, and -the drive can also be turned into a -.Ql dummy -mode, where every action is only performed with the laser turned off. -This way, it's possible to test whether the environment provides a -sufficiently high data flow rate in order to actually burn the CD-R, -without destroying the medium in case of a catastrophic failure. -.Pp -In order to write a new track, the drive must be told whether the new -track will become an audio or a data track. Audio tracks are written -with a block size of 2352 bytes, while data tracks have 2048 bytes per -block. For audio tracks, the driver does further need to know -whether the data are recorded with a preemphasis. -.Pp -Once all tracks of a session have been written, the disk must be -.Em fixated . -This writes the table of contents and leadout information to the disk. -The disk won't be usable without doing this. -.Pp -The following options are available: -.Bl -tag -width ident -.It Fl f Ar device -Use -.Ar device -instead of the default -.Pa /dev/rworm0 . -.It prepdisk Ar single \&| double Op Ar dummy -Prepare the disk for recording. This must be done before any tracks -can be prepared, and remains in effect until the session has been -fixated. Either single speed -.Pq for audio data -or double speed -.Pq for CD-ROM data -must be selected, and optionally, the argument -.Ar dummy -can be used to tell the drive to keep the laser turned off, for testing. -.It track Ar audio \&| data Op Ar preemp -Inform the driver about the format of the next track. Either -.Ar audio -or -.Ar data -.Pq CD-ROM -must be selected, with an optional argument -.Ar preemp -that must be specified for an audio track where data records with -preemphasis are being used. Once this command has been successfully -specified, the track is ready for being written. -.It fixate Ar toc-type Op Ar onp -Once all tracks have been written, this closes the current session. -The argument -.Ar toc-type -is a single digit between 0 and 4, with the following meaning: -.Bl -item -.It -0 CD audio -.It -1 CD-ROM -.It -2 CD-ROM with first track in mode 1 -.It -3 CD-ROM with first track in mode 2 -.It -4 CDI -.El -.Pp -The optional argument -.Ar onp -stands for -.Dq open next program area , -which means that the next session on the CD-R will be opened and can -be recorded in the future. Otherwise, the CD-R will be closed and -remains unchangeable. -.It blank -Blank a CD-RW disk. -.It nextwriteable -Sets the next writeable location on the drive, used when writing -more than one track ie CD-DA (audio) disks. -.El -.Sh FILES -.Bl -tag -width /usr/share/examples/worm/* -compact -.It Pa /usr/share/examples/worm/* -.El -.Sh EXAMPLES -The typical sequence of burning a data CD-R looks like: -.Bd -literal -# wormcontrol prepdisk double -# wormcontrol track data -# rtprio 5 team -v 1m 5 < cdrom.image | rtprio 5 dd of=/dev/rworm0 obs=20k -# wormcontrol fixate 1 -.Ed -.Pp -Note that the -.Xr dd 1 -command above is mainly used in order to -.Dq slice -the data stream. It's particularly useful when recording audio data -with their rather unusual blocksize. Since the underlying device is a -.Em raw -device, the blocksize used in that command must be an integral multiple -of the CD-R blocksize. -.Pp -The mentioned command -.Xr team 1 -is not part of the base system, but comes extremely handy in order to -pipe a constant data stream into the CD recorder. -.Sh DIAGNOSTICS -Error codes for the underlying -.Xr ioctl 2 -commands are printed by the -.Xr err 3 -facility. -.Sh SEE ALSO -.Xr dd 1 , -.Xr team 1 , -.Xr ioctl 2 , -.Xr err 3 , -.Xr worm 4 -.Sh HISTORY -.Nm Wormcontrol -is currently under development. -.Sh AUTHORS -The program has been contributed by -.An J\(:org Wunsch , -Dresden. diff --git a/usr.sbin/wormcontrol/wormcontrol.c b/usr.sbin/wormcontrol/wormcontrol.c deleted file mode 100644 index ac225538e8..0000000000 --- a/usr.sbin/wormcontrol/wormcontrol.c +++ /dev/null @@ -1,170 +0,0 @@ -/* - * Copyright (C) 1996 - * interface business GmbH - * Tolkewitzer Strasse 49 - * D-01277 Dresden - * F.R. Germany - * - * All rights reserved. - * - * Written by Joerg Wunsch - * - * - * 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. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``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 AUTHOR(S) 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. - * - * $FreeBSD: src/usr.sbin/wormcontrol/wormcontrol.c,v 1.11 1999/10/01 14:12:46 peter Exp $ - * $DragonFly: src/usr.sbin/wormcontrol/Attic/wormcontrol.c,v 1.3 2005/12/05 01:23:23 swildner Exp $ - */ - -#include -#include -#include -#include -#include -#include -#include - -#include -#include - -static void -usage(void) -{ - fprintf(stderr,"usage: wormcontrol [-f device] command [args]\n"); - exit(EX_USAGE); -} - -#define eq(a, b) (strcmp(a, b) == 0) - -int -main(int argc, char **argv) -{ - int fd, c, i; - int errs = 0; - const char *devname = "/dev/rworm0"; - - while ((c = getopt(argc, argv, "f:")) != -1) - switch(c) { - case 'f': - devname = optarg; - break; - - case '?': - default: - errs++; - } - - argc -= optind; - argv += optind; - - if (errs || argc < 1) - usage(); - - if ((fd = open(devname, O_RDONLY | O_NONBLOCK, 0)) == -1) - err(EX_NOINPUT, "open(%s)", devname); - - if (eq(argv[0], "prepdisk")) { - struct wormio_prepare_disk d; - d.dummy = 0; - d.speed = -1; - for (i = 1; i < argc; i++) { - if (eq(argv[i], "dummy")) - d.dummy = 1; - else if (eq(argv[i], "single")) - d.speed = 1; - else if (eq(argv[i], "double")) - d.speed = 2; - else if (eq(argv[i], "quad")) - d.speed = 4; - else if (eq(argv[i], "max")) - d.speed = 99; - else - errx(EX_USAGE, - "wrong param for \"prepdisk\": %s", - argv[i]); - } - if (d.speed == -1) - errx(EX_USAGE, "missing speed parameter"); - if (ioctl(fd, WORMIOCPREPDISK, &d) == -1) - err(EX_IOERR, "ioctl(WORMIOCPREPDISK)"); - } - else if (eq(argv[0], "track")) { - struct wormio_prepare_track t; - bzero(&t, sizeof (t)); - t.audio = -1; - t.preemp = 0; - for (i = 1; i < argc; i++) { - if (eq(argv[i], "audio")) - t.audio = 1; - else if (eq(argv[i], "data")) { - t.audio = 0; - t.track_type = BLOCK_MODE_1; - } else if (eq(argv[i], "preemp")) - t.preemp = 1; - else - errx(EX_USAGE, - "wrong param for \"track\": %s", - argv[i]); - } - if (t.audio == -1) - errx(EX_USAGE, "missing track type parameter"); - if (t.audio == 0 && t.preemp == 1) - errx(EX_USAGE, "\"preemp\" attempted on data track"); - if (ioctl(fd, WORMIOCPREPTRACK, &t) == -1) - err(EX_IOERR, "ioctl(WORMIOCPREPTRACK)"); - } - else if (eq(argv[0], "fixate")) { - struct wormio_fixation f; - f.toc_type = -1; - f.onp = 0; - for (i = 1; i < argc; i++) { - if (eq(argv[i], "onp")) - f.onp = 1; - else if (argv[i][0] >= '0' && argv[i][0] <= '4' && - argv[i][1] == '\0') - f.toc_type = argv[i][0] - '0'; - else - errx(EX_USAGE, - "wrong param for \"fixate\": %s", - argv[i]); - } - if (f.toc_type == -1) - errx(EX_USAGE, "missing TOC type parameter"); - if (ioctl(fd, WORMIOCFIXATION, &f) == -1) - err(EX_IOERR, "ioctl(WORMIOFIXATION)"); - } - else if (eq(argv[0], "blank")) { - if (ioctl(fd, CDRIOCBLANK) == -1) - err(EX_IOERR, "ioctl(CDRIOCBLANK)"); - } - else if (eq(argv[0], "nextwriteable")) { - int addr; - if (ioctl(fd, CDRIOCNEXTWRITEABLEADDR, &addr) == -1) - err(EX_IOERR, "ioctl(CDRIOCNEXTWRITEABLEADDR)"); - printf("%d\n", addr); - } - else - errx(EX_USAGE, "unknown command: %s", argv[0]); - - return EX_OK; -} -- 2.41.0