static int always_info;
static int dev_specified;
static int sys_specified;
-static char config_file[MAX_NAME_LEN] = SCSI_ID_CONFIG_FILE;
+static char config_file[MAX_PATH_LEN] = SCSI_ID_CONFIG_FILE;
static int display_bus_id;
static enum page_code default_page_code;
static int use_stderr;
return -1;
}
- snprintf(tmpdev, MAX_NAME_LEN, "%s/%s-maj%d-min%d-%u",
+ snprintf(tmpdev, MAX_PATH_LEN, "%s/%s-maj%d-min%d-%u",
TMP_DIR, TMP_PREFIX, maj, min, getpid());
dbg("tmpdev '%s'", tmpdev);
case 'd':
dev_specified = 1;
- strncpy(maj_min_dev, optarg, MAX_NAME_LEN);
+ strncpy(maj_min_dev, optarg, MAX_PATH_LEN);
+ maj_min_dev[MAX_PATH_LEN-1] = '\0';
break;
case 'e':
break;
case 'f':
- strncpy(config_file, optarg, MAX_NAME_LEN);
+ strncpy(config_file, optarg, MAX_PATH_LEN);
+ config_file[MAX_PATH_LEN-1] = '\0';
break;
case 'g':
case 's':
sys_specified = 1;
- strncpy(target, optarg, MAX_NAME_LEN);
- target[MAX_NAME_LEN-1] = '\0';
+ strncpy(target, optarg, MAX_PATH_LEN);
+ target[MAX_PATH_LEN-1] = '\0';
break;
case 'u':
dev_type = S_IFCHR;
/* get scsi parent device */
- dev_scsi = sysfs_device_get_parent(dev);
+ dev_scsi = sysfs_device_get_parent_with_subsystem(dev, "scsi");
if (dev_scsi == NULL) {
err("unable to access parent device of '%s'", devpath);
return 1;
}
- /* allow only scsi devices */
- if (strcmp(dev_scsi->subsystem, "scsi") != 0) {
- info("%s is not a scsi device", devpath);
- return 1;
- }
-
/* mknod a temp dev to communicate with the device */
if (!dev_specified && create_tmp_dev(dev->devpath, maj_min_dev, dev_type)) {
dbg("create_tmp_dev failed\n");
int main(int argc, char **argv)
{
int retval = 0;
- char devpath[MAX_NAME_LEN];
- char maj_min_dev[MAX_NAME_LEN];
+ char devpath[MAX_PATH_LEN];
+ char maj_min_dev[MAX_PATH_LEN];
int newargc;
const char *env;
char **newargv;
if (env) {
hotplug_mode = 1;
sys_specified = 1;
- strncpy(devpath, env, MAX_NAME_LEN);
+ strncpy(devpath, env, MAX_PATH_LEN);
devpath[sizeof(devpath)-1] = '\0';
}