d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Stop disallowing device nodes to be passed to camcontrol(8) since libcam

Browse Source 
already allows both device names and nodes to be specified.

Reviewed by:	avg
This commit is contained in:
Rebecca Cran 2010-10-19 20:05:25 +00:00
parent a7a3177f27
commit f0129ea88b
2 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sbin/camcontrol/camcontrol.8
View File

@ -207,9 +207,6 @@ A device identifier can take one of three forms:
.Bl -tag -width 14n .Bl -tag -width 14n
.It deviceUNIT .It deviceUNIT
Specify a device name and unit number combination, like "da5" or "cd3". Specify a device name and unit number combination, like "da5" or "cd3".
Note that character device node names (e.g.\& /dev/da0) are
.Em not
allowed here.
.It bus:target .It bus:target
Specify a bus number and target id. Specify a bus number and target id.
The bus number can be determined from The bus number can be determined from

10
sbin/camcontrol/camcontrol.c
View File

@ -4605,15 +4605,7 @@ main(int argc, char **argv)
char name[30]; char name[30];
int rv; int rv;
/* if (isdigit(argv[2][0])) {
* First catch people who try to do things like:
* camcontrol tur /dev/da0
* camcontrol doesn't take device nodes as arguments.
*/
if (argv[2][0] == '/') {
warnx("%s is not a valid device identifier", argv[2]);
errx(1, "please read the camcontrol(8) man page");
} else if (isdigit(argv[2][0])) {
/* device specified as bus:target[:lun] */ /* device specified as bus:target[:lun] */
rv = parse_btl(argv[2], &bus, &target, &lun, &arglist); rv = parse_btl(argv[2], &bus, &target, &lun, &arglist);
if (rv < 2) if (rv < 2)