X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=extras%2Fscsi_id%2Fscsi_id.c;h=7fd6066c0174fc484d3b3d76104935f95069d361;hb=11678eff6a40b05d192be65146a66d5e1e8252ec;hp=2ffc95fbfed69605ad8caf15315f6a8b5857b703;hpb=3d94fb8742847afe8396f6dd38b16ff4e836611d;p=elogind.git

diff --git a/extras/scsi_id/scsi_id.c b/extras/scsi_id/scsi_id.c
index 2ffc95fbf..7fd6066c0 100644
--- a/extras/scsi_id/scsi_id.c
+++ b/extras/scsi_id/scsi_id.c
@@ -402,8 +402,7 @@ static int set_options(int argc, char **argv, const char *short_opts,
 	/*
 	 * optind is a global extern used by getopt. Since we can call
 	 * set_options twice (once for command line, and once for config
-	 * file) we have to reset this back to 1. [Note glibc handles
-	 * setting this to 0, but klibc does not.]
+	 * file) we have to reset this back to 1.
 	 */
 	optind = 1;
 	while (1) {
@@ -615,11 +614,12 @@ static int scsi_id(const char *devpath, char *maj_min_dev)
 {
 	int retval;
 	int dev_type = 0;
-	char *serial, *unaligned_buf;
 	struct sysfs_device *dev;
 	struct sysfs_device *dev_scsi;
 	int good_dev;
 	int page_code;
+	char serial[MAX_SERIAL_LEN];
+	char serial_short[MAX_SERIAL_LEN];
 
 	dbg("devpath %s\n", devpath);
 
@@ -651,36 +651,32 @@ static int scsi_id(const char *devpath, char *maj_min_dev)
 	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));
-	dbg("buffer unaligned 0x%p; aligned 0x%p\n", unaligned_buf, serial);
-#undef ALIGN
-
 	if (!good_dev) {
 		retval = 1;
 	} else if (scsi_get_serial(dev_scsi, maj_min_dev, page_code,
-				   serial, MAX_SERIAL_LEN)) {
+				   serial, serial_short, MAX_SERIAL_LEN)) {
 		retval = always_info?0:1;
 	} else {
 		retval = 0;
 	}
 	if (!retval) {
 		if (export) {
-			static char serial_str[64];
+			char serial_str[MAX_SERIAL_LEN];
+
 			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);
+			set_str(serial_str, serial_short, sizeof(serial_str));
+			printf("ID_SERIAL_SHORT=%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: ", dev_scsi->kernel_name);
+				printf("%s: ", dev_scsi->kernel);
 			printf("%s\n", serial);
 		}
 		dbg("%s\n", serial);