X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=extras%2Fscsi_id%2Fscsi_id.c;h=d692a86799db76ef2f2ed9bb64ced6267930013f;hp=e9818a635a9660f5f7e988d5f382985f35c19a32;hb=a4354f9385fa6854360729678491da64be996f03;hpb=9eaa50d0e7d7ec15f89ecd667ddbb2935cf78593

diff --git a/extras/scsi_id/scsi_id.c b/extras/scsi_id/scsi_id.c
index e9818a635..d692a8679 100644
--- a/extras/scsi_id/scsi_id.c
+++ b/extras/scsi_id/scsi_id.c
@@ -14,6 +14,8 @@
  *	Free Software Foundation version 2 of the License.
  */
 
+#include "config.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -27,25 +29,17 @@
 #include <getopt.h>
 #include <sys/stat.h>
 
-#include "../../udev.h"
+#include "../../udev/udev.h"
 #include "scsi_id.h"
-#include "scsi_id_version.h"
-
-/* temporary names for mknod  */
-#define TMP_DIR		"/dev"
-#define TMP_PREFIX	"tmp-scsi"
 
 static const struct option options[] = {
 	{ "device", 1, NULL, 'd' },
 	{ "config", 1, NULL, 'f' },
 	{ "page", 1, NULL, 'p' },
-	{ "devpath", 1, NULL, 's' },
-	{ "fallback-to-sysfs", 0, NULL, 'a' },
 	{ "blacklisted", 0, NULL, 'b' },
 	{ "whitelisted", 0, NULL, 'g' },
-	{ "prefix-bus-id", 0, NULL, 'i' },
 	{ "replace-whitespace", 0, NULL, 'u' },
-	{ "ignore-sysfs", 0, NULL, 'n' },
+	{ "sg-version", 1, NULL, 's' },
 	{ "verbose", 0, NULL, 'v' },
 	{ "version", 0, NULL, 'V' },
 	{ "export", 0, NULL, 'x' },
@@ -53,51 +47,29 @@ static const struct option options[] = {
 	{}
 };
 
-static const char short_options[] = "abd:f:ghinp:s:uvVx";
+static const char short_options[] = "d:f:ghip:uvVx";
 static const char dev_short_options[] = "bgp:";
 
 static int all_good;
-static int always_info;
 static int dev_specified;
-static int sys_specified;
-static char config_file[MAX_PATH_LEN] = SCSI_ID_CONFIG_FILE;
-static int display_bus_id;
+static char config_file[MAX_PATH_LEN] = SYSCONFDIR "/scsi_id.config";
 static enum page_code default_page_code;
+static int sg_version = 4;
 static int use_stderr;
 static int debug;
-static int hotplug_mode;
 static int reformat_serial;
-static int ignore_sysfs;
 static int export;
 static char vendor_str[64];
 static char model_str[64];
 static char revision_str[16];
 static char type_str[16];
 
-#ifdef USE_LOG
-void log_message(int priority, const char *format, ...)
+static void log_fn(struct udev *udev, int priority,
+		   const char *file, int line, const char *fn,
+		   const char *format, va_list args)
 {
-	va_list args;
-	static int udev_log = -1;
-
-	if (udev_log == -1) {
-		const char *value;
-
-		value = getenv("UDEV_LOG");
-		if (value)
-			udev_log = log_priority(value);
-		else
-			udev_log = LOG_ERR;
-	}
-
-	if (priority > udev_log)
-		return;
-
-	va_start(args, format);
 	vsyslog(priority, format, args);
-	va_end(args);
 }
-#endif
 
 static void set_str(char *to, const char *from, size_t count)
 {
@@ -169,35 +141,6 @@ static void set_type(char *to, const char *from, size_t len)
 	to[len-1] = '\0';
 }
 
-static int create_tmp_dev(const char *devpath, char *tmpdev, int dev_type)
-{
-	unsigned int maj, min;
-	const char *attr;
-
-	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;
-	}
-
-	dbg("dev value %s", attr);
-	if (sscanf(attr, "%u:%u", &maj, &min) != 2) {
-		err("%s: invalid dev major/minor", devpath);
-		return -1;
-	}
-
-	snprintf(tmpdev, MAX_PATH_LEN, "%s/%s-maj%d-min%d-%u",
-		 TMP_DIR, TMP_PREFIX, maj, min, getpid());
-
-	dbg("tmpdev '%s'", tmpdev);
-	if (mknod(tmpdev, 0600 | dev_type, makedev(maj, min))) {
-		err("mknod failed: %s", strerror(errno));
-		return -1;
-	}
-	return 0;
-}
-
 /*
  * get_value:
  *
@@ -254,7 +197,8 @@ static int argc_count(char *opts)
  *
  * vendor and model can end in '\n'.
  */
