head 1.7; access; symbols pkgsrc-2013Q2:1.7.0.6 pkgsrc-2013Q2-base:1.7 pkgsrc-2012Q4:1.7.0.4 pkgsrc-2012Q4-base:1.7 pkgsrc-2011Q4:1.7.0.2 pkgsrc-2011Q4-base:1.7 pkgsrc-2011Q3:1.6.0.76 pkgsrc-2011Q3-base:1.6 pkgsrc-2011Q2:1.6.0.74 pkgsrc-2011Q2-base:1.6 pkgsrc-2011Q1:1.6.0.72 pkgsrc-2011Q1-base:1.6 pkgsrc-2010Q4:1.6.0.70 pkgsrc-2010Q4-base:1.6 pkgsrc-2010Q3:1.6.0.68 pkgsrc-2010Q3-base:1.6 pkgsrc-2010Q2:1.6.0.66 pkgsrc-2010Q2-base:1.6 pkgsrc-2010Q1:1.6.0.64 pkgsrc-2010Q1-base:1.6 pkgsrc-2009Q4:1.6.0.62 pkgsrc-2009Q4-base:1.6 pkgsrc-2009Q3:1.6.0.60 pkgsrc-2009Q3-base:1.6 pkgsrc-2009Q2:1.6.0.58 pkgsrc-2009Q2-base:1.6 pkgsrc-2009Q1:1.6.0.56 pkgsrc-2009Q1-base:1.6 pkgsrc-2008Q4:1.6.0.54 pkgsrc-2008Q4-base:1.6 pkgsrc-2008Q3:1.6.0.52 pkgsrc-2008Q3-base:1.6 cube-native-xorg:1.6.0.50 cube-native-xorg-base:1.6 pkgsrc-2008Q2:1.6.0.48 pkgsrc-2008Q2-base:1.6 cwrapper:1.6.0.46 pkgsrc-2008Q1:1.6.0.44 pkgsrc-2008Q1-base:1.6 pkgsrc-2007Q4:1.6.0.42 pkgsrc-2007Q4-base:1.6 pkgsrc-2007Q3:1.6.0.40 pkgsrc-2007Q3-base:1.6 pkgsrc-2007Q2:1.6.0.38 pkgsrc-2007Q2-base:1.6 pkgsrc-2007Q1:1.6.0.36 pkgsrc-2007Q1-base:1.6 pkgsrc-2006Q4:1.6.0.34 pkgsrc-2006Q4-base:1.6 pkgsrc-2006Q3:1.6.0.32 pkgsrc-2006Q3-base:1.6 pkgsrc-2006Q2:1.6.0.30 pkgsrc-2006Q2-base:1.6 pkgsrc-2006Q1:1.6.0.28 pkgsrc-2006Q1-base:1.6 pkgsrc-2005Q4:1.6.0.26 pkgsrc-2005Q4-base:1.6 pkgsrc-2005Q3:1.6.0.24 pkgsrc-2005Q3-base:1.6 pkgsrc-2005Q2:1.6.0.22 pkgsrc-2005Q2-base:1.6 pkgsrc-2005Q1:1.6.0.20 pkgsrc-2005Q1-base:1.6 pkgsrc-2004Q4:1.6.0.18 pkgsrc-2004Q4-base:1.6 pkgsrc-2004Q3:1.6.0.16 pkgsrc-2004Q3-base:1.6 pkgsrc-2004Q2:1.6.0.14 pkgsrc-2004Q2-base:1.6 pkgsrc-2004Q1:1.6.0.12 pkgsrc-2004Q1-base:1.6 pkgsrc-2003Q4:1.6.0.10 pkgsrc-2003Q4-base:1.6 netbsd-1-6-1:1.6.0.6 netbsd-1-6-1-base:1.6 netbsd-1-6:1.6.0.8 netbsd-1-6-RELEASE-base:1.6 pkgviews:1.6.0.4 pkgviews-base:1.6 buildlink2:1.6.0.2 buildlink2-base:1.6 netbsd-1-5-PATCH003:1.6 netbsd-1-5-PATCH001:1.6 netbsd-1-5-RELEASE:1.5 netbsd-1-4-PATCH003:1.5 netbsd-1-4-PATCH002:1.4 comdex-fall-1999:1.3 netbsd-1-4-PATCH001:1.3 netbsd-1-4-RELEASE:1.3 netbsd-1-3-PATCH003:1.2; locks; strict; comment @# @; 1.7 date 2011.11.23.18.59.22; author wiz; state dead; branches; next 1.6; 1.6 date 2000.11.19.12.34.23; author fvdl; state Exp; branches; next 1.5; 1.5 date 2000.09.10.22.50.34; author wiz; state Exp; branches; next 1.4; 1.4 date 99.12.25.23.45.22; author wiz; state Exp; branches; next 1.3; 1.3 date 99.03.12.16.44.14; author hubertf; state Exp; branches; next 1.2; 1.2 date 98.08.07.10.36.17; author agc; state Exp; branches; next 1.1; 1.1 date 98.07.16.21.12.56; author thorpej; state Exp; branches; next ; desc @@ 1.7 log @Remove libscsi and the two packages using it, tosha and cdd. The FreeBSD SCSI library on which libscsi was based, was removed in 1998. The two other packages were last updated 1997 and 2001, respectively. Better software exists (e.g. cdparanoia, cdrecord). Ok agc@@, gdt@@ @ text @$NetBSD: patch-ab,v 1.6 2000/11/19 12:34:23 fvdl Exp $ --- tosha.c.orig Wed May 21 02:11:49 1997 +++ tosha.c Sun Nov 19 13:01:03 2000 @@@@ -49,7 +49,8 @@@@ #include #include #include -#include +#include +#include "scsi.h" extern int errno; /* @@@@ -93,7 +94,7 @@@@ #include "getlopt.h" typedef unsigned char byte; -typedef unsigned long ulong; +/*typedef unsigned long ulong;*/ struct scsireq *sreq; /* SCSI device request structure */ int scsifd; /* SCSI device file descriptor */ @@@@ -127,8 +128,8 @@@@ int result; scsireq_reset (sreq); - sreq->timeout = 10000; scsireq_build (sreq, size, (char *) buf, flags, cmd); + sreq->timeout = 10000; result = scsireq_enter (scsifd, sreq); #ifndef DEBUG if (SCSIREQ_ERROR (sreq)) @@@@ -182,7 +183,8 @@@@ char *tracklstr = "1-100"; char *outname = "track%02d.pcm"; -char *device = "/dev/cd0c"; +char device_store[256]; +char *device = device_store; int indexonly = FALSE; int quiet = FALSE; int verbose = FALSE; @@@@ -387,7 +389,6 @@@@ if ((secread = framesperbuf) > endpp - sec) secread = endpp - sec; scsireq_reset (sreq); - sreq->timeout = 10000; if (readcmd == 0xd8) scsireq_build (sreq, FRAMESIZE * secread, (char *) buf, SCCMD_READ, @@@@ -398,6 +399,7 @@@@ (char *) buf, SCCMD_READ, "v 0 0 v:i3 0 0 v 0", readcmd, sec, secread); + sreq->timeout = 10000; result = scsireq_enter (scsifd, sreq); #ifndef DEBUG if (SCSIREQ_ERROR (sreq)) @@@@ -464,6 +466,8 @@@@ int singlefile = FALSE; int modechange = TRUE, denschange = 0; + (void) snprintf(device, 256, "/dev/rcd0%c", getrawpartition() + 'a'); + utils_init (argv[0]); #ifdef DEBUG fprintf (stderr, "%s: DEBUG mode is ON.\n", me); @@@@ -647,7 +651,8 @@@@ fprintf (stderr, " Reading ...\r"); } else { - asprintf (&ofname, outname, i+1); + ofname = malloc(1000); /* XXX */ + sprintf (ofname, outname, i+1); if (!quiet) fprintf (stderr, verbose ? " (output file: %s)\n" : @ 1.6 log @The timeout value for a scsireq is reset by libscsi in scsi_build. So, set it *after* scsi_build, so that the actual intented timeout value is used, avoiding timeouts, bus resets and people putting the blame on controllers/drivers. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.5 2000/09/10 22:50:34 wiz Exp $ @ 1.5 log @Use devel/libscsi instead of adding the scsi library via patches. Fix a bug. Closes pkg/6375. @ text @d1 1 a1 1 $NetBSD$ d4 1 a4 1 +++ tosha.c d24 10 d44 16 @ 1.4 log @added missing NetBSD RCS tags, 'quoted' existing *BSD ones @ text @d1 4 a4 3 $NetBSD: patch-ab,v 1.3 1999/03/12 16:44:14 hubertf Exp $ --- tosha.c.XXX Fri Mar 12 17:41:08 1999 +++ tosha.c Fri Mar 12 17:41:14 1999 d38 1 a38 1 + (void) snprintf(device, sizeof(device), "/dev/cd0%c", getrawpartition() + 'a'); @ 1.3 log @Split and fix. @ text @d1 1 a1 2 $NetBSD$ @ 1.2 log @Add NetBSD RCS Ids. @ text @d3 22 a24 3 --- tosha.c.orig Thu Jul 16 12:22:42 1998 +++ tosha.c Thu Jul 16 12:23:05 1998 @@@@ -183,7 +183,8 @@@@ d28 1 a28 1 -char device[256]; d34 19 @ 1.1 log @Someone doesn't understand the difference between arrays and pointers. Quick hack to make specifying an alternate device work. @ text @d1 2 @