Add a new device specification syntax to camcontrol. It is now possible to

do things like:

camcontrol tur da5
or
camcontrol tur 1:2:0
or
camcontrol tur 1:2

These changes are fully backwards compatible with the original device
specification syntax (-n dev -u unit), so it is possible to use either
method to specify a device now.

The device specification changes do not affect the rescan, reset or debug
commands, since by design, those commands work on a bus or bus:target:lun
basis only.

Also, shorten the default usage statement so that it fits in a 24 column
terminal.  The full usage statement is still available by using the "help"
"-h" or "-?" arguments to camcontrol.

Submitted by:	Joerg Wunsch <joerg_wunsch@interface-business.de>

1 files changed, 3 insertions, 3 deletions

diff --git a/sbin/camcontrol/util.c b/sbin/camcontrol/util.c
index 131624f956dc..6df239256d03 100644
--- a/sbin/camcontrol/util.c
+++ b/sbin/camcontrol/util.c
@@ -45,7 +45,7 @@
  */
 #ifndef lint
 static const char rcsid[] =
-	"$Id$";
+	"$Id: modeedit.c,v 1.1 1998/09/15 06:43:02 gibbs Exp $";
 #endif /* not lint */
 
 #include <ctype.h>
@@ -76,7 +76,7 @@ iget(void *hook, char *name)
 	if (h->got >= h->argc)
 	{
 		fprintf(stderr, "Expecting an integer argument.\n");
-		usage();
+		usage(0);
 		exit(1);
 	}
 	arg = strtol(h->argv[h->got], 0, 0);
@@ -99,7 +99,7 @@ cget(void *hook, char *name)
 	if (h->got >= h->argc)
 	{
 		fprintf(stderr, "Expecting a character pointer argument.\n");
-		usage();
+		usage(0);
 		exit(1);
 	}
 	arg = h->argv[h->got];