X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=extras%2Fata_id%2Fata_id.c;h=9579db310593b5608493efd003808800f7265d8e;hp=e26cb6bd2dffb9b3879e404c88334e479a2b650a;hb=1ac216b198e559163b1c81eca2f1c9a635d8e326;hpb=670e470543e02937979e1c879d97f474d5b6fbd1

diff --git a/extras/ata_id/ata_id.c b/extras/ata_id/ata_id.c
index e26cb6bd2..9579db310 100644
--- a/extras/ata_id/ata_id.c
+++ b/extras/ata_id/ata_id.c
@@ -62,29 +62,34 @@ void log_message(int priority, const char *format, ...)
 }
 #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++] = '_';
-		default:
-			to[j++] = from[i];
 		}
-		i++;
+		/* skip chars */
+		if (from[i] == '/') {
+			i++;
+			continue;
+		}
+		to[j++] = from[i++];
 	}
 	to[j] = '\0';
 }
@@ -101,6 +106,8 @@ int main(int argc, char *argv[])
 	int fd;
 	int rc = 0;
 
+	logging_init("ata_id");
+
 	for (i = 1 ; i < argc; i++) {
 		char *arg = argv[i];
 
@@ -131,16 +138,43 @@ int main(int argc, char *argv[])
 		goto close;
 	}
 
-	set_str(model, id.model, 40);
-	set_str(serial, id.serial_no, 20);
-	set_str(revision, id.fw_rev, 8);
+	set_str(model, (char *) id.model, 40);
+	set_str(serial, (char *) id.serial_no, 20);
+	set_str(revision, (char *) id.fw_rev, 8);
 
 	if (export) {
+		if ((id.config >> 8) & 0x80) {
+			/* This is an ATAPI device */
+			switch ((id.config >> 8) & 0x1f) {
+			case 0:
+				printf("ID_TYPE=cd\n");
+				break;
+			case 1:
+				printf("ID_TYPE=tape\n");
+				break;
+			case 5:
+				printf("ID_TYPE=cd\n");
+				break;
+			case 7:
+				printf("ID_TYPE=optical\n");
+				break;
+			default:
+				printf("ID_TYPE=generic\n");
+				break;
+			}
+		} else {
+			printf("ID_TYPE=disk\n");
+		}
 		printf("ID_MODEL=%s\n", model);
 		printf("ID_SERIAL=%s\n", serial);
 		printf("ID_REVISION=%s\n", revision);
-	} else
-		printf("%s_%s\n", model, serial);
+		printf("ID_BUS=ata\n");
+	} else {
+		if (serial[0] != '\0')
+			printf("%s_%s\n", model, serial);
+		else
+			printf("%s\n", model);
+	}
 
 close:
 	close(fd);