X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=extras%2Fata_id%2Fata_id.c;h=9644a45b19482422404bc0091ac92b4d5f5a8501;hb=fed0ad76941e8021ba1a7d88f7a8ca9d89c99016;hp=d407b0fad91525c3fcea27612b78ee0b456f0f81;hpb=92f4313665bc726baf055f81e2daae48c77123fc;p=elogind.git

diff --git a/extras/ata_id/ata_id.c b/extras/ata_id/ata_id.c
index d407b0fad..9644a45b1 100644
--- a/extras/ata_id/ata_id.c
+++ b/extras/ata_id/ata_id.c
@@ -35,7 +35,8 @@
 #include <linux/types.h>
 #include <linux/hdreg.h>
 
-#include "../../udev/udev.h"
+#include "libudev.h"
+#include "libudev-private.h"
 
 static void log_fn(struct udev *udev, int priority,
 		   const char *file, int line, const char *fn,
@@ -49,6 +50,7 @@ int main(int argc, char *argv[])
 	struct udev *udev;
 	struct hd_driveid id;
 	char model[41];
+	char model_enc[256];
 	char serial[21];
 	char revision[9];
 	const char *node = NULL;
@@ -65,7 +67,7 @@ int main(int argc, char *argv[])
 	if (udev == NULL)
 		goto exit;
 
-	logging_init("ata_id");
+	udev_log_init("ata_id");
 	udev_set_log_fn(udev, log_fn);
 
 	while (1) {
@@ -81,7 +83,7 @@ int main(int argc, char *argv[])
 			break;
 		case 'h':
 			printf("Usage: ata_id [--export] [--help] <device>\n"
-			       "  --export    print values as environemt keys\n"
+			       "  --export    print values as environment keys\n"
 			       "  --help      print this help text\n\n");
 		default:
 			rc = 1;
@@ -114,9 +116,15 @@ int main(int argc, char *argv[])
 		goto close;
 	}
 
+	memcpy (model, id.model, 40);
+	model[40] = '\0';
+	udev_util_encode_string(model, model_enc, sizeof(model_enc));
 	udev_util_replace_whitespace((char *) id.model, model, 40);
+	udev_util_replace_chars(model, NULL);
 	udev_util_replace_whitespace((char *) id.serial_no, serial, 20);
+	udev_util_replace_chars(serial, NULL);
 	udev_util_replace_whitespace((char *) id.fw_rev, revision, 8);
+	udev_util_replace_chars(revision, NULL);
 
 	if (export) {
 		if ((id.config >> 8) & 0x80) {
@@ -141,10 +149,12 @@ int main(int argc, char *argv[])
 		} else {
 			printf("ID_TYPE=disk\n");
 		}
+		printf("ID_BUS=ata\n");
 		printf("ID_MODEL=%s\n", model);
-		printf("ID_SERIAL=%s\n", serial);
+		printf("ID_MODEL_ENC=%s\n", model_enc);
 		printf("ID_REVISION=%s\n", revision);
-		printf("ID_BUS=ata\n");
+		printf("ID_SERIAL=%s_%s\n", model, serial);
+		printf("ID_SERIAL_SHORT=%s\n", serial);
 	} else {
 		if (serial[0] != '\0')
 			printf("%s_%s\n", model, serial);
@@ -156,6 +166,6 @@ close:
 	close(fd);
 exit:
 	udev_unref(udev);
-	logging_close();
+	udev_log_close();
 	return rc;
 }