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=125c3f3dd7d7209833fe8bfbacd75d478705f894;hp=9df0fdb10763107a78d38a742fc1ad6aeec600ce;hb=cf8ec631a23eae532541bfeeccce20f0d978404d;hpb=5f84d7264d752c9eff91e80070fa199286c25b12

diff --git a/extras/ata_id/ata_id.c b/extras/ata_id/ata_id.c
index 9df0fdb10..125c3f3dd 100644
--- a/extras/ata_id/ata_id.c
+++ b/extras/ata_id/ata_id.c
@@ -3,19 +3,9 @@
  *
  * Copyright (C) 2005 Kay Sievers <kay.sievers@vrfy.org>
  *
- *	This library is free software; you can redistribute it and/or
- *	modify it under the terms of the GNU Lesser General Public
- *	License as published by the Free Software Foundation; either
- *	version 2.1 of the License, or (at your option) any later version.
- *
- *	This library is distributed in the hope that it will be useful,
- *	but WITHOUT ANY WARRANTY; without even the implied warranty of
- *	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- *	Lesser General Public License for more details.
- *
- *	You should have received a copy of the GNU Lesser General Public
- *	License along with this library; if not, write to the Free Software
- *	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *	This program is free software; you can redistribute it and/or modify it
+ *	under the terms of the GNU General Public License as published by the
+ *	Free Software Foundation version 2 of the License.
  */
 
 #ifndef _GNU_SOURCE
@@ -27,15 +17,16 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <ctype.h>
+#include <string.h>
 #include <errno.h>
+#include <getopt.h>
 #include <sys/ioctl.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <linux/types.h>
 #include <linux/hdreg.h>
 
-#include "../../logging.h"
-#include "../../udev_utils.h"
+#include "../../udev/udev.h"
 
 #ifdef USE_LOG
 void log_message(int priority, const char *format, ...)
@@ -62,14 +53,13 @@ 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 */
@@ -102,46 +92,66 @@ int main(int argc, char *argv[])
 	char serial[21];
 	char revision[9];
 	const char *node = NULL;
-	int i;
 	int export = 0;
 	int fd;
 	int rc = 0;
+	static const struct option options[] = {
+		{ "export", 0, NULL, 'x' },
+		{ "help", 0, NULL, 'h' },
+		{}
+	};
 
 	logging_init("ata_id");
 
-	for (i = 1 ; i < argc; i++) {
-		char *arg = argv[i];
+	while (1) {
+		int option;
 
-		if (strcmp(arg, "--export") == 0) {
+		option = getopt_long(argc, argv, "xh", options, NULL);
+		if (option == -1)
+			break;
+
+		switch (option) {
+		case 'x':
 			export = 1;
-		} else
-			node = arg;
+			break;
+		case 'h':
+			printf("Usage: ata_id [--export] [--help] <device>\n"
+			       "  --export    print values as environemt keys\n"
+			       "  --help      print this help text\n\n");
+		default:
+			rc = 1;
+			goto exit;
+		}
 	}
-	if (!node) {
-		err("no node specified");
+
+	node = argv[optind];
+	if (node == NULL) {
+		err("no node specified\n");
 		rc = 1;
 		goto exit;
 	}
 
-	fd = open(node, O_RDONLY);
-	if (fd < 0)
-		if (errno == ENOMEDIUM)
-			fd = open(node, O_RDONLY|O_NONBLOCK);
+	fd = open(node, O_RDONLY|O_NONBLOCK);
 	if (fd < 0) {
-		err("unable to open '%s'", node);
+		err("unable to open '%s'\n", node);
 		rc = 1;
 		goto exit;
 	}
 
 	if (ioctl(fd, HDIO_GET_IDENTITY, &id)) {
-		err("HDIO_GET_IDENTITY failed for '%s'", node);
-		rc = 3;
+		if (errno == ENOTTY) {
+			info("HDIO_GET_IDENTITY unsupported for '%s'\n", node);
+			rc = 2;
+		} else {
+			err("HDIO_GET_IDENTITY failed for '%s'\n", node);
+			rc = 3;
+		}
 		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) {
@@ -169,6 +179,7 @@ int main(int argc, char *argv[])
 		printf("ID_MODEL=%s\n", model);
 		printf("ID_SERIAL=%s\n", serial);
 		printf("ID_REVISION=%s\n", revision);
+		printf("ID_BUS=ata\n");
 	} else {
 		if (serial[0] != '\0')
 			printf("%s_%s\n", model, serial);