diff options
| author | Andrey Slusar <anray@FreeBSD.org> | 2006-01-15 17:08:04 +0000 |
|---|---|---|
| committer | Andrey Slusar <anray@FreeBSD.org> | 2006-01-15 17:08:04 +0000 |
| commit | a486ccb0e5f5ade34c3bc78279606e54dcdae751 (patch) | |
| tree | 4351881343ae4d0ceeddc94decf9179e27da3001 /sysutils/cdrtools | |
| parent | 7989d9cb5d366521d4de64bea1c2cd8dbde34b45 (diff) | |
| download | ports-a486ccb0e5f5ade34c3bc78279606e54dcdae751.tar.gz ports-a486ccb0e5f5ade34c3bc78279606e54dcdae751.zip | |
Notes
Diffstat (limited to 'sysutils/cdrtools')
| -rw-r--r-- | sysutils/cdrtools/Makefile | 2 | ||||
| -rw-r--r-- | sysutils/cdrtools/files/patch-readcd::readcd.c | 31 |
2 files changed, 32 insertions, 1 deletions
diff --git a/sysutils/cdrtools/Makefile b/sysutils/cdrtools/Makefile index 0d9feda2c7a8..478c8b6bc467 100644 --- a/sysutils/cdrtools/Makefile +++ b/sysutils/cdrtools/Makefile @@ -7,7 +7,7 @@ PORTNAME= cdrtools PORTVERSION?= 2.01 -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES?= sysutils audio MASTER_SITES= ftp://ftp.berlios.de/pub/cdrecord/ \ ftp://ftp.cs.tu-berlin.de/pub/misc/cdrecord/ diff --git a/sysutils/cdrtools/files/patch-readcd::readcd.c b/sysutils/cdrtools/files/patch-readcd::readcd.c new file mode 100644 index 000000000000..f347a2299902 --- /dev/null +++ b/sysutils/cdrtools/files/patch-readcd::readcd.c @@ -0,0 +1,31 @@ +--- readcd/readcd.c.original Sun Jan 15 17:14:03 2006 ++++ readcd/readcd.c Sun Jan 15 17:24:47 2006 +@@ -370,6 +370,8 @@ + exit(err); + } + } else { ++ char errstr[80]; ++ + if (scsibus == -1 && target >= 0 && lun >= 0) + scsibus = 0; + +@@ -378,8 +380,17 @@ + scgp->kdebug = kdebug; + + scg_settarget(scgp, scsibus, target, lun); +- if (scg__open(scgp, NULL) <= 0) +- comerr("Cannot open SCSI driver.\n"); ++ ++ scgp = scg_open(dev, errstr, sizeof(errstr), 0, 0); ++ ++ if (scgp == NULL) { ++ errmsg("%s%sCannot open SCSI driver.\n", errstr, errstr[0]?". ":""); ++ errmsgno(EX_BAD, "For possible targets try 'readcd -scanbus'.%s\n", ++ geteuid() ? " Make sure you are root.":""); ++ errmsgno(EX_BAD, "For possible transport specifiers try 'readcd dev=help'.\n"); ++ exit(EX_BAD); ++ } ++ + } + scgp->silent = silent; + scgp->verbose = verbose; |