From 8d49d2884da4cb69a5f482859812ee93a37b4311 Mon Sep 17 00:00:00 2001 From: Rebecca Cran Date: Tue, 16 Nov 2010 07:51:35 +0000 Subject: MFC r214073: Stop disallowing device nodes to be passed to camcontrol(8) since libcam already allows both device names and nodes to be specified. --- sbin/camcontrol/camcontrol.8 | 3 --- sbin/camcontrol/camcontrol.c | 10 +--------- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/sbin/camcontrol/camcontrol.8 b/sbin/camcontrol/camcontrol.8 index 20cfb8955463..1c05d795c0e2 100644 --- a/sbin/camcontrol/camcontrol.8 +++ b/sbin/camcontrol/camcontrol.8 @@ -207,9 +207,6 @@ A device identifier can take one of three forms: .Bl -tag -width 14n .It deviceUNIT 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 Specify a bus number and target id. The bus number can be determined from diff --git a/sbin/camcontrol/camcontrol.c b/sbin/camcontrol/camcontrol.c index d5c29f0fc0ec..e36199226a1a 100644 --- a/sbin/camcontrol/camcontrol.c +++ b/sbin/camcontrol/camcontrol.c @@ -4607,15 +4607,7 @@ main(int argc, char **argv) char name[30]; int rv; - /* - * 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])) { + if (isdigit(argv[2][0])) { /* device specified as bus:target[:lun] */ rv = parse_btl(argv[2], &bus, &target, &lun, &arglist); if (rv < 2) -- cgit v1.3