summaryrefslogtreecommitdiff
path: root/extras
diff options
context:
space:
mode:
Diffstat (limited to 'extras')
-rw-r--r--extras/ata_id/Makefile.am6
-rw-r--r--extras/ata_id/ata_id.c41
-rw-r--r--extras/cdrom_id/Makefile.am6
-rw-r--r--extras/cdrom_id/cdrom_id.c187
-rw-r--r--extras/edd_id/Makefile.am6
-rw-r--r--extras/edd_id/edd_id.c59
-rw-r--r--extras/floppy/Makefile.am7
-rw-r--r--extras/floppy/create_floppy_devices.c47
-rw-r--r--extras/fstab_import/79-fstab_import.rules2
-rw-r--r--extras/fstab_import/Makefile.am6
-rw-r--r--extras/fstab_import/fstab_import.c91
-rw-r--r--extras/scsi_id/Makefile.am6
-rw-r--r--extras/scsi_id/scsi_id.c96
-rw-r--r--extras/scsi_id/scsi_id.h4
-rw-r--r--extras/scsi_id/scsi_serial.c191
-rw-r--r--extras/usb_id/Makefile.am5
-rw-r--r--extras/usb_id/usb_id.c91
-rw-r--r--extras/volume_id/Makefile.am6
-rw-r--r--extras/volume_id/vol_id.c44
19 files changed, 430 insertions, 471 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;
}
diff --git a/extras/cdrom_id/Makefile.am b/extras/cdrom_id/Makefile.am
index 88de1379cd..dfc98850e0 100644
--- a/extras/cdrom_id/Makefile.am
+++ b/extras/cdrom_id/Makefile.am
@@ -8,10 +8,14 @@ dist_udevrules_DATA = \
AM_CPPFLAGS = \
-DSYSCONFDIR=\""$(sysconfdir)"\" \
- -DUDEV_PREFIX=\""$(udev_prefix)"\"
+ -DUDEV_PREFIX=\""$(udev_prefix)"\" \
+ -D_LIBUDEV_COMPILATION
cdrom_id_SOURCES = \
cdrom_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/cdrom_id/cdrom_id.c b/extras/cdrom_id/cdrom_id.c
index 9e27471863..dbe80ea7e3 100644
--- a/extras/cdrom_id/cdrom_id.c
+++ b/extras/cdrom_id/cdrom_id.c
@@ -46,37 +46,17 @@
static int debug;
-#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 (debug && udev_log < LOG_INFO)
- udev_log = LOG_INFO;
- }
-
- if (priority > udev_log)
- return;
-
- va_start(args, format);
if (debug) {
- fprintf(stderr, "[%d] ", (int) getpid());
+ fprintf(stderr, "%s: ", fn);
vfprintf(stderr, format, args);
- } else
+ } else {
vsyslog(priority, format, args);
- va_end(args);
+ }
}
-#endif
/* device info */
static unsigned int cd_cd_rom;
@@ -135,13 +115,13 @@ static unsigned long long int cd_media_session_last_offset;
#define ASC(errcode) (((errcode) >> 8) & 0xFF)
#define ASCQ(errcode) ((errcode) & 0xFF)
-static void info_scsi_cmd_err(const char *cmd, int err)
+static void info_scsi_cmd_err(struct udev *udev, char *cmd, int err)
{
if (err == -1) {
- info("%s failed\n", cmd);
+ info(udev, "%s failed\n", cmd);
return;
}
- info("%s failed with SK=%Xh/ASC=%02Xh/ACQ=%02Xh\n", cmd, SK(err), ASC(err), ASCQ(err));
+ info(udev, "%s failed with SK=%Xh/ASC=%02Xh/ACQ=%02Xh\n", cmd, SK(err), ASC(err), ASCQ(err));
}
struct scsi_cmd {
@@ -153,7 +133,7 @@ struct scsi_cmd {
struct sg_io_hdr sg_io;
};
-static void scsi_cmd_set(struct scsi_cmd *cmd, size_t i, int arg)
+static void scsi_cmd_set(struct udev *udev, struct scsi_cmd *cmd, size_t i, int arg)
{
if (i == 0) {
memset(cmd, 0x00, sizeof(struct scsi_cmd));
@@ -172,7 +152,7 @@ static void scsi_cmd_set(struct scsi_cmd *cmd, size_t i, int arg)
#define CHECK_CONDITION 0x01
-static int scsi_cmd_run(struct scsi_cmd *cmd, int fd, unsigned char *buf, size_t bufsize)
+static int scsi_cmd_run(struct udev *udev, struct scsi_cmd *cmd, int fd, unsigned char *buf, size_t bufsize)
{
int ret = 0;
@@ -194,13 +174,13 @@ static int scsi_cmd_run(struct scsi_cmd *cmd, int fd, unsigned char *buf, size_t
return ret;
}
-static int cd_capability_compat(int fd)
+static int cd_capability_compat(struct udev *udev, int fd)
{
int capabilty;
capabilty = ioctl(fd, CDROM_GET_CAPABILITY, NULL);
if (capabilty < 0) {
- info("CDROM_GET_CAPABILITY failed\n");
+ info(udev, "CDROM_GET_CAPABILITY failed\n");
return -1;
}
@@ -221,30 +201,30 @@ static int cd_capability_compat(int fd)
return 0;
}
-static int cd_inquiry(int fd) {
+static int cd_inquiry(struct udev *udev, int fd) {
struct scsi_cmd sc;
unsigned char inq[128];
int err;
- scsi_cmd_set(&sc, 0, 0x12);
- scsi_cmd_set(&sc, 4, 36);
- scsi_cmd_set(&sc, 5, 0);
- err = scsi_cmd_run(&sc, fd, inq, 36);
+ scsi_cmd_set(udev, &sc, 0, 0x12);
+ scsi_cmd_set(udev, &sc, 4, 36);
+ scsi_cmd_set(udev, &sc, 5, 0);
+ err = scsi_cmd_run(udev, &sc, fd, inq, 36);
if ((err < 0)) {
- info_scsi_cmd_err("INQUIRY", err);
+ info_scsi_cmd_err(udev, "INQUIRY", err);
return -1;
}
if ((inq[0] & 0x1F) != 5) {
- info("not an MMC unit\n");
+ info(udev, "not an MMC unit\n");
return -1;
}
- info("INQUIRY: [%.8s][%.16s][%.4s]\n", inq + 8, inq + 16, inq + 32);
+ info(udev, "INQUIRY: [%.8s][%.16s][%.4s]\n", inq + 8, inq + 16, inq + 32);
return 0;
}
-static int cd_profiles(int fd)
+static int cd_profiles(struct udev *udev, int fd)
{
struct scsi_cmd sc;
unsigned char header[8];
@@ -254,32 +234,32 @@ static int cd_profiles(int fd)
unsigned int i;
int err;
- scsi_cmd_set(&sc, 0, 0x46);
- scsi_cmd_set(&sc, 1, 0);
- scsi_cmd_set(&sc, 8, sizeof(header));
- scsi_cmd_set(&sc, 9, 0);
- err = scsi_cmd_run(&sc, fd, header, sizeof(header));
+ scsi_cmd_set(udev, &sc, 0, 0x46);
+ scsi_cmd_set(udev, &sc, 1, 0);
+ scsi_cmd_set(udev, &sc, 8, sizeof(header));
+ scsi_cmd_set(udev, &sc, 9, 0);
+ err = scsi_cmd_run(udev, &sc, fd, header, sizeof(header));
if ((err < 0)) {
- info_scsi_cmd_err("GET CONFIGURATION", err);
+ info_scsi_cmd_err(udev, "GET CONFIGURATION", err);
return -1;
}
len = 4 + (header[0] << 24 | header[1] << 16 | header[2] << 8 | header[3]);
- info("GET CONFIGURATION: number of profiles %i\n", len);
+ info(udev, "GET CONFIGURATION: number of profiles %i\n", len);
if (len > sizeof(profiles)) {
- info("invalid number of profiles\n");
+ info(udev, "invalid number of profiles\n");
return -1;
}
- scsi_cmd_set(&sc, 0, 0x46);
- scsi_cmd_set(&sc, 1, 1);
- scsi_cmd_set(&sc, 6, len >> 16);
- scsi_cmd_set(&sc, 7, len >> 8);
- scsi_cmd_set(&sc, 8, len);
- scsi_cmd_set(&sc, 9, 0);
- err = scsi_cmd_run(&sc, fd, profiles, len);
+ scsi_cmd_set(udev, &sc, 0, 0x46);
+ scsi_cmd_set(udev, &sc, 1, 1);
+ scsi_cmd_set(udev, &sc, 6, len >> 16);
+ scsi_cmd_set(udev, &sc, 7, len >> 8);
+ scsi_cmd_set(udev, &sc, 8, len);
+ scsi_cmd_set(udev, &sc, 9, 0);
+ err = scsi_cmd_run(udev, &sc, fd, profiles, len);
if ((err < 0)) {
- info_scsi_cmd_err("GET CONFIGURATION", err);
+ info_scsi_cmd_err(udev, "GET CONFIGURATION", err);
return -1;
}
@@ -288,7 +268,7 @@ static int cd_profiles(int fd)
unsigned int profile = (profiles[i] << 8 | profiles[i + 1]);
if (profile == 0)
continue;
- info("profile 0x%02x\n", profile);
+ info(udev, "profile 0x%02x\n", profile);
switch (profile) {
case 0x03:
@@ -344,9 +324,9 @@ static int cd_profiles(int fd)
/* current media profile */
cur_profile = header[6] << 8 | header[7];
- info("current profile 0x%02x\n", cur_profile);
+ info(udev, "current profile 0x%02x\n", cur_profile);
if (cur_profile == 0) {
- info("no current profile, assuming no media\n");
+ info(udev, "no current profile, assuming no media\n");
return -1;
}
@@ -415,7 +395,7 @@ static int cd_profiles(int fd)
return 0;
}
-static int cd_media_info(int fd)
+static int cd_media_info(struct udev *udev, int fd)
{
struct scsi_cmd sc;
unsigned char header[32];
@@ -427,16 +407,16 @@ static int cd_media_info(int fd)
};
int err;
- scsi_cmd_set(&sc, 0, 0x51);
- scsi_cmd_set(&sc, 8, sizeof(header));
- scsi_cmd_set(&sc, 9, 0);
- err = scsi_cmd_run(&sc, fd, header, sizeof(header));
+ scsi_cmd_set(udev, &sc, 0, 0x51);
+ scsi_cmd_set(udev, &sc, 8, sizeof(header));
+ scsi_cmd_set(udev, &sc, 9, 0);
+ err = scsi_cmd_run(udev, &sc, fd, header, sizeof(header));
if ((err < 0)) {
- info_scsi_cmd_err("READ DISC INFORMATION", err);
+ info_scsi_cmd_err(udev, "READ DISC INFORMATION", err);
return -1;
};
- info("disk type %02x\n", header[8]);
+ info(udev, "disk type %02x\n", header[8]);
if ((header[2] & 3) < 4)
cd_media_state = media_status[header[2] & 3];
@@ -448,7 +428,7 @@ static int cd_media_info(int fd)
return 0;
}
-static int cd_media_toc(int fd)
+static int cd_media_toc(struct udev *udev, int fd)
{
struct scsi_cmd sc;
unsigned char header[12];
@@ -457,18 +437,18 @@ static int cd_media_toc(int fd)
unsigned char *p;
int err;
- scsi_cmd_set(&sc, 0, 0x43);
- scsi_cmd_set(&sc, 6, 1);
- scsi_cmd_set(&sc, 8, sizeof(header));
- scsi_cmd_set(&sc, 9, 0);
- err = scsi_cmd_run(&sc, fd, header, sizeof(header));
+ scsi_cmd_set(udev, &sc, 0, 0x43);
+ scsi_cmd_set(udev, &sc, 6, 1);
+ scsi_cmd_set(udev, &sc, 8, sizeof(header));
+ scsi_cmd_set(udev, &sc, 9, 0);
+ err = scsi_cmd_run(udev, &sc, fd, header, sizeof(header));
if ((err < 0)) {
- info_scsi_cmd_err("READ TOC", err);
+ info_scsi_cmd_err(udev, "READ TOC", err);
return -1;
}
len = (header[0] << 8 | header[1]) + 2;
- info("READ TOC: len: %d\n", len);
+ info(udev, "READ TOC: len: %d\n", len);
if (len > sizeof(toc))
return -1;
if (len < 2)
@@ -478,14 +458,14 @@ static int cd_media_toc(int fd)
if (len < 8)
return 0;
- scsi_cmd_set(&sc, 0, 0x43);
- scsi_cmd_set(&sc, 6, header[2]); /* First Track/Session Number */
- scsi_cmd_set(&sc, 7, len >> 8);
- scsi_cmd_set(&sc, 8, len);
- scsi_cmd_set(&sc, 9, 0);
- err = scsi_cmd_run(&sc, fd, toc, len);
+ scsi_cmd_set(udev, &sc, 0, 0x43);
+ scsi_cmd_set(udev, &sc, 6, header[2]); /* First Track/Session Number */
+ scsi_cmd_set(udev, &sc, 7, len >> 8);
+ scsi_cmd_set(udev, &sc, 8, len);
+ scsi_cmd_set(udev, &sc, 9, 0);
+ err = scsi_cmd_run(udev, &sc, fd, toc, len);
if ((err < 0)) {
- info_scsi_cmd_err("READ TOC (tracks)", err);
+ info_scsi_cmd_err(udev, "READ TOC (tracks)", err);
return -1;
}
@@ -496,7 +476,7 @@ static int cd_media_toc(int fd)
is_data_track = (p[1] & 0x04) != 0;
block = p[4] << 24 | p[5] << 16 | p[6] << 8 | p[7];
- info("track=%u info=0x%x(%s) start_block=%u\n",
+ info(udev, "track=%u info=0x%x(%s) start_block=%u\n",
p[2], p[1] & 0x0f, is_data_track ? "data":"audio", block);
if (is_data_track)
@@ -505,23 +485,24 @@ static int cd_media_toc(int fd)
cd_media_track_count_audio++;
}
- scsi_cmd_set(&sc, 0, 0x43);
- scsi_cmd_set(&sc, 2, 1); /* Session Info */
- scsi_cmd_set(&sc, 8, 12);
- scsi_cmd_set(&sc, 9, 0);
- err = scsi_cmd_run(&sc, fd, header, sizeof(header));
+ scsi_cmd_set(udev, &sc, 0, 0x43);
+ scsi_cmd_set(udev, &sc, 2, 1); /* Session Info */
+ scsi_cmd_set(udev, &sc, 8, 12);
+ scsi_cmd_set(udev, &sc, 9, 0);
+ err = scsi_cmd_run(udev, &sc, fd, header, sizeof(header));
if ((err < 0)) {
- info_scsi_cmd_err("READ TOC (multi session)", err);
+ info_scsi_cmd_err(udev, "READ TOC (multi session)", err);
return -1;
}
len = header[4+4] << 24 | header[4+5] << 16 | header[4+6] << 8 | header[4+7];
- info("last track %u starts at block %u\n", header[4+2], len);
+ info(udev, "last track %u starts at block %u\n", header[4+2], len);
cd_media_session_last_offset = (unsigned long long int)len * 2048;
return 0;
}
int main(int argc, char *argv[])
{
+ struct udev *udev;
static const struct option options[] = {
{ "export", 0, NULL, 'x' },
{ "debug", 0, NULL, 'd' },
@@ -533,7 +514,12 @@ int main(int argc, char *argv[])
int fd = -1;
int rc = 0;
+ udev = udev_new();
+ if (udev == NULL)
+ goto exit;
+
logging_init("cdrom_id");
+ udev_set_log_fn(udev, log_fn);
while (1) {
int option;
@@ -545,6 +531,8 @@ int main(int argc, char *argv[])
switch (option) {
case 'd':
debug = 1;
+ if (udev_get_log_priority(udev) < LOG_INFO)
+ udev_set_log_priority(udev, LOG_INFO);
break;
case 'x':
export = 1;
@@ -563,7 +551,7 @@ int main(int argc, char *argv[])
node = argv[optind];
if (!node) {
- err("no device\n");
+ err(udev, "no device\n");
fprintf(stderr, "no device\n");
rc = 1;
goto exit;
@@ -571,34 +559,34 @@ int main(int argc, char *argv[])
fd = open(node, O_RDONLY | O_NONBLOCK);
if (fd < 0) {
- info("unable to open '%s'\n", node);
+ info(udev, "unable to open '%s'\n", node);
rc = 1;
goto exit;
}
- info("probing: '%s'\n", node);
+ info(udev, "probing: '%s'\n", node);
/* same data as original cdrom_id */
- if (cd_capability_compat(fd) < 0) {
+ if (cd_capability_compat(udev, fd) < 0) {
rc = 1;
goto exit;
}
/* check drive */
- if (cd_inquiry(fd) < 0) {
+ if (cd_inquiry(udev, fd) < 0) {
rc = 2;
goto exit;
}
/* read drive and possibly current profile */
- if (cd_profiles(fd) < 0)
+ if (cd_profiles(udev, fd) < 0)
goto print;
/* get session/track info */
- if (cd_media_toc(fd) < 0)
+ if (cd_media_toc(udev, fd) < 0)
goto print;
/* get writable media state */
- if (cd_media_info(fd) < 0)
+ if (cd_media_info(udev, fd) < 0)
goto print;
print:
@@ -702,6 +690,7 @@ print:
exit:
if (fd >= 0)
close(fd);
+ udev_unref(udev);
logging_close();
return rc;
}
diff --git a/extras/edd_id/Makefile.am b/extras/edd_id/Makefile.am
index fa4f18c9fb..cc693967ca 100644
--- a/extras/edd_id/Makefile.am
+++ b/extras/edd_id/Makefile.am
@@ -8,10 +8,14 @@ dist_udevrules_DATA = \
AM_CPPFLAGS = \
-DSYSCONFDIR=\""$(sysconfdir)"\" \
- -DUDEV_PREFIX=\""$(udev_prefix)"\"
+ -DUDEV_PREFIX=\""$(udev_prefix)"\" \
+ -D_LIBUDEV_COMPILATION
edd_id_SOURCES = \
edd_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/edd_id/edd_id.c b/extras/edd_id/edd_id.c
index 9d745c505a..b53700e756 100644
--- a/extras/edd_id/edd_id.c
+++ b/extras/edd_id/edd_id.c
@@ -25,33 +25,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
int main(int argc, char *argv[])
{
+ struct udev *udev;
const char *node = NULL;
int i;
int export = 0;
@@ -64,7 +47,12 @@ int main(int argc, char *argv[])
int rc = 1;
char match[NAME_MAX] = "";
+ udev = udev_new();
+ if (udev == NULL)
+ goto exit;
+
logging_init("edd_id");
+ udev_set_log_fn(udev, log_fn);
for (i = 1 ; i < argc; i++) {
char *arg = argv[i];
@@ -75,7 +63,7 @@ int main(int argc, char *argv[])
node = arg;
}
if (node == NULL) {
- err("no node specified\n");
+ err(udev, "no node specified\n");
fprintf(stderr, "no node specified\n");
goto exit;
}
@@ -83,7 +71,7 @@ int main(int argc, char *argv[])
/* check for kernel support */
dir = opendir("/sys/firmware/edd");
if (dir == NULL) {
- info("no kernel EDD support\n");
+ info(udev, "no kernel EDD support\n");
fprintf(stderr, "no kernel EDD support\n");
rc = 2;
goto exit;
@@ -91,7 +79,7 @@ int main(int argc, char *argv[])
disk_fd = open(node, O_RDONLY);
if (disk_fd < 0) {
- info("unable to open '%s'\n", node);
+ info(udev, "unable to open '%s'\n", node);
fprintf(stderr, "unable to open '%s'\n", node);
rc = 3;
goto closedir;
@@ -99,38 +87,38 @@ int main(int argc, char *argv[])
/* check for valid MBR signature */
if (lseek(disk_fd, 510, SEEK_SET) < 0) {
- info("seek to MBR validity failed '%s'\n", node);
+ info(udev, "seek to MBR validity failed '%s'\n", node);
rc = 4;
goto close;
}
if (read(disk_fd, &mbr_valid, sizeof(mbr_valid)) != sizeof(mbr_valid)) {
- info("read MBR validity failed '%s'\n", node);
+ info(udev, "read MBR validity failed '%s'\n", node);
rc = 5;
goto close;
}
if (mbr_valid != 0xAA55) {
fprintf(stderr, "no valid MBR signature '%s'\n", node);
- info("no valid MBR signature '%s'\n", node);
+ info(udev, "no valid MBR signature '%s'\n", node);
rc=6;
goto close;
}
/* read EDD signature */
if (lseek(disk_fd, 440, SEEK_SET) < 0) {
- info("seek to signature failed '%s'\n", node);
+ info(udev, "seek to signature failed '%s'\n", node);
rc = 7;
goto close;
}
if (read(disk_fd, &disk_id, sizeof(disk_id)) != sizeof(disk_id)) {
- info("read signature failed '%s'\n", node);
+ info(udev, "read signature failed '%s'\n", node);
rc = 8;
goto close;
}
/* all zero is invalid */
- info("read id 0x%08x from '%s'\n", disk_id, node);
+ info(udev, "read id 0x%08x from '%s'\n", disk_id, node);
if (disk_id == 0) {
fprintf(stderr, "no EDD signature '%s'\n", node);
- info("'%s' signature is zero\n", node);
+ info(udev, "'%s' signature is zero\n", node);
rc = 9;
goto close;
}
@@ -150,18 +138,18 @@ int main(int argc, char *argv[])
sysfs_fd = open(file, O_RDONLY);
if (sysfs_fd < 0) {
- info("unable to open sysfs '%s'\n", file);
+ info(udev, "unable to open sysfs '%s'\n", file);
continue;
}
size = read(sysfs_fd, sysfs_id_buf, sizeof(sysfs_id_buf)-1);
close(sysfs_fd);
if (size <= 0) {
- info("read sysfs '%s' failed\n", file);
+ info(udev, "read sysfs '%s' failed\n", file);
continue;
}
sysfs_id_buf[size] = '\0';
- info("read '%s' from '%s'\n", sysfs_id_buf, file);
+ info(udev, "read '%s' from '%s'\n", sysfs_id_buf, file);
sysfs_id = strtoul(sysfs_id_buf, NULL, 16);
/* look for matching value, that appears only once */
@@ -171,7 +159,7 @@ int main(int argc, char *argv[])
strlcpy(match, dent->d_name, sizeof(match));
} else {
/* error, same signature for another device */
- info("'%s' does not have a unique signature\n", node);
+ info(udev, "'%s' does not have a unique signature\n", node);
fprintf(stderr, "'%s' does not have a unique signature\n", node);
rc = 10;
goto exit;
@@ -192,6 +180,7 @@ close:
closedir:
closedir(dir);
exit:
+ udev_unref(udev);
logging_close();
return rc;
}
diff --git a/extras/floppy/Makefile.am b/extras/floppy/Makefile.am
index 4854d5245b..7879e7c2bd 100644
--- a/extras/floppy/Makefile.am
+++ b/extras/floppy/Makefile.am
@@ -4,11 +4,14 @@ udevhome_PROGRAMS = \
AM_CPPFLAGS = \
-DSYSCONFDIR=\""$(sysconfdir)"\" \
- -DUDEV_PREFIX=\""$(udev_prefix)"\"
+ -DUDEV_PREFIX=\""$(udev_prefix)"\" \
+ -D_LIBUDEV_COMPILATION
create_floppy_devices_SOURCES = \
create_floppy_devices.c \
- ../../udev/udev_config.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/floppy/create_floppy_devices.c b/extras/floppy/create_floppy_devices.c
index 3e73aa83c3..2c7d44b16d 100644
--- a/extras/floppy/create_floppy_devices.c
+++ b/extras/floppy/create_floppy_devices.c
@@ -41,33 +41,16 @@ static int t1200[] = { 2, 5, 6, 10, 12, 14, 16, 18, 20, 23, 0 };
static int t3in[] = { 8, 9, 26, 27, 28, 7, 11, 15, 19, 24, 25, 29, 31, 3, 4, 13, 17, 21, 22, 30, 0 };
static int *table_sup[] = { NULL, t360, t1200, t3in+5+8, t3in+5, t3in, t3in };
-#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
int main(int argc, char **argv)
{
+ struct udev *udev;
char *dev;
char *devname;
char node[64];
@@ -80,6 +63,13 @@ int main(int argc, char **argv)
int print_nodes = 0;
int is_err = 0;
+ udev = udev_new();
+ if (udev == NULL)
+ goto exit;
+
+ logging_init("create_floppy_devices");
+ udev_set_log_fn(udev, log_fn);
+
while ((c = getopt(argc, argv, "cudm:U:G:M:t:")) != -1) {
switch (c) {
case 'c':
@@ -89,10 +79,10 @@ int main(int argc, char **argv)
print_nodes = 1;
break;
case 'U':
- uid = lookup_user(optarg);
+ uid = lookup_user(udev, optarg);
break;
case 'G':
- gid = lookup_group(optarg);
+ gid = lookup_group(udev, optarg);
break;
case 'M':
mode = strtol(optarg, NULL, 0);
@@ -155,8 +145,7 @@ int main(int argc, char **argv)
if (type == 0)
return 0;
- udev_config_init();
- selinux_init();
+ selinux_init(udev);
i = 0;
while (table_sup[type][i]) {
@@ -166,15 +155,17 @@ int main(int argc, char **argv)
printf("%s b %d %d %d\n", node, mode, major, minor);
if (create_nodes) {
unlink(node);
- selinux_setfscreatecon(node, NULL, S_IFBLK | mode);
+ selinux_setfscreatecon(udev, node, NULL, S_IFBLK | mode);
mknod(node, S_IFBLK | mode, makedev(major,minor));
- selinux_resetfscreatecon();
+ selinux_resetfscreatecon(udev);
chown(node, uid, gid);
chmod(node, S_IFBLK | mode);
}
i++;
}
- selinux_exit();
+ selinux_exit(udev);
+ udev_unref(udev);
+exit:
return 0;
}
diff --git a/extras/fstab_import/79-fstab_import.rules b/extras/fstab_import/79-fstab_import.rules
index ccd718c5f0..44accde482 100644
--- a/extras/fstab_import/79-fstab_import.rules
+++ b/extras/fstab_import/79-fstab_import.rules
@@ -1,2 +1,2 @@
-ACTION=="add", SUBSYSTEM=="block", ENV{ID_FS_USAGE}=="filesystem|other", IMPORT="fstab_import --root=$root $name $links mapper/$env{DM_NAME}"
+ACTION=="add", SUBSYSTEM=="block", ENV{ID_FS_USAGE}=="filesystem|other", IMPORT="fstab_import $name $links mapper/$env{DM_NAME}"
diff --git a/extras/fstab_import/Makefile.am b/extras/fstab_import/Makefile.am
index 0ee7efb9ce..902ab1e28e 100644
--- a/extras/fstab_import/Makefile.am
+++ b/extras/fstab_import/Makefile.am
@@ -8,10 +8,14 @@ dist_udevrules_DATA = \
AM_CPPFLAGS = \
-DSYSCONFDIR=\""$(sysconfdir)"\" \
- -DUDEV_PREFIX=\""$(udev_prefix)"\"
+ -DUDEV_PREFIX=\""$(udev_prefix)"\" \
+ -D_LIBUDEV_COMPILATION
fstab_import_SOURCES = \
fstab_import.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/fstab_import/fstab_import.c b/extras/fstab_import/fstab_import.c
index 2d24cfb38a..0f4685ae2a 100644
--- a/extras/fstab_import/fstab_import.c
+++ b/extras/fstab_import/fstab_import.c
@@ -13,6 +13,8 @@
#define _GNU_SOURCE 1
#endif
+#include "config.h"
+
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
@@ -27,54 +29,32 @@
#include "../../udev/udev.h"
static int debug;
-static char root[PATH_SIZE] = "/dev";
-static char **devices;
-#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 (debug && udev_log < LOG_INFO)
- udev_log = LOG_INFO;
- }
-
- if (priority > udev_log)
- return;
-
- va_start(args, format);
if (debug) {
- fprintf(stderr, "[%d] ", (int) getpid());
+ fprintf(stderr, "%s: ", fn);
vfprintf(stderr, format, args);
- } else
+ } else {
vsyslog(priority, format, args);
- va_end(args);
+ }
}
-#endif
-static int matches_device_list(const char *name)
+static int matches_device_list(struct udev *udev, char **devices, const char *name)
{
int i;
for (i = 0; devices[i] != NULL; i++) {
- info("compare '%s' == '%s'\n", name, devices[i]);
+ info(udev, "compare '%s' == '%s'\n", name, devices[i]);
if (strcmp(devices[i], name) == 0)
return 1;
}
return 0;
}
-static void print_fstab_entry(struct mntent *mnt)
+static void print_fstab_entry(struct udev *udev, struct mntent *mnt)
{
printf("FSTAB_NAME=%s\n", mnt->mnt_fsname);
printf("FSTAB_DIR=%s\n", mnt->mnt_dir);
@@ -86,42 +66,48 @@ static void print_fstab_entry(struct mntent *mnt)
int main(int argc, char *argv[])
{
+ struct udev *udev;
static const struct option options[] = {
{ "export", 0, NULL, 'x' },
- { "root", 1, NULL, 'r' },
{ "debug", 0, NULL, 'd' },
{ "help", 0, NULL, 'h' },
{}
};
-
+ char **devices;
FILE *fp;
struct mntent *mnt;
- int rc = 0;
+ int rc = 1;
+
+ udev = udev_new();
+ if (udev == NULL)
+ goto exit;
logging_init("fstab_id");
+ udev_set_log_fn(udev, log_fn);
while (1) {
int option;
- option = getopt_long(argc, argv, "dr:xh", options, NULL);
+ option = getopt_long(argc, argv, "dxh", options, NULL);
if (option == -1)
break;
switch (option) {
- case 'r':
- strlcpy(root, optarg, sizeof(root));
- break;
case 'd':
debug = 1;
+ if (udev_get_log_priority(udev) < LOG_INFO)
+ udev_set_log_priority(udev, LOG_INFO);
break;
case 'h':
printf("Usage: fstab_id [OPTIONS] name [...]\n"
" --export print environment keys\n"
- " --root device node root (default /dev)\n"
" --debug debug to stderr\n"
" --help print this help text\n\n");
+ goto exit;
+ case 'x':
+ break;
default:
- rc = 1;
+ rc = 2;
goto exit;
}
}
@@ -129,14 +115,14 @@ int main(int argc, char *argv[])
devices = &argv[optind];
if (devices[0] == NULL) {
fprintf(stderr, "error: missing device(s) to match\n");
- rc = 2;
+ rc = 3;
goto exit;
}
fp = setmntent ("/etc/fstab", "r");
if (fp == NULL) {
fprintf(stderr, "error: opening fstab: %s\n", strerror(errno));
- rc = 2;
+ rc = 4;
goto exit;
}
@@ -145,6 +131,8 @@ int main(int argc, char *argv[])
if (mnt == NULL)
break;
+ info(udev, "found '%s'@'%s'\n", mnt->mnt_fsname, mnt->mnt_dir);
+
/* skip root device */
if (strcmp(mnt->mnt_dir, "/") == 0)
continue;
@@ -165,8 +153,9 @@ int main(int argc, char *argv[])
pos[0] = '\0';
label = str;
}
- if (matches_device_list(str)) {
- print_fstab_entry(mnt);
+ if (matches_device_list(udev, devices, str)) {
+ print_fstab_entry(udev, mnt);
+ rc = 0;
break;
}
continue;
@@ -188,26 +177,28 @@ int main(int argc, char *argv[])
pos[0] = '\0';
uuid = str;
}
- if (matches_device_list(str)) {
- print_fstab_entry(mnt);
+ if (matches_device_list(udev, devices, str)) {
+ print_fstab_entry(udev, mnt);
+ rc = 0;
break;
}
continue;
}
/* only devices */
- if (strncmp(mnt->mnt_fsname, root, strlen(root)) != 0)
+ if (strncmp(mnt->mnt_fsname, udev_get_dev_path(udev), strlen(udev_get_dev_path(udev))) != 0)
continue;
- if (matches_device_list(&mnt->mnt_fsname[strlen(root)+1])) {
- print_fstab_entry(mnt);
+ if (matches_device_list(udev, devices, &mnt->mnt_fsname[strlen(udev_get_dev_path(udev))+1])) {
+ print_fstab_entry(udev, mnt);
+ rc = 0;
break;
}
}
-
endmntent(fp);
exit:
+ udev_unref(udev);
logging_close();
return rc;
}
diff --git a/extras/scsi_id/Makefile.am b/extras/scsi_id/Makefile.am
index 7f890b04cf..fc5c477820 100644
--- a/extras/scsi_id/Makefile.am
+++ b/extras/scsi_id/Makefile.am
@@ -4,7 +4,8 @@ udevhome_PROGRAMS = \
AM_CPPFLAGS = \
-DSYSCONFDIR=\""$(sysconfdir)"\" \
- -DUDEV_PREFIX=\""$(udev_prefix)"\"
+ -DUDEV_PREFIX=\""$(udev_prefix)"\" \
+ -D_LIBUDEV_COMPILATION
scsi_id_SOURCES = \
scsi_id.c \
@@ -12,6 +13,9 @@ scsi_id_SOURCES = \
scsi.h \
scsi_id.h \
bsg.h \
+ ../../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/scsi_id/scsi_id.c b/extras/scsi_id/scsi_id.c
index 23bcb9468e..d692a86799 100644
--- a/extras/scsi_id/scsi_id.c
+++ b/extras/scsi_id/scsi_id.c
@@ -64,30 +64,12 @@ static char model_str[64];
static char revision_str[16];
static char type_str[16];
-#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)
{
@@ -215,7 +197,8 @@ static int argc_count(char *opts)
*
* vendor and model can end in '\n'.
*/
-static int get_file_options(const char *vendor, const char *model,
+static int get_file_options(struct udev *udev,
+ const char *vendor, const char *model,
int *argc, char ***newargv)
{
char *buffer;
@@ -227,14 +210,14 @@ static int get_file_options(const char *vendor, const char *model,
int c;
int retval = 0;
- dbg("vendor='%s'; model='%s'\n", vendor, model);
+ dbg(udev, "vendor='%s'; model='%s'\n", vendor, model);
fd = fopen(config_file, "r");
if (fd == NULL) {
- dbg("can't open %s\n", config_file);
+ dbg(udev, "can't open %s\n", config_file);
if (errno == ENOENT) {
return 1;
} else {
- err("can't open %s: %s\n", config_file, strerror(errno));
+ err(udev, "can't open %s: %s\n", config_file, strerror(errno));
return -1;
}
}
@@ -246,7 +229,7 @@ static int get_file_options(const char *vendor, const char *model,
*/
buffer = malloc(MAX_BUFFER_LEN);
if (!buffer) {
- err("can't allocate memory\n");
+ err(udev, "can't allocate memory\n");
return -1;
}
@@ -260,7 +243,7 @@ static int get_file_options(const char *vendor, const char *model,
break;
lineno++;
if (buf[strlen(buffer) - 1] != '\n') {
- err("Config file line %d too long\n", lineno);
+ err(udev, "Config file line %d too long\n", lineno);
break;
}
@@ -312,7 +295,7 @@ static int get_file_options(const char *vendor, const char *model,
* Only allow: [vendor=foo[,model=bar]]options=stuff
*/
if (!options_in || (!vendor_in && model_in)) {
- err("Error parsing config file line %d '%s'\n", lineno, buffer);
+ err(udev, "Error parsing config file line %d '%s'\n", lineno, buffer);
retval = -1;
break;
}
@@ -350,7 +333,7 @@ static int get_file_options(const char *vendor, const char *model,
c = argc_count(buffer) + 2;
*newargv = calloc(c, sizeof(**newargv));
if (!*newargv) {
- err("can't allocate memory\n");
+ err(udev, "can't allocate memory\n");
retval = -1;
} else {
*argc = c;
@@ -375,7 +358,8 @@ static int get_file_options(const char *vendor, const char *model,
return retval;
}
-static int set_options(int argc, char **argv, const char *short_opts,
+static int set_options(struct udev *udev,
+ int argc, char **argv, const char *short_opts,
char *maj_min_dev)
{
int option;
@@ -392,9 +376,9 @@ static int set_options(int argc, char **argv, const char *short_opts,
break;
if (optarg)
- dbg("option '%c' arg '%s'\n", option, optarg);
+ dbg(udev, "option '%c' arg '%s'\n", option, optarg);
else
- dbg("option '%c'\n", option);
+ dbg(udev, "option '%c'\n", option);
switch (option) {
case 'b':
@@ -443,7 +427,7 @@ static int set_options(int argc, char **argv, const char *short_opts,
} else if (strcmp(optarg, "pre-spc3-83") == 0) {
default_page_code = PAGE_83_PRE_SPC3;
} else {
- err("Unknown page code '%s'\n", optarg);
+ err(udev, "Unknown page code '%s'\n", optarg);
return -1;
}
break;
@@ -451,7 +435,7 @@ static int set_options(int argc, char **argv, const char *short_opts,
case 's':
sg_version = atoi(optarg);
if (sg_version < 3 || sg_version > 4) {
- err("Unknown SG version '%s'\n", optarg);
+ err(udev, "Unknown SG version '%s'\n", optarg);
return -1;
}
break;
@@ -485,7 +469,8 @@ static int set_options(int argc, char **argv, const char *short_opts,
return 0;
}
-static int per_dev_options(struct scsi_id_device *dev_scsi, int *good_bad, int *page_code)
+static int per_dev_options(struct udev *udev,
+ struct scsi_id_device *dev_scsi, int *good_bad, int *page_code)
{
int retval;
int newargc;
@@ -495,7 +480,7 @@ static int per_dev_options(struct scsi_id_device *dev_scsi, int *good_bad, int *
*good_bad = all_good;
*page_code = default_page_code;
- retval = get_file_options(vendor_str, model_str, &newargc, &newargv);
+ retval = get_file_options(udev, vendor_str, model_str, &newargc, &newargv);
optind = 1; /* reset this global extern */
while (retval == 0) {
@@ -504,9 +489,9 @@ static int per_dev_options(struct scsi_id_device *dev_scsi, int *good_bad, int *
break;
if (optarg)
- dbg("option '%c' arg '%s'\n", option, optarg);
+ dbg(udev, "option '%c' arg '%s'\n", option, optarg);
else
- dbg("option '%c'\n", option);
+ dbg(udev, "option '%c'\n", option);
switch (option) {
case 'b':
@@ -525,13 +510,13 @@ static int per_dev_options(struct scsi_id_device *dev_scsi, int *good_bad, int *
} else if (strcmp(optarg, "pre-spc3-83") == 0) {
*page_code = PAGE_83_PRE_SPC3;
} else {
- err("Unknown page code '%s'\n", optarg);
+ err(udev, "Unknown page code '%s'\n", optarg);
retval = -1;
}
break;
default:
- err("Unknown or bad option '%c' (0x%x)\n", option, option);
+ err(udev, "Unknown or bad option '%c' (0x%x)\n", option, option);
retval = -1;
break;
}
@@ -544,13 +529,13 @@ static int per_dev_options(struct scsi_id_device *dev_scsi, int *good_bad, int *
return retval;
}
-static int set_inq_values(struct scsi_id_device *dev_scsi, const char *path)
+static int set_inq_values(struct udev *udev, struct scsi_id_device *dev_scsi, const char *path)
{
int retval;
dev_scsi->use_sg = sg_version;
- retval = scsi_std_inquiry(dev_scsi, path);
+ retval = scsi_std_inquiry(udev, dev_scsi, path);
if (retval)
return retval;
@@ -594,7 +579,7 @@ static void format_serial(char *serial)
* memory etc. return 2, and return 1 for expected cases (like broken
* device found) that do not print an id.
*/
-static int scsi_id(char *maj_min_dev)
+static int scsi_id(struct udev *udev, char *maj_min_dev)
{
int retval;
struct scsi_id_device dev_scsi;
@@ -602,15 +587,16 @@ static int scsi_id(char *maj_min_dev)
int page_code;
char serial_short[MAX_SERIAL_LEN] = "";
- set_inq_values(&dev_scsi, maj_min_dev);
+ set_inq_values(udev, &dev_scsi, maj_min_dev);
/* get per device (vendor + model) options from the config file */
- retval = per_dev_options(&dev_scsi, &good_dev, &page_code);
+ retval = per_dev_options(udev, &dev_scsi, &good_dev, &page_code);
dbg("per dev options: good %d; page code 0x%x\n", good_dev, page_code);
if (!good_dev) {
retval = 1;
- } else if (scsi_get_serial(&dev_scsi, maj_min_dev, page_code,
+ } else if (scsi_get_serial(udev,
+ &dev_scsi, maj_min_dev, page_code,
serial_short, MAX_SERIAL_LEN)) {
retval = 1;
} else {
@@ -642,25 +628,30 @@ static int scsi_id(char *maj_min_dev)
int main(int argc, char **argv)
{
+ struct udev *udev;
int retval = 0;
char maj_min_dev[MAX_PATH_LEN];
int newargc;
char **newargv;
+ udev = udev_new();
+ if (udev == NULL)
+ goto exit;
+
logging_init("scsi_id");
- dbg("argc is %d\n", argc);
+ udev_set_log_fn(udev, log_fn);
/*
* Get config file options.
*/
newargv = NULL;
- retval = get_file_options(NULL, NULL, &newargc, &newargv);
+ retval = get_file_options(udev, NULL, NULL, &newargc, &newargv);
if (retval < 0) {
retval = 1;
goto exit;
}
if (newargv && (retval == 0)) {
- if (set_options(newargc, newargv, short_options, maj_min_dev) < 0) {
+ if (set_options(udev, newargc, newargv, short_options, maj_min_dev) < 0) {
retval = 2;
goto exit;
}
@@ -670,18 +661,19 @@ int main(int argc, char **argv)
/*
* Get command line options (overriding any config file settings).
*/
- if (set_options(argc, argv, short_options, maj_min_dev) < 0)
+ if (set_options(udev, argc, argv, short_options, maj_min_dev) < 0)
exit(1);
if (!dev_specified) {
- err("no device specified\n");
+ err(udev, "no device specified\n");
retval = 1;
goto exit;
}
- retval = scsi_id(maj_min_dev);
+ retval = scsi_id(udev, maj_min_dev);
exit:
+ udev_unref(udev);
logging_close();
return retval;
}
diff --git a/extras/scsi_id/scsi_id.h b/extras/scsi_id/scsi_id.h
index 680c39d9ef..48e4a58231 100644
--- a/extras/scsi_id/scsi_id.h
+++ b/extras/scsi_id/scsi_id.h
@@ -40,8 +40,8 @@ struct scsi_id_device {
int use_sg;
};
-extern int scsi_std_inquiry(struct scsi_id_device *dev_scsi, const char *devname);
-extern int scsi_get_serial (struct scsi_id_device *dev_scsi, const char *devname,
+extern int scsi_std_inquiry(struct udev *udev, struct scsi_id_device *dev_scsi, const char *devname);
+extern int scsi_get_serial (struct udev *udev, struct scsi_id_device *dev_scsi, const char *devname,
int page_code, char *serial_short, int len);
/*
diff --git a/extras/scsi_id/scsi_serial.c b/extras/scsi_id/scsi_serial.c
index 104db3d95f..757f41d14e 100644
--- a/extras/scsi_id/scsi_serial.c
+++ b/extras/scsi_id/scsi_serial.c
@@ -89,7 +89,8 @@ static const char hex_str[]="0123456789abcdef";
#define SG_ERR_CAT_SENSE 98 /* Something else in the sense buffer */
#define SG_ERR_CAT_OTHER 99 /* Some other error/warning */
-static int sg_err_category_new(int scsi_status, int msg_status, int
+static int sg_err_category_new(struct udev *udev,
+ int scsi_status, int msg_status, int
host_status, int driver_status, const
unsigned char *sense_buffer, int sb_len)
{
@@ -143,22 +144,24 @@ static int sg_err_category_new(int scsi_status, int msg_status, int
return SG_ERR_CAT_OTHER;
}
-static int sg_err_category3(struct sg_io_hdr *hp)
+static int sg_err_category3(struct udev *udev, struct sg_io_hdr *hp)
{
- return sg_err_category_new(hp->status, hp->msg_status,
+ return sg_err_category_new(udev,
+ hp->status, hp->msg_status,
hp->host_status, hp->driver_status,
hp->sbp, hp->sb_len_wr);
}
-static int sg_err_category4(struct sg_io_v4 *hp)
+static int sg_err_category4(struct udev *udev, struct sg_io_v4 *hp)
{
- return sg_err_category_new(hp->device_status, 0,
+ return sg_err_category_new(udev, hp->device_status, 0,
hp->transport_status, hp->driver_status,
(unsigned char *)hp->response,
hp->response_len);
}
-static int scsi_dump_sense(struct scsi_id_device *dev_scsi,
+static int scsi_dump_sense(struct udev *udev,
+ struct scsi_id_device *dev_scsi,
unsigned char *sense_buffer, int sb_len)
{
int s;
@@ -184,10 +187,10 @@ static int scsi_dump_sense(struct scsi_id_device *dev_scsi,
* we'll retry the command.
*/
- dbg("got check condition\n");
+ dbg(udev, "got check condition\n");
if (sb_len < 1) {
- info("%s: sense buffer empty\n", dev_scsi->kernel);
+ info(udev, "%s: sense buffer empty\n", dev_scsi->kernel);
return -1;
}
@@ -200,7 +203,7 @@ static int scsi_dump_sense(struct scsi_id_device *dev_scsi,
*/
s = sense_buffer[7] + 8;
if (sb_len < s) {
- info("%s: sense buffer too small %d bytes, %d bytes too short\n",
+ info(udev, "%s: sense buffer too small %d bytes, %d bytes too short\n",
dev_scsi->kernel, sb_len, s - sb_len);
return -1;
}
@@ -211,7 +214,7 @@ static int scsi_dump_sense(struct scsi_id_device *dev_scsi,
/*
* Possible?
*/
- info("%s: sense result too" " small %d bytes\n",
+ info(udev, "%s: sense result too" " small %d bytes\n",
dev_scsi->kernel, s);
return -1;
}
@@ -223,85 +226,88 @@ static int scsi_dump_sense(struct scsi_id_device *dev_scsi,
asc = sense_buffer[2];
ascq = sense_buffer[3];
} else {
- info("%s: invalid sense code 0x%x\n",
+ info(udev, "%s: invalid sense code 0x%x\n",
dev_scsi->kernel, code);
return -1;
}
- info("%s: sense key 0x%x ASC 0x%x ASCQ 0x%x\n",
+ info(udev, "%s: sense key 0x%x ASC 0x%x ASCQ 0x%x\n",
dev_scsi->kernel, sense_key, asc, ascq);
} else {
if (sb_len < 4) {
- info("%s: sense buffer too small %d bytes, %d bytes too short\n",
+ info(udev, "%s: sense buffer too small %d bytes, %d bytes too short\n",
dev_scsi->kernel, sb_len, 4 - sb_len);
return -1;
}
if (sense_buffer[0] < 15)
- info("%s: old sense key: 0x%x\n", dev_scsi->kernel, sense_buffer[0] & 0x0f);
+ info(udev, "%s: old sense key: 0x%x\n", dev_scsi->kernel, sense_buffer[0] & 0x0f);
else
- info("%s: sense = %2x %2x\n",
+ info(udev, "%s: sense = %2x %2x\n",
dev_scsi->kernel, sense_buffer[0], sense_buffer[2]);
- info("%s: non-extended sense class %d code 0x%0x\n",
+ info(udev, "%s: non-extended sense class %d code 0x%0x\n",
dev_scsi->kernel, sense_class, code);
}
#ifdef DUMP_SENSE
for (i = 0, j = 0; (i < s) && (j < 254); i++) {
- dbg("i %d, j %d\n", i, j);
+ dbg(udev, "i %d, j %d\n", i, j);
out_buffer[j++] = hex_str[(sense_buffer[i] & 0xf0) >> 4];
out_buffer[j++] = hex_str[sense_buffer[i] & 0x0f];
out_buffer[j++] = ' ';
}
out_buffer[j] = '\0';
- info("%s: sense dump:\n", dev_scsi->kernel);
- info("%s: %s\n", dev_scsi->kernel, out_buffer);
+ info(udev, "%s: sense dump:\n", dev_scsi->kernel);
+ info(udev, "%s: %s\n", dev_scsi->kernel, out_buffer);
#endif
return -1;
}
-static int scsi_dump(struct scsi_id_device *dev_scsi, struct sg_io_hdr *io)
+static int scsi_dump(struct udev *udev,
+ struct scsi_id_device *dev_scsi, struct sg_io_hdr *io)
{
if (!io->status && !io->host_status && !io->msg_status &&
!io->driver_status) {
/*
* Impossible, should not be called.
*/
- info("%s: called with no error\n", __FUNCTION__);
+ info(udev, "%s: called with no error\n", __FUNCTION__);
return -1;
}
- info("%s: sg_io failed status 0x%x 0x%x 0x%x 0x%x\n",
+ info(udev, "%s: sg_io failed status 0x%x 0x%x 0x%x 0x%x\n",
dev_scsi->kernel, io->driver_status, io->host_status, io->msg_status, io->status);
if (io->status == SCSI_CHECK_CONDITION)
- return scsi_dump_sense(dev_scsi, io->sbp, io->sb_len_wr);
+ return scsi_dump_sense(udev, dev_scsi, io->sbp, io->sb_len_wr);
else
return -1;
}
-static int scsi_dump_v4(struct scsi_id_device *dev_scsi, struct sg_io_v4 *io)
+static int scsi_dump_v4(struct udev *udev,
+ struct scsi_id_device *dev_scsi, struct sg_io_v4 *io)
{
if (!io->device_status && !io->transport_status &&
!io->driver_status) {
/*
* Impossible, should not be called.
*/
- info("%s: called with no error\n", __FUNCTION__);
+ info(udev, "%s: called with no error\n", __FUNCTION__);
return -1;
}
- info("%s: sg_io failed status 0x%x 0x%x 0x%x\n",
+ info(udev, "%s: sg_io failed status 0x%x 0x%x 0x%x\n",
dev_scsi->kernel, io->driver_status, io->transport_status,
io->device_status);
if (io->device_status == SCSI_CHECK_CONDITION)
- return scsi_dump_sense(dev_scsi, (unsigned char *)io->response,
+ return scsi_dump_sense(udev, dev_scsi, (unsigned char *)io->response,
io->response_len);
else
return -1;
}
-static int scsi_inquiry(struct scsi_id_device *dev_scsi, int fd,
+static int scsi_inquiry(struct udev *udev,
+ struct scsi_id_device *dev_scsi, int fd,
unsigned char evpd, unsigned char page,
unsigned char *buf, unsigned int buflen)
{
@@ -313,12 +319,12 @@ static int scsi_inquiry(struct scsi_id_device *dev_scsi, int fd,
int retry = 3; /* rather random */
if (buflen > SCSI_INQ_BUFF_LEN) {
- info("buflen %d too long\n", buflen);
+ info(udev, "buflen %d too long\n", buflen);
return -1;
}
resend:
- dbg("%s evpd %d, page 0x%x\n", dev_scsi->kernel, evpd, page);
+ dbg(udev, "%s evpd %d, page 0x%x\n", dev_scsi->kernel, evpd, page);
if (dev_scsi->use_sg == 4) {
struct sg_io_v4 io_v4;
@@ -356,14 +362,14 @@ resend:
dev_scsi->use_sg = 3;
goto resend;
}
- info("%s: ioctl failed: %s\n", dev_scsi->kernel, strerror(errno));
+ info(udev, "%s: ioctl failed: %s\n", dev_scsi->kernel, strerror(errno));
goto error;
}
if (dev_scsi->use_sg == 4)
- retval = sg_err_category4(io_buf);
+ retval = sg_err_category4(udev, io_buf);
else
- retval = sg_err_category3(io_buf);
+ retval = sg_err_category3(udev, io_buf);
switch (retval) {
case SG_ERR_CAT_NOTSUPPORTED:
@@ -376,16 +382,16 @@ resend:
default:
if (dev_scsi->use_sg == 4)
- retval = scsi_dump_v4(dev_scsi, io_buf);
+ retval = scsi_dump_v4(udev, dev_scsi, io_buf);
else
- retval = scsi_dump(dev_scsi, io_buf);
+ retval = scsi_dump(udev, dev_scsi, io_buf);
}
if (!retval) {
retval = buflen;
} else if (retval > 0) {
if (--retry > 0) {
- dbg("%s: Retrying ...\n", dev_scsi->kernel);
+ dbg(udev, "%s: Retrying ...\n", dev_scsi->kernel);
goto resend;
}
retval = -1;
@@ -393,29 +399,30 @@ resend:
error:
if (retval < 0)
- info("%s: Unable to get INQUIRY vpd %d page 0x%x.\n",
+ info(udev, "%s: Unable to get INQUIRY vpd %d page 0x%x.\n",
dev_scsi->kernel, evpd, page);
return retval;
}
/* Get list of supported EVPD pages */
-static int do_scsi_page0_inquiry(struct scsi_id_device *dev_scsi, int fd,
+static int do_scsi_page0_inquiry(struct udev *udev,
+ struct scsi_id_device *dev_scsi, int fd,
unsigned char *buffer, unsigned int len)
{
int retval;
memset(buffer, 0, len);
- retval = scsi_inquiry(dev_scsi, fd, 1, 0x0, buffer, len);
+ retval = scsi_inquiry(udev, dev_scsi, fd, 1, 0x0, buffer, len);
if (retval < 0)
return 1;
if (buffer[1] != 0) {
- info("%s: page 0 not available.\n", dev_scsi->kernel);
+ info(udev, "%s: page 0 not available.\n", dev_scsi->kernel);
return 1;
}
if (buffer[3] > len) {
- info("%s: page 0 buffer too long %d\n", dev_scsi->kernel, buffer[3]);
+ info(udev, "%s: page 0 buffer too long %d\n", dev_scsi->kernel, buffer[3]);
return 1;
}
@@ -432,7 +439,7 @@ static int do_scsi_page0_inquiry(struct scsi_id_device *dev_scsi, int fd,
* invalid.
*/
if (!strncmp((char *)&buffer[VENDOR_LENGTH], dev_scsi->vendor, VENDOR_LENGTH)) {
- info("%s: invalid page0 data\n", dev_scsi->kernel);
+ info(udev, "%s: invalid page0 data\n", dev_scsi->kernel);
return 1;
}
}
@@ -443,7 +450,8 @@ static int do_scsi_page0_inquiry(struct scsi_id_device *dev_scsi, int fd,
* The caller checks that serial is long enough to include the vendor +
* model.
*/
-static int prepend_vendor_model(struct scsi_id_device *dev_scsi, char *serial)
+static int prepend_vendor_model(struct udev *udev,
+ struct scsi_id_device *dev_scsi, char *serial)
{
int ind;
@@ -459,7 +467,7 @@ static int prepend_vendor_model(struct scsi_id_device *dev_scsi, char *serial)
* above, ind will never be too large.
*/
if (ind != (VENDOR_LENGTH + MODEL_LENGTH)) {
- info("%s: expected length %d, got length %d\n",
+ info(udev, "%s: expected length %d, got length %d\n",
dev_scsi->kernel, (VENDOR_LENGTH + MODEL_LENGTH), ind);
return 1;
}
@@ -470,7 +478,8 @@ static int prepend_vendor_model(struct scsi_id_device *dev_scsi, char *serial)
* check_fill_0x83_id - check the page 0x83 id, if OK allocate and fill
* serial number.
**/
-static int check_fill_0x83_id(struct scsi_id_device *dev_scsi,
+static int check_fill_0x83_id(struct udev *udev,
+ struct scsi_id_device *dev_scsi,
unsigned char *page_83,
const struct scsi_id_search_values
*id_search, char *serial, char *serial_short, int max_len)
@@ -517,7 +526,7 @@ static int check_fill_0x83_id(struct scsi_id_device *dev_scsi,
len += VENDOR_LENGTH + MODEL_LENGTH;
if (max_len < len) {
- info("%s: length %d too short - need %d\n",
+ info(udev, "%s: length %d too short - need %d\n",
dev_scsi->kernel, max_len, len);
return 1;
}
@@ -531,8 +540,8 @@ static int check_fill_0x83_id(struct scsi_id_device *dev_scsi,
* included in the identifier.
*/
if (id_search->id_type == SCSI_ID_VENDOR_SPECIFIC)
- if (prepend_vendor_model(dev_scsi, &serial[1]) < 0) {
- dbg("prepend failed\n");
+ if (prepend_vendor_model(udev, dev_scsi, &serial[1]) < 0) {
+ dbg(udev, "prepend failed\n");
return 1;
}
@@ -561,14 +570,15 @@ static int check_fill_0x83_id(struct scsi_id_device *dev_scsi,
}
/* Extract the raw binary from VPD 0x83 pre-SPC devices */
-static int check_fill_0x83_prespc3(struct scsi_id_device *dev_scsi,
+static int check_fill_0x83_prespc3(struct udev *udev,
+ struct scsi_id_device *dev_scsi,
unsigned char *page_83,
const struct scsi_id_search_values
*id_search, char *serial, char *serial_short, int max_len)
{
int i, j;
- dbg("using pre-spc3-83 for %s\n", dev_scsi->kernel);
+ dbg(udev, "using pre-spc3-83 for %s\n", dev_scsi->kernel);
serial[0] = hex_str[id_search->id_type];
/* serial has been memset to zero before */
j = strlen(serial); /* j = 1; */
@@ -583,7 +593,8 @@ static int check_fill_0x83_prespc3(struct scsi_id_device *dev_scsi,
/* Get device identification VPD page */
-static int do_scsi_page83_inquiry(struct scsi_id_device *dev_scsi, int fd,
+static int do_scsi_page83_inquiry(struct udev *udev,
+ struct scsi_id_device *dev_scsi, int fd,
char *serial, char *serial_short, int len)
{
int retval;
@@ -591,13 +602,13 @@ static int do_scsi_page83_inquiry(struct scsi_id_device *dev_scsi, int fd,
unsigned char page_83[SCSI_INQ_BUFF_LEN];
memset(page_83, 0, SCSI_INQ_BUFF_LEN);
- retval = scsi_inquiry(dev_scsi, fd, 1, PAGE_83, page_83,
+ retval = scsi_inquiry(udev, dev_scsi, fd, 1, PAGE_83, page_83,
SCSI_INQ_BUFF_LEN);
if (retval < 0)
return 1;
if (page_83[1] != PAGE_83) {
- info("%s: Invalid page 0x83\n", dev_scsi->kernel);
+ info(udev, "%s: Invalid page 0x83\n", dev_scsi->kernel);
return 1;
}
@@ -631,7 +642,8 @@ static int do_scsi_page83_inquiry(struct scsi_id_device *dev_scsi, int fd,
*/
if (page_83[6] != 0)
- return check_fill_0x83_prespc3(dev_scsi, page_83, id_search_list,
+ return check_fill_0x83_prespc3(udev,
+ dev_scsi, page_83, id_search_list,
serial, serial_short, len);
/*
@@ -645,21 +657,22 @@ static int do_scsi_page83_inquiry(struct scsi_id_device *dev_scsi, int fd,
* one or a small number of descriptors.
*/
for (j = 4; j <= (unsigned int)page_83[3] + 3; j += page_83[j + 3] + 4) {
- retval = check_fill_0x83_id(dev_scsi, &page_83[j],
+ retval = check_fill_0x83_id(udev,
+ dev_scsi, &page_83[j],
&id_search_list[id_ind],
serial, serial_short, len);
- dbg("%s id desc %d/%d/%d\n", dev_scsi->kernel,
+ dbg(udev, "%s id desc %d/%d/%d\n", dev_scsi->kernel,
id_search_list[id_ind].id_type,
id_search_list[id_ind].naa_type,
id_search_list[id_ind].code_set);
if (!retval) {
- dbg(" used\n");
+ dbg(udev, " used\n");
return retval;
} else if (retval < 0) {
- dbg(" failed\n");
+ dbg(udev, " failed\n");
return retval;
} else {
- dbg(" not used\n");
+ dbg(udev, " not used\n");
}
}
}
@@ -673,20 +686,21 @@ static int do_scsi_page83_inquiry(struct scsi_id_device *dev_scsi, int fd,
* Return the hard coded error code value 2 if the page 83 reply is not
* conformant to the SCSI-2 format.
*/
-static int do_scsi_page83_prespc3_inquiry(struct scsi_id_device *dev_scsi, int fd,
- char *serial, char *serial_short, int len)
+static int do_scsi_page83_prespc3_inquiry(struct udev *udev,
+ struct scsi_id_device *dev_scsi, int fd,
+ char *serial, char *serial_short, int len)
{
int retval;
int i, j;
unsigned char page_83[SCSI_INQ_BUFF_LEN];
memset(page_83, 0, SCSI_INQ_BUFF_LEN);
- retval = scsi_inquiry(dev_scsi, fd, 1, PAGE_83, page_83, SCSI_INQ_BUFF_LEN);
+ retval = scsi_inquiry(udev, dev_scsi, fd, 1, PAGE_83, page_83, SCSI_INQ_BUFF_LEN);
if (retval < 0)
return 1;
if (page_83[1] != PAGE_83) {
- info("%s: Invalid page 0x83\n", dev_scsi->kernel);
+ info(udev, "%s: Invalid page 0x83\n", dev_scsi->kernel);
return 1;
}
/*
@@ -730,12 +744,13 @@ static int do_scsi_page83_prespc3_inquiry(struct scsi_id_device *dev_scsi, int f
serial[j++] = hex_str[page_83[i] & 0x0f];
i++;
}
- dbg("using pre-spc3-83 for %s\n", dev_scsi->kernel);
+ dbg(udev, "using pre-spc3-83 for %s\n", dev_scsi->kernel);
return 0;
}
/* Get unit serial number VPD page */
-static int do_scsi_page80_inquiry(struct scsi_id_device *dev_scsi, int fd,
+static int do_scsi_page80_inquiry(struct udev *udev,
+ struct scsi_id_device *dev_scsi, int fd,
char *serial, char *serial_short, int max_len)
{
int retval;
@@ -745,18 +760,18 @@ static int do_scsi_page80_inquiry(struct scsi_id_device *dev_scsi, int fd,
unsigned char buf[SCSI_INQ_BUFF_LEN];
memset(buf, 0, SCSI_INQ_BUFF_LEN);
- retval = scsi_inquiry(dev_scsi, fd, 1, PAGE_80, buf, SCSI_INQ_BUFF_LEN);
+ retval = scsi_inquiry(udev, dev_scsi, fd, 1, PAGE_80, buf, SCSI_INQ_BUFF_LEN);
if (retval < 0)
return retval;
if (buf[1] != PAGE_80) {
- info("%s: Invalid page 0x80\n", dev_scsi->kernel);
+ info(udev, "%s: Invalid page 0x80\n", dev_scsi->kernel);
return 1;
}
len = 1 + VENDOR_LENGTH + MODEL_LENGTH + buf[3];
if (max_len < len) {
- info("%s: length %d too short - need %d\n",
+ info(udev, "%s: length %d too short - need %d\n",
dev_scsi->kernel, max_len, len);
return 1;
}
@@ -765,7 +780,7 @@ static int do_scsi_page80_inquiry(struct scsi_id_device *dev_scsi, int fd,
* specific type where we prepend '0' + vendor + model.
*/
serial[0] = 'S';
- ser_ind = prepend_vendor_model(dev_scsi, &serial[1]);
+ ser_ind = prepend_vendor_model(udev, dev_scsi, &serial[1]);
if (ser_ind < 0)
return 1;
len = buf[3];
@@ -776,23 +791,24 @@ static int do_scsi_page80_inquiry(struct scsi_id_device *dev_scsi, int fd,
return 0;
}
-int scsi_std_inquiry(struct scsi_id_device *dev_scsi, const char *devname)
+int scsi_std_inquiry(struct udev *udev,
+ struct scsi_id_device *dev_scsi, const char *devname)
{
int fd;
unsigned char buf[SCSI_INQ_BUFF_LEN];
struct stat statbuf;
int err = 0;
- dbg("opening %s\n", devname);
+ dbg(udev, "opening %s\n", devname);
fd = open(devname, O_RDONLY | O_NONBLOCK);
if (fd < 0) {
- info("scsi_id: cannot open %s: %s\n",
+ info(udev, "scsi_id: cannot open %s: %s\n",
devname, strerror(errno));
return 1;
}
if (fstat(fd, &statbuf) < 0) {
- info("scsi_id: cannot stat %s: %s\n",
+ info(udev, "scsi_id: cannot stat %s: %s\n",
devname, strerror(errno));
err = 2;
goto out;
@@ -801,7 +817,7 @@ int scsi_std_inquiry(struct scsi_id_device *dev_scsi, const char *devname)
minor(statbuf.st_rdev));
memset(buf, 0, SCSI_INQ_BUFF_LEN);
- err = scsi_inquiry(dev_scsi, fd, 0, 0, buf, SCSI_INQ_BUFF_LEN);
+ err = scsi_inquiry(udev, dev_scsi, fd, 0, 0, buf, SCSI_INQ_BUFF_LEN);
if (err < 0)
goto out;
@@ -819,8 +835,9 @@ out:
return err;
}
-int scsi_get_serial (struct scsi_id_device *dev_scsi, const char *devname,
- int page_code, char *serial_short, int len)
+int scsi_get_serial(struct udev *udev,
+ struct scsi_id_device *dev_scsi, const char *devname,
+ int page_code, char *serial_short, int len)
{
unsigned char page0[SCSI_INQ_BUFF_LEN];
int fd = -1;
@@ -829,12 +846,12 @@ int scsi_get_serial (struct scsi_id_device *dev_scsi, const char *devname,
int retval;
memset(dev_scsi->serial, 0, len);
- dbg("opening %s\n", devname);
+ dbg(udev, "opening %s\n", devname);
while (--cnt) {
fd = open(devname, O_RDONLY | O_NONBLOCK);
if (fd >= 0)
break;
- info("%s: cannot open %s: %s\n", dev_scsi->kernel, devname, strerror(errno));
+ info(udev, "%s: cannot open %s: %s\n", dev_scsi->kernel, devname, strerror(errno));
if (errno != EBUSY)
break;
usleep(500000 + (rand() % 100000) );
@@ -843,7 +860,7 @@ int scsi_get_serial (struct scsi_id_device *dev_scsi, const char *devname,
return 1;
if (page_code == PAGE_80) {
- if (do_scsi_page80_inquiry(dev_scsi, fd, dev_scsi->serial, serial_short, len)) {
+ if (do_scsi_page80_inquiry(udev, dev_scsi, fd, dev_scsi->serial, serial_short, len)) {
retval = 1;
goto completed;
} else {
@@ -851,7 +868,7 @@ int scsi_get_serial (struct scsi_id_device *dev_scsi, const char *devname,
goto completed;
}
} else if (page_code == PAGE_83) {
- if (do_scsi_page83_inquiry(dev_scsi, fd, dev_scsi->serial, serial_short, len)) {
+ if (do_scsi_page83_inquiry(udev, dev_scsi, fd, dev_scsi->serial, serial_short, len)) {
retval = 1;
goto completed;
} else {
@@ -859,7 +876,7 @@ int scsi_get_serial (struct scsi_id_device *dev_scsi, const char *devname,
goto completed;
}
} else if (page_code == PAGE_83_PRE_SPC3) {
- retval = do_scsi_page83_prespc3_inquiry(dev_scsi, fd, dev_scsi->serial, serial_short, len);
+ retval = do_scsi_page83_prespc3_inquiry(udev, dev_scsi, fd, dev_scsi->serial, serial_short, len);
if (retval) {
/*
* Fallback to servicing a SPC-2/3 compliant page 83
@@ -867,7 +884,7 @@ int scsi_get_serial (struct scsi_id_device *dev_scsi, const char *devname,
* conform to pre-SPC3 expectations.
*/
if (retval == 2) {
- if (do_scsi_page83_inquiry(dev_scsi, fd, dev_scsi->serial, serial_short, len)) {
+ if (do_scsi_page83_inquiry(udev, dev_scsi, fd, dev_scsi->serial, serial_short, len)) {
retval = 1;
goto completed;
} else {
@@ -884,7 +901,7 @@ int scsi_get_serial (struct scsi_id_device *dev_scsi, const char *devname,
goto completed;
}
} else if (page_code != 0x00) {
- info("%s: unsupported page code 0x%d\n", dev_scsi->kernel, page_code);
+ info(udev, "%s: unsupported page code 0x%d\n", dev_scsi->kernel, page_code);
return 1;
}
@@ -892,7 +909,7 @@ int scsi_get_serial (struct scsi_id_device *dev_scsi, const char *devname,
* Get page 0, the page of the pages. By default, try from best to
* worst of supported pages: 0x83 then 0x80.
*/
- if (do_scsi_page0_inquiry(dev_scsi, fd, page0, SCSI_INQ_BUFF_LEN)) {
+ if (do_scsi_page0_inquiry(udev, dev_scsi, fd, page0, SCSI_INQ_BUFF_LEN)) {
/*
* Don't try anything else. Black list if a specific page
* should be used for this vendor+model, or maybe have an
@@ -902,11 +919,11 @@ int scsi_get_serial (struct scsi_id_device *dev_scsi, const char *devname,
goto completed;
}
- dbg("%s: Checking page0\n", dev_scsi->kernel);
+ dbg(udev, "%s: Checking page0\n", dev_scsi->kernel);
for (ind = 4; ind <= page0[3] + 3; ind++)
if (page0[ind] == PAGE_83)
- if (!do_scsi_page83_inquiry(dev_scsi, fd,
+ if (!do_scsi_page83_inquiry(udev, dev_scsi, fd,
dev_scsi->serial, serial_short, len)) {
/*
* Success
@@ -917,7 +934,7 @@ int scsi_get_serial (struct scsi_id_device *dev_scsi, const char *devname,
for (ind = 4; ind <= page0[3] + 3; ind++)
if (page0[ind] == PAGE_80)
- if (!do_scsi_page80_inquiry(dev_scsi, fd,
+ if (!do_scsi_page80_inquiry(udev, dev_scsi, fd,
dev_scsi->serial, serial_short, len)) {
/*
* Success
diff --git a/extras/usb_id/Makefile.am b/extras/usb_id/Makefile.am
index 0de004a228..9d7e7724ec 100644
--- a/extras/usb_id/Makefile.am
+++ b/extras/usb_id/Makefile.am
@@ -4,10 +4,13 @@ udevhome_PROGRAMS = \
AM_CPPFLAGS = \
-DSYSCONFDIR=\""$(sysconfdir)"\" \
- -DUDEV_PREFIX=\""$(udev_prefix)"\"
+ -DUDEV_PREFIX=\""$(udev_prefix)"\" \
+ -D_LIBUDEV_COMPILATION
usb_id_SOURCES = \
usb_id.c \
+ ../../udev/lib/libudev.h \
+ ../../udev/lib/libudev.c \
../../udev/udev_sysfs.c \
../../udev/udev_sysdeps.c \
../../udev/udev_utils.c \
diff --git a/extras/usb_id/usb_id.c b/extras/usb_id/usb_id.c
index 92492c8665..fb4c28ac3e 100644
--- a/extras/usb_id/usb_id.c
+++ b/extras/usb_id/usb_id.c
@@ -28,30 +28,12 @@
#define MAX_SERIAL_LEN 256
#define BLKGETSIZE64 _IOR(0x12,114,size_t)
-#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 char vendor_str[64];
static char model_str[64];
@@ -219,7 +201,7 @@ static void set_scsi_type(char *to, const char *from, size_t len)
* 6.) If the device supplies a serial number, this number
* is concatenated with the identification with an underscore '_'.
*/
-static int usb_id(const char *devpath)
+static int usb_id(struct udev *udev, const char *devpath)
{
struct sysfs_device *dev;
struct sysfs_device *dev_interface;
@@ -231,38 +213,38 @@ static int usb_id(const char *devpath)
dbg("devpath %s\n", devpath);
/* get all usb specific information: dev_interface, if_class, dev_usb */
- dev = sysfs_device_get(devpath);
+ dev = sysfs_device_get(udev, devpath);
if (dev == NULL) {
- err("unable to access '%s'\n", devpath);
+ err(udev, "unable to access '%s'\n", devpath);
return 1;
}
/* usb interface directory */
- dev_interface = sysfs_device_get_parent_with_subsystem(dev, "usb");
+ dev_interface = sysfs_device_get_parent_with_subsystem(udev, dev, "usb");
if (dev_interface == NULL) {
- info("unable to access usb_interface device of '%s'\n", devpath);
+ info(udev, "unable to access usb_interface device of '%s'\n", devpath);
return 1;
}
- if_class = sysfs_attr_get_value(dev_interface->devpath, "bInterfaceClass");
+ if_class = sysfs_attr_get_value(udev, dev_interface->devpath, "bInterfaceClass");
if (!if_class) {
- info("%s: cannot get bInterfaceClass attribute\n", dev_interface->kernel);
+ info(udev, "%s: cannot get bInterfaceClass attribute\n", dev_interface->kernel);
return 1;
}
if_class_num = strtoul(if_class, NULL, 16);
if (if_class_num == 8) {
- if_subclass = sysfs_attr_get_value(dev_interface->devpath, "bInterfaceSubClass");
+ if_subclass = sysfs_attr_get_value(udev, dev_interface->devpath, "bInterfaceSubClass");
if (if_subclass != NULL)
protocol = set_usb_mass_storage_ifsubtype(type_str, if_subclass, sizeof(type_str)-1);
} else
set_usb_iftype(type_str, if_class_num, sizeof(type_str)-1);
- info("%s: if_class %d protocol %d\n", dev_interface->devpath, if_class_num, protocol);
+ info(udev, "%s: if_class %d protocol %d\n", dev_interface->devpath, if_class_num, protocol);
/* usb device directory */
- dev_usb = sysfs_device_get_parent_with_subsystem(dev_interface, "usb");
+ dev_usb = sysfs_device_get_parent_with_subsystem(udev, dev_interface, "usb");
if (!dev_usb) {
- info("unable to find parent 'usb' device of '%s'\n", devpath);
+ info(udev, "unable to find parent 'usb' device of '%s'\n", devpath);
return 1;
}
@@ -273,41 +255,41 @@ static int usb_id(const char *devpath)
int host, bus, target, lun;
/* get scsi device */
- dev_scsi = sysfs_device_get_parent_with_subsystem(dev, "scsi");
+ dev_scsi = sysfs_device_get_parent_with_subsystem(udev, dev, "scsi");
if (dev_scsi == NULL) {
- info("unable to find parent 'scsi' device of '%s'\n", devpath);
+ info(udev, "unable to find parent 'scsi' device of '%s'\n", devpath);
goto fallback;
}
if (sscanf(dev_scsi->kernel, "%d:%d:%d:%d", &host, &bus, &target, &lun) != 4) {
- info("invalid scsi device '%s'\n", dev_scsi->kernel);
+ info(udev, "invalid scsi device '%s'\n", dev_scsi->kernel);
goto fallback;
}
/* Generic SPC-2 device */
- scsi_vendor = sysfs_attr_get_value(dev_scsi->devpath, "vendor");
+ scsi_vendor = sysfs_attr_get_value(udev, dev_scsi->devpath, "vendor");
if (!scsi_vendor) {
- info("%s: cannot get SCSI vendor attribute\n", dev_scsi->kernel);
+ info(udev, "%s: cannot get SCSI vendor attribute\n", dev_scsi->kernel);
goto fallback;
}
set_str(vendor_str, scsi_vendor, sizeof(vendor_str)-1);
- scsi_model = sysfs_attr_get_value(dev_scsi->devpath, "model");
+ scsi_model = sysfs_attr_get_value(udev, dev_scsi->devpath, "model");
if (!scsi_model) {
- info("%s: cannot get SCSI model attribute\n", dev_scsi->kernel);
+ info(udev, "%s: cannot get SCSI model attribute\n", dev_scsi->kernel);
goto fallback;
}
set_str(model_str, scsi_model, sizeof(model_str)-1);
- scsi_type = sysfs_attr_get_value(dev_scsi->devpath, "type");
+ scsi_type = sysfs_attr_get_value(udev, dev_scsi->devpath, "type");
if (!scsi_type) {
- info("%s: cannot get SCSI type attribute\n", dev_scsi->kernel);
+ info(udev, "%s: cannot get SCSI type attribute\n", dev_scsi->kernel);
goto fallback;
}
set_scsi_type(type_str, scsi_type, sizeof(type_str)-1);
- scsi_rev = sysfs_attr_get_value(dev_scsi->devpath, "rev");
+ scsi_rev = sysfs_attr_get_value(udev, dev_scsi->devpath, "rev");
if (!scsi_rev) {
- info("%s: cannot get SCSI revision attribute\n", dev_scsi->kernel);
+ info(udev, "%s: cannot get SCSI revision attribute\n", dev_scsi->kernel);
goto fallback;
}
set_str(revision_str, scsi_rev, sizeof(revision_str)-1);
@@ -325,13 +307,13 @@ fallback:
const char *usb_vendor = NULL;
if (!use_num_info)
- usb_vendor = sysfs_attr_get_value(dev_usb->devpath, "manufacturer");
+ usb_vendor = sysfs_attr_get_value(udev, dev_usb->devpath, "manufacturer");
if (!usb_vendor)
- usb_vendor = sysfs_attr_get_value(dev_usb->devpath, "idVendor");
+ usb_vendor = sysfs_attr_get_value(udev, dev_usb->devpath, "idVendor");
if (!usb_vendor) {
- info("No USB vendor information available\n");
+ info(udev, "No USB vendor information available\n");
return 1;
}
set_str(vendor_str, usb_vendor, sizeof(vendor_str)-1);
@@ -341,10 +323,10 @@ fallback:
const char *usb_model = NULL;
if (!use_num_info)
- usb_model = sysfs_attr_get_value(dev_usb->devpath, "product");
+ usb_model = sysfs_attr_get_value(udev, dev_usb->devpath, "product");
if (!usb_model)
- usb_model = sysfs_attr_get_value(dev_usb->devpath, "idProduct");
+ usb_model = sysfs_attr_get_value(udev, dev_usb->devpath, "idProduct");
if (!usb_model) {
dbg("No USB model information available\n");
@@ -356,7 +338,7 @@ fallback:
if (revision_str[0] == '\0') {
const char *usb_rev;
- usb_rev = sysfs_attr_get_value(dev_usb->devpath, "bcdDevice");
+ usb_rev = sysfs_attr_get_value(udev, dev_usb->devpath, "bcdDevice");
if (usb_rev)
set_str(revision_str, usb_rev, sizeof(revision_str)-1);
}
@@ -364,7 +346,7 @@ fallback:
if (serial_str[0] == '\0') {
const char *usb_serial;
- usb_serial = sysfs_attr_get_value(dev_usb->devpath, "serial");
+ usb_serial = sysfs_attr_get_value(udev, dev_usb->devpath, "serial");
if (usb_serial)
set_str(serial_str, usb_serial, sizeof(serial_str)-1);
}
@@ -373,6 +355,7 @@ fallback:
int main(int argc, char **argv)
{
+ struct udev *udev;
int retval = 0;
const char *env;
char devpath[MAX_PATH_LEN];
@@ -385,7 +368,12 @@ int main(int argc, char **argv)
{}
};
+ udev = udev_new();
+ if (udev == NULL)
+ goto exit;
+
logging_init("usb_id");
+ udev_set_log_fn(udev, log_fn);
sysfs_init();
while (1) {
@@ -430,7 +418,7 @@ int main(int argc, char **argv)
strlcpy(devpath, argv[optind], sizeof(devpath));
}
- retval = usb_id(devpath);
+ retval = usb_id(udev, devpath);
if (retval == 0) {
char serial[256];
@@ -463,6 +451,7 @@ int main(int argc, char **argv)
}
exit:
+ udev_unref(udev);
sysfs_cleanup();
logging_close();
return retval;
diff --git a/extras/volume_id/Makefile.am b/extras/volume_id/Makefile.am
index bc1b262f27..fe9bef7b88 100644
--- a/extras/volume_id/Makefile.am
+++ b/extras/volume_id/Makefile.am
@@ -7,10 +7,14 @@ udevhome_PROGRAMS = \
AM_CPPFLAGS = \
-DSYSCONFDIR=\""$(sysconfdir)"\" \
- -DUDEV_PREFIX=\""$(udev_prefix)"\"
+ -DUDEV_PREFIX=\""$(udev_prefix)"\" \
+ -D_LIBUDEV_COMPILATION
vol_id_SOURCES = \
vol_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/volume_id/vol_id.c b/extras/volume_id/vol_id.c
index b3f810fc9d..dcfb0bb92f 100644
--- a/extras/volume_id/vol_id.c
+++ b/extras/volume_id/vol_id.c
@@ -39,43 +39,20 @@
#define BLKGETSIZE64 _IOR(0x12,114,size_t)
-#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 vid_log(int priority, const char *file, int line, const char *format, ...)
{
-#ifdef USE_LOG
- char log_str[1024];
va_list args;
va_start(args, format);
- vsnprintf(log_str, sizeof(log_str), format, args);
- log_str[sizeof(log_str)-1] = '\0';
- log_message(priority, "%s:%i %s", file, line, log_str);
+ log_fn(NULL, priority, file, line, NULL, format, args);
va_end(args);
-#endif
return;
}
@@ -126,6 +103,7 @@ static int all_probers(volume_id_probe_fn_t probe_fn,
int main(int argc, char *argv[])
{
+ struct udev *udev;
static const struct option options[] = {
{ "label", 0, NULL, 'l' },
{ "label-raw", 0, NULL, 'L' },
@@ -161,7 +139,11 @@ int main(int argc, char *argv[])
int retval;
int rc = 0;
+ udev = udev_new();
+ if (udev == NULL)
+ goto exit;
logging_init("vol_id");
+ udev_set_log_fn(udev, log_fn);
/* hook in our debug into libvolume_id */
volume_id_log_fn = vid_log;
@@ -219,7 +201,7 @@ int main(int argc, char *argv[])
node = argv[optind];
if (!node) {
- err("no device\n");
+ err(udev, "no device\n");
fprintf(stderr, "no device\n");
rc = 1;
goto exit;
@@ -240,7 +222,7 @@ int main(int argc, char *argv[])
if (ioctl(fd, BLKGETSIZE64, &size) != 0)
size = 0;
- dbg("BLKGETSIZE64=%llu\n", (unsigned long long)size);
+ dbg(udev, "BLKGETSIZE64=%llu\n", (unsigned long long)size);
/* try to drop all privileges before reading disk content */
if (getuid() == 0) {
@@ -251,7 +233,7 @@ int main(int argc, char *argv[])
if (setgroups(0, NULL) != 0 ||
setgid(pw->pw_gid) != 0 ||
setuid(pw->pw_uid) != 0)
- info("unable to drop privileges: %s\n\n", strerror(errno));
+ info(udev, "unable to drop privileges: %s\n\n", strerror(errno));
}
}
@@ -325,7 +307,7 @@ int main(int argc, char *argv[])
exit:
if (vid != NULL)
volume_id_close(vid);
-
+ udev_unref(udev);
logging_close();
return rc;
}
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-11-15 05:27:16 +0000