#include <stdarg.h>
#include <ctype.h>
#include <sys/stat.h>
-#include <sysfs/libsysfs.h>
-#include "scsi_id_version.h"
+
+#include "../../udev.h"
#include "scsi_id.h"
+#include "scsi_id_version.h"
-#ifndef SCSI_ID_VERSION
-#warning No version
-#define SCSI_ID_VERSION "unknown"
-#endif
+/* temporary names for mknod */
+#define TMP_DIR "/dev"
+#define TMP_PREFIX "tmp-scsi"
-/*
- * temporary names for mknod.
- */
-#define TMP_DIR "/tmp"
-#define TMP_PREFIX "scsi"
-
-/*
- * XXX Note the 'e' (send output to stderr in all cases), and 'c' (callout)
- * options are not supported, but other code is still left in place for
- * now.
- */
-static const char short_options[] = "bd:f:gip:s:uvVx";
-/*
- * Just duplicate per dev options.
- */
+static const char short_options[] = "abd:f:gip:s:uvVx";
static const char dev_short_options[] = "bgp:";
-char sysfs_mnt_path[SYSFS_PATH_MAX];
-
static int all_good;
-static char *default_callout;
+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 int default_page_code;
+static enum page_code default_page_code;
static int use_stderr;
static int debug;
static int hotplug_mode;
static int export;
static char vendor_str[64];
static char model_str[64];
+static char revision_str[16];
+static char type_str[16];
-void log_message (int level, const char *format, ...)
+#ifdef USE_LOG
+void log_message(int priority, const char *format, ...)
{
- va_list args;
-
- if (!debug && level == LOG_DEBUG)
- return;
+ va_list args;
+ static int udev_log = -1;
- va_start (args, format);
- if (!hotplug_mode || use_stderr) {
- vfprintf(stderr, format, args);
- } else {
- static int logging_init = 0;
- if (!logging_init) {
- openlog ("scsi_id", LOG_PID, LOG_DAEMON);
- logging_init = 1;
- }
+ if (udev_log == -1) {
+ const char *value;
- vsyslog(level, format, args);
+ value = getenv("UDEV_LOG");
+ if (value)
+ udev_log = log_priority(value);
+ else
+ udev_log = LOG_ERR;
}
- va_end (args);
- return;
+
+ if (priority > udev_log)
+ return;
+
+ va_start(args, format);
+ vsyslog(priority, format, args);
+ va_end(args);
}
+#endif
-static void set_str(char *to, const unsigned char *from, int count)
+static void set_str(char *to, const char *from, size_t count)
{
- int i, j;
- int len;
+ size_t i, j, len;
+ /* strip trailing whitespace */
len = strnlen(from, count);
- while (isspace(from[len-1]))
+ while (len && isspace(from[len-1]))
len--;
+ /* strip leading whitespace */
i = 0;
while (isspace(from[i]) && (i < len))
i++;
j = 0;
while (i < len) {
- switch(from[i]) {
- case '/':
- case ' ':
+ /* substitute multiple whitespace */
+ if (isspace(from[i])) {
+ while (isspace(from[i]))
+ i++;
to[j++] = '_';
+ }
+ /* skip chars */
+ if (from[i] == '/') {
+ i++;
+ continue;
+ }
+ to[j++] = from[i++];
+ }
+ to[j] = '\0';
+}
+
+static void set_type(char *to, const char *from, size_t len)
+{
+ int type_num;
+ char *eptr;
+ char *type = "generic";
+
+ type_num = strtoul(from, &eptr, 0);
+ if (eptr != from) {
+ switch (type_num) {
+ case 0:
+ type = "disk";
+ break;
+ case 1:
+ type = "tape";
+ break;
+ case 4:
+ type = "optical";
+ break;
+ case 5:
+ type = "cd";
+ break;
+ case 7:
+ type = "optical";
+ break;
+ case 0xe:
+ type = "disk";
+ break;
+ case 0xf:
+ type = "optical";
break;
default:
- to[j++] = from[i];
+ break;
}
- i++;
}
- to[j] = '\0';
+ strncpy(to, type, len);
+ to[len-1] = '\0';
}
-static int get_major_minor(struct sysfs_class_device *class_dev, int *maj,
- int *min)
+static int create_tmp_dev(const char *devpath, char *tmpdev, int dev_type)
{
- struct sysfs_attribute *dev_attr;
+ unsigned int maj, min;
+ const char *attr;
- dev_attr = sysfs_get_classdev_attr(class_dev, "dev");
- if (!dev_attr) {
- /*
- * XXX This happens a lot, since sg has no dev attr.
- * And now sysfsutils does not set a meaningful errno
- * value. Someday change this back to a LOG_WARNING.
- * And if sysfsutils changes, check for ENOENT and handle
- * it separately.
- */
- log_message(LOG_DEBUG, "%s: could not get dev attribute: %s\n",
- class_dev->name, strerror(errno));
+ dbg("%s", devpath);
+ attr = sysfs_attr_get_value(devpath, "dev");
+ if (attr == NULL) {
+ dbg("%s: could not get dev attribute: %s", devpath, strerror(errno));
return -1;
}
- dprintf("dev value %s", dev_attr->value); /* value has a trailing \n */
- if (sscanf(dev_attr->value, "%u:%u", maj, min) != 2) {
- log_message(LOG_WARNING, "%s: invalid dev major/minor\n",
- class_dev->name);
+ dbg("dev value %s", attr);
+ if (sscanf(attr, "%u:%u", &maj, &min) != 2) {
+ err("%s: invalid dev major/minor", devpath);
return -1;
}
- return 0;
-}
-
-static int create_tmp_dev(struct sysfs_class_device *class_dev, char *tmpdev,
- int dev_type)
-{
- int maj, min;
-
- dprintf("(%s)\n", class_dev->name);
-
- if (get_major_minor(class_dev, &maj, &min))
- 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());
- dprintf("tmpdev '%s'\n", tmpdev);
-
+ dbg("tmpdev '%s'", tmpdev);
if (mknod(tmpdev, 0600 | dev_type, makedev(maj, min))) {
- log_message(LOG_WARNING, "mknod failed: %s\n", strerror(errno));
+ err("mknod failed: %s", strerror(errno));
return -1;
}
return 0;
}
-static int has_sysfs_prefix(const char *path, const char *prefix)
-{
- char match[MAX_NAME_LEN];
-
- strncpy(match, sysfs_mnt_path, MAX_NAME_LEN);
- strncat(match, prefix, MAX_NAME_LEN);
- if (strncmp(path, match, strlen(match)) == 0)
- return 1;
- else
- return 0;
-}
-
/*
* get_value:
*
*
* vendor and model can end in '\n'.
*/
-static int get_file_options(char *vendor, char *model, int *argc,
- char ***newargv)
+static int get_file_options(const char *vendor, const char *model,
+ int *argc, char ***newargv)
{
char *buffer;
FILE *fd;
int c;
int retval = 0;
- dprintf("vendor='%s'; model='%s'\n", vendor, model);
+ dbg("vendor='%s'; model='%s'\n", vendor, model);
fd = fopen(config_file, "r");
if (fd == NULL) {
- dprintf("can't open %s\n", config_file);
+ dbg("can't open %s\n", config_file);
if (errno == ENOENT) {
return 1;
} else {
- log_message(LOG_WARNING, "can't open %s: %s\n",
- config_file, strerror(errno));
+ err("can't open %s: %s", config_file, strerror(errno));
return -1;
}
}
*/
buffer = malloc(MAX_BUFFER_LEN);
if (!buffer) {
- log_message(LOG_WARNING, "Can't allocate memory.\n");
+ err("Can't allocate memory.");
return -1;
}
break;
lineno++;
if (buf[strlen(buffer) - 1] != '\n') {
- log_message(LOG_WARNING,
- "Config file line %d too long.\n", lineno);
+ info("Config file line %d too long.\n", lineno);
break;
}
while (isspace(*buf))
buf++;
+ /* blank or all whitespace line */
if (*buf == '\0')
- /*
- * blank or all whitespace line
- */
continue;
+ /* comment line */
if (*buf == '#')
- /*
- * comment line
- */
continue;
-#ifdef LOTS
- dprintf("lineno %d: '%s'\n", lineno, buf);
-#endif
+ dbg("lineno %d: '%s'\n", lineno, buf);
str1 = strsep(&buf, "=");
if (str1 && strcasecmp(str1, "VENDOR") == 0) {
str1 = get_value(&buf);
}
options_in = str1;
}
- dprintf("config file line %d:"
+ dbg("config file line %d:"
" vendor '%s'; model '%s'; options '%s'\n",
lineno, vendor_in, model_in, options_in);
/*
* Only allow: [vendor=foo[,model=bar]]options=stuff
*/
if (!options_in || (!vendor_in && model_in)) {
- log_message(LOG_WARNING,
- "Error parsing config file line %d '%s'\n",
- lineno, buffer);
+ info("Error parsing config file line %d '%s'", lineno, buffer);
retval = -1;
break;
}
if (vendor == NULL) {
if (vendor_in == NULL) {
- dprintf("matched global option\n");
+ dbg("matched global option\n");
break;
}
} else if ((vendor_in && strncmp(vendor, vendor_in,
* give a partial match (that is FOO
* matches FOOBAR).
*/
- dprintf("matched vendor/model\n");
+ dbg("matched vendor/model\n");
break;
} else {
- dprintf("no match\n");
+ dbg("no match\n");
}
}
c = argc_count(buffer) + 2;
*newargv = calloc(c, sizeof(**newargv));
if (!*newargv) {
- log_message(LOG_WARNING,
- "Can't allocate memory.\n");
+ err("Can't allocate memory.");
retval = -1;
} else {
*argc = c;
(*newargv)[c] = strsep(&buffer, " ");
}
} else {
- /*
- * No matches.
- */
+ /* No matches */
retval = 1;
}
}
*/
optind = 1;
while (1) {
- option = getopt(argc, argv, short_options);
+ option = getopt(argc, argv, short_opts);
if (option == -1)
break;
if (optarg)
- dprintf("option '%c' arg '%s'\n", option, optarg);
+ dbg("option '%c' arg '%s'\n", option, optarg);
else
- dprintf("option '%c'\n", option);
+ dbg("option '%c'\n", option);
switch (option) {
+ case 'a':
+ always_info = 1;
+ break;
case 'b':
all_good = 0;
break;
- case 'c':
- default_callout = optarg;
- break;
-
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 'p':
if (strcmp(optarg, "0x80") == 0) {
- default_page_code = 0x80;
+ default_page_code = PAGE_80;
} else if (strcmp(optarg, "0x83") == 0) {
- default_page_code = 0x83;
+ default_page_code = PAGE_83;
+ } else if (strcmp(optarg, "pre-spc3-83") == 0) {
+ default_page_code = PAGE_83_PRE_SPC3;
} else {
- log_message(LOG_WARNING,
- "Unknown page code '%s'\n", optarg);
+ info("Unknown page code '%s'", optarg);
return -1;
}
break;
case 's':
sys_specified = 1;
- strncpy(target, sysfs_mnt_path, MAX_NAME_LEN);
- strncat(target, optarg, MAX_NAME_LEN);
+ strncpy(target, optarg, MAX_PATH_LEN);
+ target[MAX_PATH_LEN-1] = '\0';
break;
case 'u':
break;
case 'V':
- log_message(LOG_WARNING, "scsi_id version: %s\n",
- SCSI_ID_VERSION);
+ info("scsi_id version: %s\n", SCSI_ID_VERSION);
exit(0);
break;
default:
- log_message(LOG_WARNING,
- "Unknown or bad option '%c' (0x%x)\n",
- option, option);
+ info("Unknown or bad option '%c' (0x%x)", option, option);
return -1;
}
}
return 0;
}
-static int per_dev_options(struct sysfs_device *scsi_dev, int *good_bad,
- int *page_code, char *callout)
+static int per_dev_options(struct sysfs_device *dev_scsi, int *good_bad, int *page_code)
{
int retval;
int newargc;
char **newargv = NULL;
- struct sysfs_attribute *vendor, *model;
+ const char *vendor, *model, *type;
int option;
*good_bad = all_good;
*page_code = default_page_code;
- if (default_callout && (callout != default_callout))
- strncpy(callout, default_callout, MAX_NAME_LEN);
- else
- callout[0] = '\0';
- vendor = sysfs_get_device_attr(scsi_dev, "vendor");
+ vendor = sysfs_attr_get_value(dev_scsi->devpath, "vendor");
if (!vendor) {
- log_message(LOG_WARNING, "%s: cannot get vendor attribute\n",
- scsi_dev->name);
+ info("%s: cannot get vendor attribute", dev_scsi->devpath);
return -1;
}
- set_str(vendor_str, vendor->value, sizeof(vendor_str)-1);
+ set_str(vendor_str, vendor, sizeof(vendor_str)-1);
- model = sysfs_get_device_attr(scsi_dev, "model");
+ model = sysfs_attr_get_value(dev_scsi->devpath, "model");
if (!model) {
- log_message(LOG_WARNING, "%s: cannot get model attribute\n",
- scsi_dev->name);
+ info("%s: cannot get model attribute\n", dev_scsi->devpath);
return -1;
}
- set_str(model_str, model->value, sizeof(model_str)-1);
+ set_str(model_str, model, sizeof(model_str)-1);
- retval = get_file_options(vendor->value, model->value, &newargc,
- &newargv);
+ type = sysfs_attr_get_value(dev_scsi->devpath, "type");
+ if (!type) {
+ info("%s: cannot get type attribute", dev_scsi->devpath);
+ return -1;
+ }
+ set_type(type_str, type, sizeof(type_str));
+
+ type = sysfs_attr_get_value(dev_scsi->devpath, "rev");
+ if (!type) {
+ info("%s: cannot get type attribute\n", dev_scsi->devpath);
+ return -1;
+ }
+ set_str(revision_str, type, sizeof(revision_str)-1);
+
+ retval = get_file_options(vendor, model, &newargc, &newargv);
optind = 1; /* reset this global extern */
while (retval == 0) {
break;
if (optarg)
- dprintf("option '%c' arg '%s'\n", option, optarg);
+ dbg("option '%c' arg '%s'\n", option, optarg);
else
- dprintf("option '%c'\n", option);
+ dbg("option '%c'\n", option);
switch (option) {
case 'b':
*good_bad = 0;
break;
- case 'c':
- strncpy(callout, default_callout, MAX_NAME_LEN);
- break;
-
case 'g':
*good_bad = 1;
break;
case 'p':
if (strcmp(optarg, "0x80") == 0) {
- *page_code = 0x80;
+ *page_code = PAGE_80;
} else if (strcmp(optarg, "0x83") == 0) {
- *page_code = 0x83;
+ *page_code = PAGE_83;
+ } else if (strcmp(optarg, "pre-spc3-83") == 0) {
+ *page_code = PAGE_83_PRE_SPC3;
} else {
- log_message(LOG_WARNING,
- "Unknown page code '%s'\n", optarg);
+ info("Unknown page code '%s'", optarg);
retval = -1;
}
break;
default:
- log_message(LOG_WARNING,
- "Unknown or bad option '%c' (0x%x)\n",
- option, option);
+ info("Unknown or bad option '%c' (0x%x)", option, option);
retval = -1;
break;
}
*/
static void format_serial(char *serial)
{
- char *p = serial;
+ char *p = serial, *q;
+ q = p;
while (*p != '\0') {
- if (isspace(*p))
- *p = '_';
+ if (isspace(*p)) {
+ if (q > serial && q[-1] != '_') {
+ *q = '_';
+ q++;
+ }
+ } else {
+ *q = *p;
+ q++;
+ }
p++;
}
-return;
+ *q = '\0';
}
/*
* memory etc. return 2, and return 1 for expected cases (like broken
* device found) that do not print an id.
*/
-static int scsi_id(const char *target_path, char *maj_min_dev)
+static int scsi_id(const char *devpath, char *maj_min_dev)
{
int retval;
int dev_type = 0;
char *serial, *unaligned_buf;
- struct sysfs_class_device *class_dev; /* of target_path */
- struct sysfs_class_device *class_dev_parent; /* for partitions */
- struct sysfs_device *scsi_dev; /* the scsi_device */
+ struct sysfs_device *dev;
+ struct sysfs_device *dev_scsi;
int good_dev;
int page_code;
- char callout[MAX_NAME_LEN];
- dprintf("target_path %s\n", target_path);
+ dbg("devpath %s\n", devpath);
- /*
- * Ugly: depend on the sysfs path to tell us whether this is a
- * block or char device. This should probably be encoded in the
- * "dev" along with the major/minor.
- */
- if (has_sysfs_prefix(target_path, "/block")) {
- dev_type = S_IFBLK;
- } else if (has_sysfs_prefix(target_path, "/class")) {
- dev_type = S_IFCHR;
- } else {
- if (!hotplug_mode) {
- log_message(LOG_WARNING,
- "Non block or class device '%s'\n",
- target_path);
- return 1;
- } else {
- /*
- * Expected in some cases.
- */
- dprintf("Non block or class device\n");
- return 0;
- }
- }
-
- class_dev = sysfs_open_class_device_path(target_path);
- if (!class_dev) {
- log_message(LOG_WARNING, "open class %s failed: %s\n",
- target_path, strerror(errno));
- return 1;
- }
- class_dev_parent = sysfs_get_classdev_parent(class_dev);
- dprintf("class_dev 0x%p; class_dev_parent 0x%p\n", class_dev,
- class_dev_parent);
- if (class_dev_parent) {
- scsi_dev = sysfs_get_classdev_device(class_dev_parent);
- } else {
- scsi_dev = sysfs_get_classdev_device(class_dev);
- }
-
- /*
- * The close of scsi_dev will close class_dev or class_dev_parent.
- */
-
- /*
- * We assume we are called after the device is completely ready,
- * so we don't have to loop here like udev. (And we are usually
- * called via udev.)
- */
- if (!scsi_dev) {
- /*
- * errno is not set if we can't find the device link, so
- * don't print it out here.
- */
- log_message(LOG_WARNING, "Cannot find sysfs device associated with %s\n",
- target_path);
+ dev = sysfs_device_get(devpath);
+ if (dev == NULL) {
+ err("unable to access '%s'", devpath);
return 1;
}
+ if (strcmp(dev->subsystem, "block") == 0)
+ dev_type = S_IFBLK;
+ else
+ dev_type = S_IFCHR;
- /*
- * Allow only scsi devices.
- *
- * Other block devices can support SG IO, but only ide-cd does, so
- * for now, don't bother with anything else.
- */
- if (strcmp(scsi_dev->bus, "scsi") != 0) {
- if (hotplug_mode)
- /*
- * Expected in some cases.
- */
- dprintf("%s is not a scsi device\n", target_path);
- else
- log_message(LOG_WARNING, "%s is not a scsi device\n",
- target_path);
+ /* get scsi parent device */
+ 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;
}
- /*
- * mknod a temp dev to communicate with the device.
- */
- if (!dev_specified && create_tmp_dev(class_dev, maj_min_dev,
- dev_type)) {
- dprintf("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");
return 1;
}
- /*
- * Get any per device (vendor + model) options from the config
- * file.
- */
- retval = per_dev_options(scsi_dev, &good_dev, &page_code, callout);
- dprintf("per dev options: good %d; page code 0x%x; callout '%s'\n",
- good_dev, page_code, callout);
+ /* get per device (vendor + model) options from the config file */
+ retval = per_dev_options(dev_scsi, &good_dev, &page_code);
+ dbg("per dev options: good %d; page code 0x%x", good_dev, page_code);
#define ALIGN 512
unaligned_buf = malloc(MAX_SERIAL_LEN + ALIGN);
serial = (char*) (((unsigned long) unaligned_buf + (ALIGN - 1))
& ~(ALIGN - 1));
- dprintf("buffer unaligned 0x%p; aligned 0x%p\n", unaligned_buf, serial);
+ dbg("buffer unaligned 0x%p; aligned 0x%p\n", unaligned_buf, serial);
#undef ALIGN
if (!good_dev) {
retval = 1;
- } else if (callout[0] != '\0') {
- /*
- * XXX Disabled for now ('c' is not in any options[]).
- */
- retval = 1;
- } else if (scsi_get_serial(scsi_dev, maj_min_dev, page_code,
+ } else if (scsi_get_serial(dev_scsi, maj_min_dev, page_code,
serial, MAX_SERIAL_LEN)) {
- retval = 1;
+ retval = always_info?0:1;
} else {
retval = 0;
}
static char serial_str[64];
printf("ID_VENDOR=%s\n", vendor_str);
printf("ID_MODEL=%s\n", model_str);
+ printf("ID_REVISION=%s\n", revision_str);
set_str(serial_str, serial, sizeof(serial_str));
printf("ID_SERIAL=%s\n", serial_str);
+ printf("ID_TYPE=%s\n", type_str);
+ printf("ID_BUS=scsi\n");
} else {
if (reformat_serial)
format_serial(serial);
if (display_bus_id)
- printf("%s: ", scsi_dev->name);
+ printf("%s: ", dev_scsi->kernel_name);
printf("%s\n", serial);
}
- dprintf("%s\n", serial);
+ dbg("%s\n", serial);
retval = 0;
}
- sysfs_close_device(scsi_dev);
if (!dev_specified)
unlink(maj_min_dev);
int main(int argc, char **argv)
{
- int retval;
- char *devpath;
- char target_path[MAX_NAME_LEN];
- char maj_min_dev[MAX_NAME_LEN];
+ int retval = 0;
+ char devpath[MAX_PATH_LEN];
+ char maj_min_dev[MAX_PATH_LEN];
int newargc;
+ const char *env;
char **newargv;
- if (getenv("DEBUG"))
- debug++;
+ logging_init("scsi_id");
+ sysfs_init();
+ dbg("argc is %d\n", argc);
- dprintf("argc is %d\n", argc);
- if (sysfs_get_mnt_path(sysfs_mnt_path, MAX_NAME_LEN)) {
- log_message(LOG_WARNING, "sysfs_get_mnt_path failed: %s\n",
- strerror(errno));
- exit(1);
- }
+ /* sysfs path can be overridden for testing */
+ env = getenv("SYSFS_PATH");
+ if (env) {
+ strncpy(sysfs_path, env, sizeof(sysfs_path));
+ sysfs_path[sizeof(sysfs_path)-1] = '\0';
+ } else
+ strcpy(sysfs_path, "/sys");
- devpath = getenv("DEVPATH");
- if (devpath) {
- /*
- * This implies that we were invoked via udev or hotplug.
- */
+ env = getenv("DEVPATH");
+ if (env) {
hotplug_mode = 1;
sys_specified = 1;
- strncpy(target_path, sysfs_mnt_path, MAX_NAME_LEN);
- strncat(target_path, devpath, MAX_NAME_LEN);
+ strncpy(devpath, env, MAX_PATH_LEN);
+ devpath[sizeof(devpath)-1] = '\0';
}
/*
newargv = NULL;
retval = get_file_options(NULL, NULL, &newargc, &newargv);
if (retval < 0) {
- exit(1);
- } else if (newargv && (retval == 0)) {
- if (set_options(newargc, newargv, short_options, target_path,
- maj_min_dev) < 0)
- exit(1);
+ retval = 1;
+ goto exit;
+ }
+ if (newargv && (retval == 0)) {
+ if (set_options(newargc, newargv, short_options, devpath,
+ maj_min_dev) < 0) {
+ retval = 2;
+ goto exit;
+ }
free(newargv);
}
+
/*
* Get command line options (overriding any config file or DEVPATH
* settings).
*/
- if (set_options(argc, argv, short_options, target_path,
- maj_min_dev) < 0)
+ if (set_options(argc, argv, short_options, devpath, maj_min_dev) < 0)
exit(1);
if (!sys_specified) {
- log_message(LOG_WARNING, "-s must be specified\n");
- exit(1);
+ info("-s must be specified\n");
+ retval = 1;
+ goto exit;
}
- retval = scsi_id(target_path, maj_min_dev);
- exit(retval);
+ retval = scsi_id(devpath, maj_min_dev);
+
+exit:
+ sysfs_cleanup();
+ logging_close();
+ return retval;
}
~ianmdlvl / elogind.git / blobdiff