summaryrefslogtreecommitdiff
path: root/extras/ata_id
diff options
context:
space:
mode:
authorKay Sievers <kay.sievers@vrfy.org>2008-09-06 15:45:31 +0200
committerKay Sievers <kay.sievers@vrfy.org>2008-09-06 15:45:31 +0200
commit7d563a17f3967890331daf08d43f2f005418139b (patch)
tree88b0c35d258a5b51fcadc1c0fc96ff80dfcaeacf /extras/ata_id
parentcf8ec631a23eae532541bfeeccce20f0d978404d (diff)
use libudev code, unify logging, pass udev context around everywhere
Diffstat (limited to 'extras/ata_id')
-rw-r--r--extras/ata_id/Makefile.am6
-rw-r--r--extras/ata_id/ata_id.c41
2 files changed, 20 insertions, 27 deletions
diff --git a/extras/ata_id/Makefile.am b/extras/ata_id/Makefile.am
index 81332dd3f6..7e7fd2b7ab 100644
--- a/extras/ata_id/Makefile.am
+++ b/extras/ata_id/Makefile.am
@@ -4,10 +4,14 @@ udevhome_PROGRAMS = \
AM_CPPFLAGS = \
-DSYSCONFDIR=\""$(sysconfdir)"\" \
- -DUDEV_PREFIX=\""$(udev_prefix)"\"
+ -DUDEV_PREFIX=\""$(udev_prefix)"\" \
+ -D_LIBUDEV_COMPILATION
ata_id_SOURCES = \
ata_id.c \
+ ../../udev/lib/libudev.h \
+ ../../udev/lib/libudev.c \
+ ../../udev/udev_sysfs.c \
../../udev/udev_sysdeps.c \
../../udev/udev_utils.c \
../../udev/udev_utils_string.c
diff --git a/extras/ata_id/ata_id.c b/extras/ata_id/ata_id.c
index 125c3f3dd7..43d9516a19 100644
--- a/extras/ata_id/ata_id.c
+++ b/extras/ata_id/ata_id.c
@@ -1,7 +1,7 @@
/*
* 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
@@ -28,30 +28,12 @@
#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)
{
@@ -87,6 +69,7 @@ static void set_str(char *to, const char *from, size_t count)
int main(int argc, char *argv[])
{
+ struct udev *udev;
struct hd_driveid id;
char model[41];
char serial[21];
@@ -101,7 +84,12 @@ int main(int argc, char *argv[])
{}
};
+ udev = udev_new();
+ if (udev == NULL)
+ goto exit;
+
logging_init("ata_id");
+ udev_set_log_fn(udev, log_fn);
while (1) {
int option;
@@ -126,24 +114,24 @@ 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;
@@ -190,6 +178,7 @@ int main(int argc, char *argv[])
close:
close(fd);
exit:
+ udev_unref(udev);
logging_close();
return rc;
}