aboutsummaryrefslogtreecommitdiff
path: root/sbin/camcontrol/camcontrol.c
diff options
context:
space:
mode:
authorKenneth D. Merry <ken@FreeBSD.org>2000-06-04 02:43:55 +0000
committerKenneth D. Merry <ken@FreeBSD.org>2000-06-04 02:43:55 +0000
commitb3550398d3a6097df707724fad72eb54bd573301 (patch)
tree1e4095d0fd56eedadde85f898e007e02703139aa /sbin/camcontrol/camcontrol.c
parent0e61e4dd084bf65e43aa4961b29b7e7d874b9fff (diff)
downloadsrc-b3550398d3a6097df707724fad72eb54bd573301.tar.gz
src-b3550398d3a6097df707724fad72eb54bd573301.zip
Eliminate the default device name (da) and unit number (0) in camcontrol.
This may break some scripts, but with the number of ways users can damage a system with this tool, it's important to make sure they specify which device they want to talk to. Suggested by: joerg
Notes
Notes: svn path=/head/; revision=61233
Diffstat (limited to 'sbin/camcontrol/camcontrol.c')
-rw-r--r--sbin/camcontrol/camcontrol.c25
1 files changed, 12 insertions, 13 deletions
diff --git a/sbin/camcontrol/camcontrol.c b/sbin/camcontrol/camcontrol.c
index eaaba37852b9..5a0ad21adb91 100644
--- a/sbin/camcontrol/camcontrol.c
+++ b/sbin/camcontrol/camcontrol.c
@@ -48,9 +48,6 @@
#include <camlib.h>
#include "camcontrol.h"
-#define DEFAULT_DEVICE "da"
-#define DEFAULT_UNIT 0
-
typedef enum {
CAM_ARG_NONE = 0x00000000,
CAM_ARG_DEVLIST = 0x00000001,
@@ -1068,6 +1065,8 @@ scanlun_or_reset_dev(int bus, int target, int lun, int scan)
struct cam_device *device;
int fd;
+ device = NULL;
+
if (bus < 0) {
warnx("invalid bus number %d", bus);
return(1);
@@ -3015,8 +3014,8 @@ usage(int verbose)
"Generic arguments:\n"
"-v be verbose, print out sense information\n"
"-t timeout command timeout in seconds, overrides default timeout\n"
-"-n dev_name specify device name (default is %s)\n"
-"-u unit specify unit number (default is %d)\n"
+"-n dev_name specify device name, e.g. \"da\", \"cd\"\n"
+"-u unit specify unit number, e.g. \"0\", \"5\"\n"
"-E have the kernel attempt to perform SCSI error recovery\n"
"-C count specify the SCSI command retry count (needs -E to work)\n"
"modepage arguments:\n"
@@ -3059,8 +3058,7 @@ usage(int verbose)
"format arguments:\n"
"-q be quiet, don't print status messages\n"
"-w don't send immediate format command\n"
-"-y don't ask any questions\n",
-DEFAULT_DEVICE, DEFAULT_UNIT);
+"-y don't ask any questions\n");
}
int
@@ -3245,12 +3243,6 @@ main(int argc, char **argv)
}
}
- if ((arglist & CAM_ARG_DEVICE) == 0)
- device = (char *)strdup(DEFAULT_DEVICE);
-
- if ((arglist & CAM_ARG_UNIT) == 0)
- unit = DEFAULT_UNIT;
-
/*
* For most commands we'll want to open the passthrough device
* associated with the specified device. In the case of the rescan
@@ -3258,6 +3250,13 @@ main(int argc, char **argv)
* transport layer device.
*/
if (devopen == 1) {
+ if (((arglist & (CAM_ARG_BUS|CAM_ARG_TARGET)) == 0)
+ && (((arglist & CAM_ARG_DEVICE) == 0)
+ || ((arglist & CAM_ARG_UNIT) == 0))) {
+ errx(1, "subcommand \"%s\" requires a valid device "
+ "identifier", argv[1]);
+ }
+
if ((cam_dev = ((arglist & (CAM_ARG_BUS | CAM_ARG_TARGET))?
cam_open_btl(bus, target, lun, O_RDWR, NULL) :
cam_open_spec_device(device,unit,O_RDWR,NULL)))