-static int get_file_options(const char *vendor, const char *model,
+static int get_file_options(struct udev *udev,
+			    const char *vendor, const char *model,
 			    int *argc, char ***newargv)
 {
 	char *buffer;
@@ -266,14 +210,14 @@ static int get_file_options(const char *vendor, const char *model,
 	int c;
 	int retval = 0;
 
-	dbg("vendor='%s'; model='%s'\n", vendor, model);
+	dbg(udev, "vendor='%s'; model='%s'\n", vendor, model);
 	fd = fopen(config_file, "r");
 	if (fd == NULL) {
-		dbg("can't open %s\n", config_file);
+		dbg(udev, "can't open %s\n", config_file);
 		if (errno == ENOENT) {
 			return 1;
 		} else {
-			err("can't open %s: %s", config_file, strerror(errno));
+			err(udev, "can't open %s: %s\n", config_file, strerror(errno));
 			return -1;
 		}
 	}
@@ -285,7 +229,7 @@ static int get_file_options(const char *vendor, const char *model,
 	 */
 	buffer = malloc(MAX_BUFFER_LEN);
 	if (!buffer) {
-		err("Can't allocate memory.");
+		err(udev, "can't allocate memory\n");
 		return -1;
 	}
 
@@ -299,7 +243,7 @@ static int get_file_options(const char *vendor, const char *model,
 			break;
 		lineno++;
 		if (buf[strlen(buffer) - 1] != '\n') {
-			info("Config file line %d too long.\n", lineno);
+			err(udev, "Config file line %d too long\n", lineno);
 			break;
 		}
 
@@ -344,14 +288,14 @@ static int get_file_options(const char *vendor, const char *model,
 			}
 			options_in = str1;
 		}
-		dbg("config file line %d:"
+		dbg("config file line %d:\n"
 			" 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)) {
-			info("Error parsing config file line %d '%s'", lineno, buffer);
+			err(udev, "Error parsing config file line %d '%s'\n", lineno, buffer);
 			retval = -1;
 			break;
 		}
@@ -389,7 +333,7 @@ static int get_file_options(const char *vendor, const char *model,
 			c = argc_count(buffer) + 2;
 			*newargv = calloc(c, sizeof(**newargv));
 			if (!*newargv) {
-				err("Can't allocate memory.");
+				err(udev, "can't allocate memory\n");
 				retval = -1;
 			} else {
 				*argc = c;
@@ -414,8 +358,9 @@ static int get_file_options(const char *vendor, const char *model,
 	return retval;
 }
 
-static int set_options(int argc, char **argv, const char *short_opts,
-		       char *target, char *maj_min_dev)
+static int set_options(struct udev *udev,
+		       int argc, char **argv, const char *short_opts,
+		       char *maj_min_dev)
 {
 	int option;
 
@@ -431,14 +376,11 @@ static int set_options(int argc, char **argv, const char *short_opts,
 			break;
 
 		if (optarg)
-			dbg("option '%c' arg '%s'\n", option, optarg);
+			dbg(udev, "option '%c' arg '%s'\n", option, optarg);
 		else
-			dbg("option '%c'\n", option);
+			dbg(udev, "option '%c'\n", option);
 
 		switch (option) {
-		case 'a':
-			always_info = 1;
-			break;
 		case 'b':
 			all_good = 0;
 			break;
@@ -464,26 +406,19 @@ static int set_options(int argc, char **argv, const char *short_opts,
 
 		case 'h':
 			printf("Usage: scsi_id OPTIONS <device>\n"
-			       "  --device               device node for SG_IO commands\n"
-			       "  --devpath              sysfs devpath\n"
-			       "  --config               location of config file\n"
-			       "  --page                 SCSI page (0x80, 0x83, pre-spc3-83)\n"
-			       "  --fallback-to-sysfs    print sysfs values if inquiry fails\n"
-			       "  --ignore-sysfs         ignore sysfs entries\n"
-			       "  --blacklisted          threat device as blacklisted\n"
-			       "  --whitelisted          threat device as whitelisted\n"
-			       "  --prefix-bus-id        prefix SCSI bus id\n"
-			       "  --replace-whitespace   replace all whitespaces by underscores\n"
-			       "  --verbose              verbose logging\n"
-			       "  --version              print version\n"
-			       "  --export               print values as environemt keys\n"
-			       "  --help                 print this help text\n\n");
+			       "  --device=                     device node for SG_IO commands\n"
+			       "  --config=                     location of config file\n"
+			       "  --page=0x80|0x83|pre-spc3-83  SCSI page (0x80, 0x83, pre-spc3-83)\n"
+			       "  --sg-version=3|4              use SGv3 or SGv4\n"
+			       "  --blacklisted                 threat device as blacklisted\n"
+			       "  --whitelisted                 threat device as whitelisted\n"
+			       "  --replace-whitespace          replace all whitespaces by underscores\n"
+			       "  --verbose                     verbose logging\n"
+			       "  --version                     print version\n"
+			       "  --export                      print values as environment keys\n"
+			       "  --help                        print this help text\n\n");
 			exit(0);
 
-		case 'i':
-			display_bus_id = 1;
-			break;
-
 		case 'p':
 			if (strcmp(optarg, "0x80") == 0) {
 				default_page_code = PAGE_80;
@@ -492,19 +427,17 @@ static int set_options(int argc, char **argv, const char *short_opts,
 			} else if (strcmp(optarg, "pre-spc3-83") == 0) {
 				default_page_code = PAGE_83_PRE_SPC3; 
 			} else {
-				info("Unknown page code '%s'", optarg);
+				err(udev, "Unknown page code '%s'\n", optarg);
 				return -1;
 			}
 			break;
 
-		case 'n':
-			ignore_sysfs = 1;
-			break;
-
 		case 's':
-			sys_specified = 1;
-			strncpy(target, optarg, MAX_PATH_LEN);
-			target[MAX_PATH_LEN-1] = '\0';
+			sg_version = atoi(optarg);
+			if (sg_version < 3 || sg_version > 4) {
+				err(udev, "Unknown SG version '%s'\n", optarg);
+				return -1;
+			}
 			break;
 
 		case 'u':
@@ -520,7 +453,7 @@ static int set_options(int argc, char **argv, const char *short_opts,
 			break;
 
 		case 'V':
-			printf("%s\n", SCSI_ID_VERSION);
+			printf("%s\n", VERSION);
 			exit(0);
 			break;
 
@@ -528,10 +461,16 @@ static int set_options(int argc, char **argv, const char *short_opts,
 			exit(1);
 		}
 	}
+	if (optind < argc && !dev_specified) {
+		dev_specified = 1;
+		strncpy(maj_min_dev, argv[optind], MAX_PATH_LEN);
+		maj_min_dev[MAX_PATH_LEN-1] = '\0';
+	}
 	return 0;
 }
 
-static int per_dev_options(struct sysfs_device *dev_scsi, int *good_bad, int *page_code)
+static int per_dev_options(struct udev *udev,
+			   struct scsi_id_device *dev_scsi, int *good_bad, int *page_code)
 {
 	int retval;
 	int newargc;
@@ -541,7 +480,7 @@ static int per_dev_options(struct sysfs_device *dev_scsi, int *good_bad, int *pa
 	*good_bad = all_good;
 	*page_code = default_page_code;
 
-	retval = get_file_options(vendor_str, model_str, &newargc, &newargv);
+	retval = get_file_options(udev, vendor_str, model_str, &newargc, &newargv);
 
 	optind = 1; /* reset this global extern */
 	while (retval == 0) {
@@ -550,9 +489,9 @@ static int per_dev_options(struct sysfs_device *dev_scsi, int *good_bad, int *pa
 			break;
 
 		if (optarg)
-			dbg("option '%c' arg '%s'\n", option, optarg);
+			dbg(udev, "option '%c' arg '%s'\n", option, optarg);
 		else
-			dbg("option '%c'\n", option);
+			dbg(udev, "option '%c'\n", option);
 
 		switch (option) {
 		case 'b':
@@ -571,13 +510,13 @@ static int per_dev_options(struct sysfs_device *dev_scsi, int *good_bad, int *pa
 			} else if (strcmp(optarg, "pre-spc3-83") == 0) {
 				*page_code = PAGE_83_PRE_SPC3; 
 			} else {
-				info("Unknown page code '%s'", optarg);
+				err(udev, "Unknown page code '%s'\n", optarg);
 				retval = -1;
 			}
 			break;
 
 		default:
-			info("Unknown or bad option '%c' (0x%x)", option, option);
+			err(udev, "Unknown or bad option '%c' (0x%x)\n", option, option);
 			retval = -1;
 			break;
 		}
@@ -590,54 +529,20 @@ static int per_dev_options(struct sysfs_device *dev_scsi, int *good_bad, int *pa
 	return retval;
 }
 
-static int set_sysfs_values(struct sysfs_device *dev_scsi)
-{
-	const char *vendor, *model, *type;
-
-	vendor = sysfs_attr_get_value(dev_scsi->devpath, "vendor");
-	if (!vendor) {
-		info("%s: cannot get vendor attribute", dev_scsi->devpath);
-		return -1;
-	}
-	set_str(vendor_str, vendor, sizeof(vendor_str)-1);
-
-	model = sysfs_attr_get_value(dev_scsi->devpath, "model");
-	if (!model) {
-		info("%s: cannot get model attribute\n", dev_scsi->devpath);
-		return -1;
-	}
-	set_str(model_str, model, sizeof(model_str)-1);
-
-	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);
-
-	return 0;
-}
-
-static int set_inq_values(struct sysfs_device *dev_scsi, const char *path)
+static int set_inq_values(struct udev *udev, struct scsi_id_device *dev_scsi, const char *path)
 {
 	int retval;
-	char vendor[8], model[16], type[4], rev[4];
 
-	retval = scsi_std_inquiry(dev_scsi, path, vendor, model, rev, type);
+	dev_scsi->use_sg = sg_version;
+
+	retval = scsi_std_inquiry(udev, dev_scsi, path);
 	if (retval)
-	    return retval;
+		return retval;
 
-	set_str(vendor_str, vendor, 8);
-	set_str(model_str, model, 16);
-	set_type(type_str, type, sizeof(type_str) - 1);
-	set_str(revision_str, rev, sizeof(revision_str) -1);
+	set_str(vendor_str, dev_scsi->vendor, sizeof(vendor_str));
+	set_str(model_str, dev_scsi->model, sizeof(model_str));
+	set_type(type_str, dev_scsi->type, sizeof(type_str));
+	set_str(revision_str, dev_scsi->revision, sizeof(revision_str));
 
 	return 0;
 }
@@ -674,60 +579,26 @@ static void format_serial(char *serial)
  * 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 *devpath, char *maj_min_dev)
+static int scsi_id(struct udev *udev, char *maj_min_dev)
 {
 	int retval;
-	int dev_type = 0;
-	struct sysfs_device *dev;
-	struct sysfs_device *dev_scsi = NULL;
+	struct scsi_id_device dev_scsi;
 	int good_dev;
 	int page_code;
-	char serial[MAX_SERIAL_LEN];
-	char serial_short[MAX_SERIAL_LEN];
-	const char *bus_str = NULL;
+	char serial_short[MAX_SERIAL_LEN] = "";
 
-	dbg("devpath %s\n", devpath);
-
-	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;
-
-	/* 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;
-	}
-
-	if (!ignore_sysfs) {
-		/* 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;
-		}
-		set_sysfs_values(dev_scsi);
-		bus_str = "scsi";
-	} else {
-		dev_scsi = dev;
-		set_inq_values(dev_scsi, maj_min_dev);
-	}
+	set_inq_values(udev, &dev_scsi, maj_min_dev);
 
 	/* 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);
+	retval = per_dev_options(udev, &dev_scsi, &good_dev, &page_code);
+	dbg("per dev options: good %d; page code 0x%x\n", good_dev, page_code);
 
 	if (!good_dev) {
 		retval = 1;
-	} else if (scsi_get_serial(dev_scsi, maj_min_dev, page_code,
-				   serial, serial_short, MAX_SERIAL_LEN)) {
-		retval = always_info?0:1;
+	} else if (scsi_get_serial(udev,
+				   &dev_scsi, maj_min_dev, page_code,
+				   serial_short, MAX_SERIAL_LEN)) {
+		retval = 1;
 	} else {
 		retval = 0;
 	}
@@ -738,71 +609,49 @@ static int scsi_id(const char *devpath, char *maj_min_dev)
 			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));
+			set_str(serial_str, dev_scsi.serial, sizeof(serial_str));
 			printf("ID_SERIAL=%s\n", serial_str);
 			set_str(serial_str, serial_short, sizeof(serial_str));
 			printf("ID_SERIAL_SHORT=%s\n", serial_str);
 			printf("ID_TYPE=%s\n", type_str);
-			if (bus_str != NULL)
-				printf("ID_BUS=%s\n", bus_str);
 		} else {
 			if (reformat_serial)
-				format_serial(serial);
-			if (display_bus_id)
-				printf("%s: ", dev_scsi->kernel);
-			printf("%s\n", serial);
+				format_serial(dev_scsi.serial);
+			printf("%s\n", dev_scsi.serial);
 		}
-		dbg("%s\n", serial);
+		dbg("%s\n", dev_scsi.serial);
 		retval = 0;
 	}
 
-	if (!dev_specified)
-		unlink(maj_min_dev);
-
 	return retval;
 }
 
 int main(int argc, char **argv)
 {
+	struct udev *udev;
 	int retval = 0;
-	char devpath[MAX_PATH_LEN];
 	char maj_min_dev[MAX_PATH_LEN];
 	int newargc;
-	const char *env;
 	char **newargv;
 
+	udev = udev_new();
+	if (udev == NULL)
+		goto exit;
+
 	logging_init("scsi_id");
-	sysfs_init();
-	dbg("argc is %d\n", argc);
-
-	/* 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");
-
-	env = getenv("DEVPATH");
-	if (env) {
-		hotplug_mode = 1;
-		sys_specified = 1;
-		strncpy(devpath, env, MAX_PATH_LEN);
-		devpath[sizeof(devpath)-1] = '\0';
-	}
+	udev_set_log_fn(udev, log_fn);
 
 	/*
 	 * Get config file options.
 	 */
 	newargv = NULL;
-	retval = get_file_options(NULL, NULL, &newargc, &newargv);
+	retval = get_file_options(udev, NULL, NULL, &newargc, &newargv);
 	if (retval < 0) {
 		retval = 1;
 		goto exit;
 	}
 	if (newargv && (retval == 0)) {
-		if (set_options(newargc, newargv, short_options, devpath,
-				maj_min_dev) < 0) {
+		if (set_options(udev, newargc, newargv, short_options, maj_min_dev) < 0) {
 			retval = 2;
 			goto exit;
 		}
@@ -810,22 +659,21 @@ int main(int argc, char **argv)
 	}
 
 	/*
-	 * Get command line options (overriding any config file or DEVPATH
-	 * settings).
+	 * Get command line options (overriding any config file settings).
 	 */
-	if (set_options(argc, argv, short_options, devpath, maj_min_dev) < 0)
+	if (set_options(udev, argc, argv, short_options, maj_min_dev) < 0)
 		exit(1);
 
-	if (!sys_specified) {
-		info("-s must be specified\n");
+	if (!dev_specified) {
+		err(udev, "no device specified\n");
 		retval = 1;
 		goto exit;
 	}
 
-	retval = scsi_id(devpath, maj_min_dev);
+	retval = scsi_id(udev, maj_min_dev);
 
 exit:
-	sysfs_cleanup();
+	udev_unref(udev);
 	logging_close();
 	return retval;
 }