chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
scsi_id, usb_id: request device parent by subsystem
[elogind.git]
/
extras
/
scsi_id
/
scsi_id.c
diff --git
a/extras/scsi_id/scsi_id.c
b/extras/scsi_id/scsi_id.c
index 3a4a374d3e20e807531ac69cb20d8b690e0a3f6d..6458f2b7ac1ce553c89f243f431b108ed2baeaa0 100644
(file)
--- a/
extras/scsi_id/scsi_id.c
+++ b/
extras/scsi_id/scsi_id.c
@@
-48,7
+48,7
@@
static int all_good;
static int always_info;
static int dev_specified;
static int sys_specified;
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;
static int display_bus_id;
static enum page_code default_page_code;
static int use_stderr;
@@
-174,7
+174,7
@@
static int create_tmp_dev(const char *devpath, char *tmpdev, int dev_type)
return -1;
}
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);
TMP_DIR, TMP_PREFIX, maj, min, getpid());
dbg("tmpdev '%s'", tmpdev);
@@
-433,7
+433,8
@@
static int set_options(int argc, char **argv, const char *short_opts,
case 'd':
dev_specified = 1;
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 'e':
@@
-441,7
+442,8
@@
static int set_options(int argc, char **argv, const char *short_opts,
break;
case 'f':
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':
break;
case 'g':
@@
-467,8
+469,8
@@
static int set_options(int argc, char **argv, const char *short_opts,
case 's':
sys_specified = 1;
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':
break;
case 'u':
@@
-640,18
+642,12
@@
static int scsi_id(const char *devpath, char *maj_min_dev)
dev_type = S_IFCHR;
/* get scsi parent device */
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;
}
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");
/* 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");
@@
-707,8
+703,8
@@
static int scsi_id(const char *devpath, char *maj_min_dev)
int main(int argc, char **argv)
{
int retval = 0;
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;
int newargc;
const char *env;
char **newargv;
@@
-729,7
+725,7
@@
int main(int argc, char **argv)
if (env) {
hotplug_mode = 1;
sys_specified = 1;
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';
}
devpath[sizeof(devpath)-1] = '\0';
}