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=dae464a4dc8121cb323168f6338f8ef8fc47282f;hp=a97cc284cc515765ba111ccaf67ad993d0c82d7e;hb=62a7b2d5a5dc731984e342ce249e25ffd1b738a6;hpb=9bd72b9b6b2645ea3c36ef0be9a070e8ff67904f

diff --git a/extras/ata_id/ata_id.c b/extras/ata_id/ata_id.c
index a97cc284c..dae464a4d 100644
--- a/extras/ata_id/ata_id.c
+++ b/extras/ata_id/ata_id.c
@@ -1,11 +1,20 @@
 /*
  * ata_id - reads product/serial number from ATA drives
  *
- * Copyright (C) 2005 Kay Sievers <kay.sievers@vrfy.org>
+ * Copyright (C) 2005-2008 Kay Sievers <kay.sievers@vrfy.org>
  *
- *	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.
+ * 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, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef _GNU_SOURCE
@@ -17,117 +26,100 @@
 #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, ...)
+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)
-{
-	size_t i, j, len;
-
-	/* strip trailing whitespace */
-	len = strnlen(from, count);
-	while (len && isspace(from[len-1]))
-		len--;
-
-	/* strip leading whitespace */
-	i = 0;
-	while (isspace(from[i]) && (i < len))
-		i++;
-
-	j = 0;
-	while (i < len) {
-		/* substitute multiple whitespace */
-		if (isspace(from[i])) {
-			while (isspace(from[i]))
-				i++;
-			to[j++] = '_';
-		}
-		/* skip chars */
-		if (from[i] == '/') {
-			i++;
-			continue;
-		}
-		to[j++] = from[i++];
-	}
-	to[j] = '\0';
 }
 
 int main(int argc, char *argv[])
 {
+	struct udev *udev;
 	struct hd_driveid id;
 	char model[41];
 	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", no_argument, NULL, 'x' },
+		{ "help", no_argument, NULL, 'h' },
+		{}
+	};
+
+	udev = udev_new();
+	if (udev == NULL)
+		goto exit;
 
 	logging_init("ata_id");
+	udev_set_log_fn(udev, log_fn);
 
-	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(udev, "no node specified\n");
 		rc = 1;
 		goto exit;
 	}
 
 	fd = open(node, O_RDONLY|O_NONBLOCK);
 	if (fd < 0) {
-		err("unable to open '%s'", node);
+		err(udev, "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(udev, "HDIO_GET_IDENTITY unsupported for '%s'\n", node);
+			rc = 2;
+		} else {
+			err(udev, "HDIO_GET_IDENTITY failed for '%s'\n", node);
+			rc = 3;
+		}
 		goto close;
 	}
 
-	set_str(model, (char *) id.model, 40);
-	set_str(serial, (char *) id.serial_no, 20);
-	set_str(revision, (char *) id.fw_rev, 8);
+	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) {
@@ -166,6 +158,7 @@ int main(int argc, char *argv[])
 close:
 	close(fd);
 exit:
+	udev_unref(udev);
 	logging_close();
 	return rc;
 }