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=6f2e28baa308a595770f467f816b26a3a7d63390;hp=125c3f3dd7d7209833fe8bfbacd75d478705f894;hb=fdcd1f4666a4cceb0de7935a72567f30f1905c08;hpb=01618658fd82dbc5e6315b639f00e87c6fee3c54

diff --git a/extras/ata_id/ata_id.c b/extras/ata_id/ata_id.c
index 125c3f3dd..6f2e28baa 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
@@ -28,65 +37,16 @@
 
 #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];
@@ -96,12 +56,17 @@ int main(int argc, char *argv[])
 	int fd;
 	int rc = 0;
 	static const struct option options[] = {
-		{ "export", 0, NULL, 'x' },
-		{ "help", 0, NULL, 'h' },
+		{ "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);
 
 	while (1) {
 		int option;
@@ -116,7 +81,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;
@@ -126,32 +91,35 @@ int main(int argc, char *argv[])
 
 	node = argv[optind];
 	if (node == NULL) {
-		err("no node specified\n");
+		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'\n", node);
+		err(udev, "unable to open '%s'\n", node);
 		rc = 1;
 		goto exit;
 	}
 
 	if (ioctl(fd, HDIO_GET_IDENTITY, &id)) {
 		if (errno == ENOTTY) {
-			info("HDIO_GET_IDENTITY unsupported for '%s'\n", node);
+			info(udev, "HDIO_GET_IDENTITY unsupported for '%s'\n", node);
 			rc = 2;
 		} else {
-			err("HDIO_GET_IDENTITY failed for '%s'\n", node);
+			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) {
@@ -190,6 +158,7 @@ int main(int argc, char *argv[])
 close:
 	close(fd);
 exit:
+	udev_unref(udev);
 	logging_close();
 	return rc;
 }