replace libsysfs

We never used any of the libsysfs convenience features. Here we replace
it completely with 300 lines of code, which are much simpler and a bit
faster cause udev(d) does not open any syfs file for a simple event which
does not need any parent device information.

Signed-off-by: Kay Sievers <kay.sievers@suse.de>

23 files changed, 390 insertions, 598 deletions

diff --git a/extras/ata_id/Makefile b/extras/ata_id/Makefile
index ebf0f4e9b4..0a881fb194 100644
--- a/extras/ata_id/Makefile
+++ b/extras/ata_id/Makefile
@@ -33,7 +33,7 @@ all: $(PROG) $(MAN_PAGES)
 	$(QUIET) $(CC) -c $(CFLAGS) $< -o $@
 
 $(PROG): %: $(HEADERS) %.o $(OBJS)
-	$(QUIET) $(LD) $(LDFLAGS) $@.o $(OBJS) -o $@ $(LIBUDEV) $(LIBSYSFS) $(LIB_OBJS)
+	$(QUIET) $(LD) $(LDFLAGS) $@.o $(OBJS) -o $@ $(LIBUDEV) $(LIB_OBJS)
 ifneq ($(STRIPCMD),)
 	$(QUIET) $(STRIPCMD) $@
 endif
diff --git a/extras/ata_id/ata_id.c b/extras/ata_id/ata_id.c
index a97cc284cc..aedebff711 100644
--- a/extras/ata_id/ata_id.c
+++ b/extras/ata_id/ata_id.c
@@ -17,6 +17,7 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <ctype.h>
+#include <string.h>
 #include <errno.h>
 #include <sys/ioctl.h>
 #include <sys/types.h>
@@ -24,8 +25,7 @@
 #include <linux/types.h>
 #include <linux/hdreg.h>
 
-#include "../../logging.h"
-#include "../../udev_utils.h"
+#include "../../udev.h"
 
 #ifdef USE_LOG
 void log_message(int priority, const char *format, ...)
diff --git a/extras/cdrom_id/Makefile b/extras/cdrom_id/Makefile
index 985eb805a5..9a722d52f9 100644
--- a/extras/cdrom_id/Makefile
+++ b/extras/cdrom_id/Makefile
@@ -33,7 +33,7 @@ all: $(PROG) $(MAN_PAGES)
 	$(QUIET) $(CC) -c $(CFLAGS) $< -o $@
 
 $(PROG): %: $(HEADERS) %.o $(OBJS)
-	$(QUIET) $(LD) $(LDFLAGS) $@.o $(OBJS) -o $@ $(LIBUDEV) $(LIBSYSFS) $(LIB_OBJS)
+	$(QUIET) $(LD) $(LDFLAGS) $@.o $(OBJS) -o $@ $(LIBUDEV) $(LIB_OBJS)
 ifneq ($(strip $(STRIPCMD)),)
 	$(QUIET) $(STRIPCMD) $@
 endif
diff --git a/extras/cdrom_id/cdrom_id.c b/extras/cdrom_id/cdrom_id.c
index ff6f89e163..0d4a8c10f0 100644
--- a/extras/cdrom_id/cdrom_id.c
+++ b/extras/cdrom_id/cdrom_id.c
@@ -18,14 +18,14 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <ctype.h>
+#include <string.h>
 #include <errno.h>
 #include <sys/ioctl.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <linux/types.h>
 
-#include "../../logging.h"
-#include "../../udev_utils.h"
+#include "../../udev.h"
 
 /*
  * Taken from the cdrom.h kernel include file.
diff --git a/extras/dasd_id/Makefile b/extras/dasd_id/Makefile
index 80680f22fe..79f14a49ba 100644
--- a/extras/dasd_id/Makefile
+++ b/extras/dasd_id/Makefile
@@ -33,7 +33,7 @@ all: $(PROG) $(MAN_PAGES)
 	$(QUIET) $(CC) -c $(CFLAGS) $< -o $@
 
 $(PROG): %: $(HEADERS) %.o $(OBJS)
-	$(QUIET) $(LD) $(LDFLAGS) $@.o $(OBJS) -o $@ $(LIBUDEV) $(LIBSYSFS) $(LIB_OBJS)
+	$(QUIET) $(LD) $(LDFLAGS) $@.o $(OBJS) -o $@ $(LIBUDEV) $(LIB_OBJS)
 ifneq ($(strip $(STRIPCMD)),)
 	$(QUIET) $(STRIPCMD) $@
 endif
diff --git a/extras/dasd_id/dasd_id.c b/extras/dasd_id/dasd_id.c
index ca2582cde6..b2496e99f8 100644
--- a/extras/dasd_id/dasd_id.c
+++ b/extras/dasd_id/dasd_id.c
@@ -24,8 +24,7 @@
 #include <errno.h>
 #include <sys/ioctl.h>
 
-#include "../../logging.h"
-#include "../../udev_utils.h"
+#include "../../udev.h"
 
 #ifdef USE_LOG
 void log_message(int priority, const char *format, ...)
diff --git a/extras/edd_id/Makefile b/extras/edd_id/Makefile
index 5a6cdb65c3..db6afae18c 100644
--- a/extras/edd_id/Makefile
+++ b/extras/edd_id/Makefile
@@ -33,7 +33,7 @@ all: $(PROG) $(MAN_PAGES)
 	$(QUIET) $(CC) -c $(CFLAGS) $< -o $@
 
 $(PROG): %: $(HEADERS) %.o $(OBJS)
-	$(QUIET) $(LD) $(LDFLAGS) $@.o $(OBJS) -o $@ $(LIBUDEV) $(LIBSYSFS) $(LIB_OBJS)
+	$(QUIET) $(LD) $(LDFLAGS) $@.o $(OBJS) -o $@ $(LIBUDEV) $(LIB_OBJS)
 ifneq ($(strip $(STRIPCMD)),)
 	$(QUIET) $(STRIPCMD) $@
 endif
diff --git a/extras/edd_id/edd_id.c b/extras/edd_id/edd_id.c
index f21362b902..8fc690a49c 100644
--- a/extras/edd_id/edd_id.c
+++ b/extras/edd_id/edd_id.c
@@ -18,12 +18,12 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <ctype.h>
+#include <string.h>
 #include <errno.h>
 #include <dirent.h>
 #include <stdint.h>
 
-#include "../../logging.h"
-#include "../../udev_utils.h"
+#include "../../udev.h"
 
 #ifdef USE_LOG
 void log_message(int priority, const char *format, ...)
diff --git a/extras/firmware/Makefile b/extras/firmware/Makefile
index 16918867fc..da7fe9d1a8 100644
--- a/extras/firmware/Makefile
+++ b/extras/firmware/Makefile
@@ -33,7 +33,7 @@ all: $(PROG) $(MAN_PAGES)
 	$(QUIET) $(CC) -c $(CFLAGS) $< -o $@
 
 $(PROG): %: $(HEADERS) %.o $(OBJS)
-	$(QUIET) $(LD) $(LDFLAGS) $@.o $(OBJS) -o $@ $(LIBUDEV) $(LIBSYSFS) $(LIB_OBJS)
+	$(QUIET) $(LD) $(LDFLAGS) $@.o $(OBJS) -o $@ $(LIBUDEV) $(LIB_OBJS)
 ifneq ($(strip $(STRIPCMD)),)
 	$(QUIET) $(STRIPCMD) $@
 endif
diff --git a/extras/firmware/firmware_helper.c b/extras/firmware/firmware_helper.c
index 2bc6b50f06..ca1c43814f 100644
--- a/extras/firmware/firmware_helper.c
+++ b/extras/firmware/firmware_helper.c
@@ -17,8 +17,7 @@
 #include <unistd.h>
 #include <sys/stat.h>
 
-#include "../../udev_utils.h"
-#include "../../logging.h"
+#include "../../udev.h"
 
 #define FIRMWARE_PATH			"/lib/firmware"
 #define PATH_SIZE			256
diff --git a/extras/floppy/Makefile b/extras/floppy/Makefile
index 240af4ce05..e23191a533 100644
--- a/extras/floppy/Makefile
+++ b/extras/floppy/Makefile
@@ -33,7 +33,7 @@ all: $(PROG) $(MAN_PAGES)
 	$(QUIET) $(CC) -c $(CFLAGS) $< -o $@
 
 $(PROG): %: $(HEADERS) %.o $(OBJS)
-	$(QUIET) $(LD) $(LDFLAGS) $@.o $(OBJS) -o $@ $(LIBUDEV) $(LIBSYSFS) $(LIB_OBJS)
+	$(QUIET) $(LD) $(LDFLAGS) $@.o $(OBJS) -o $@ $(LIBUDEV) $(LIB_OBJS)
 ifneq ($(strip $(STRIPCMD)),)
 	$(QUIET) $(STRIPCMD) $@
 endif
diff --git a/extras/run_directory/Makefile b/extras/run_directory/Makefile
index d138f62c03..37a59597b9 100644
--- a/extras/run_directory/Makefile
+++ b/extras/run_directory/Makefile
@@ -32,7 +32,7 @@ all: $(PROG) $(MAN_PAGES)
 	$(QUIET) $(CC) -c $(CFLAGS) $< -o $@
 
 $(PROG): %: $(HEADERS) %.o $(OBJS)
-	$(QUIET) $(LD) $(LDFLAGS) $@.o $(OBJS) -o $@ $(LIBUDEV) $(LIBSYSFS) $(LIB_OBJS)
+	$(QUIET) $(LD) $(LDFLAGS) $@.o $(OBJS) -o $@ $(LIBUDEV) $(LIB_OBJS)
 ifneq ($(strip $(STRIPCMD)),)
 	$(QUIET) $(STRIPCMD) $@
 endif
diff --git a/extras/run_directory/run_directory.c b/extras/run_directory/run_directory.c
index 69faecc15e..c715ca6bd3 100644
--- a/extras/run_directory/run_directory.c
+++ b/extras/run_directory/run_directory.c
@@ -22,9 +22,7 @@
 #include <sys/wait.h>
 #include <sys/stat.h>
 
-#include "../../udev_utils.h"
-#include "../../list.h"
-#include "../../logging.h"
+#include "../../udev.h"
 #include "run_directory.h"
 
 static int exec_program(const char *filename, const char *subsystem)
diff --git a/extras/run_directory/udev_run_devd.c b/extras/run_directory/udev_run_devd.c
index e708de8aa4..59ea766ac2 100644
--- a/extras/run_directory/udev_run_devd.c
+++ b/extras/run_directory/udev_run_devd.c
@@ -22,9 +22,7 @@
 #include <sys/wait.h>
 #include <sys/stat.h>
 
-#include "../../udev_utils.h"
-#include "../../list.h"
-#include "../../logging.h"
+#include "../../udev.h"
 #include "run_directory.h"
 
 
diff --git a/extras/run_directory/udev_run_hotplugd.c b/extras/run_directory/udev_run_hotplugd.c
index a21835ae4e..bfa82ab917 100644
--- a/extras/run_directory/udev_run_hotplugd.c
+++ b/extras/run_directory/udev_run_hotplugd.c
@@ -22,9 +22,7 @@
 #include <sys/wait.h>
 #include <sys/stat.h>
 
-#include "../../udev_utils.h"
-#include "../../list.h"
-#include "../../logging.h"
+#include "../../udev.h"
 #include "run_directory.h"
 
 
diff --git a/extras/scsi_id/Makefile b/extras/scsi_id/Makefile
index 399de76911..057594d5bf 100644
--- a/extras/scsi_id/Makefile
+++ b/extras/scsi_id/Makefile
@@ -29,7 +29,6 @@ INSTALL_DATA  = ${INSTALL} -m 644
 INSTALL_SCRIPT = ${INSTALL_PROGRAM}
 
 # be able to run without udev
-LIBSYSFS = -lsysfs
 CROSS =
 QUIET =
 CC = $(CROSS)gcc
@@ -47,7 +46,7 @@ all: $(PROG) $(MAN_PAGES)
 	$(QUIET) $(CC) -c $(CFLAGS) $< -o $@
 
 $(PROG): %: $(HEADERS) %.o $(OBJS)
-	$(QUIET) $(LD) $(LDFLAGS) $@.o $(OBJS) -o $@ $(LIBUDEV) $(LIBSYSFS) $(LIB_OBJS)
+	$(QUIET) $(LD) $(LDFLAGS) $@.o $(OBJS) -o $@ $(LIBUDEV) $(LIB_OBJS)
 ifneq ($(strip $(STRIPCMD)),)
 	$(QUIET) $(STRIPCMD) $@
 endif
diff --git a/extras/scsi_id/scsi_id.c b/extras/scsi_id/scsi_id.c
index aa1b16009e..3a4a374d3e 100644
--- a/extras/scsi_id/scsi_id.c
+++ b/extras/scsi_id/scsi_id.c
@@ -32,37 +32,20 @@
 #include <stdarg.h>
 #include <ctype.h>
 #include <sys/stat.h>
-#include <sysfs/libsysfs.h>
-#include "scsi_id_version.h"
-#include "scsi_id.h"
 
-#ifndef SCSI_ID_VERSION
-#warning No version
-#define SCSI_ID_VERSION	"unknown"
-#endif
+#include "../../udev.h"
+#include "scsi_id.h"
+#include "scsi_id_version.h"
 
-/*
- * temporary names for mknod.
- */
-#define TMP_DIR	"/dev"
-#define TMP_PREFIX "tmp-scsi"
+/* temporary names for mknod  */
+#define TMP_DIR		"/dev"
+#define TMP_PREFIX	"tmp-scsi"
 
-/*
- * XXX Note the 'e' (send output to stderr in all cases), and 'c' (callout)
- * options are not supported, but other code is still left in place for
- * now.
- */
 static const char short_options[] = "abd:f:gip:s:uvVx";
-/*
- * Just duplicate per dev options.
- */
 static const char dev_short_options[] = "bgp:";
 
-char sysfs_mnt_path[SYSFS_PATH_MAX];
-
 static int all_good;
 static int always_info;
-static char *default_callout;
 static int dev_specified;
 static int sys_specified;
 static char config_file[MAX_NAME_LEN] = SCSI_ID_CONFIG_FILE;
@@ -78,28 +61,30 @@ static char model_str[64];
 static char revision_str[16];
 static char type_str[16];
 
-void log_message (int level, const char *format, ...)
+#ifdef USE_LOG
+void log_message(int priority, const char *format, ...)
 {
-	va_list	args;
+	va_list args;
+	static int udev_log = -1;
 
-	if (!debug && level == LOG_DEBUG)
-		return;
+	if (udev_log == -1) {
+		const char *value;
 
-	va_start (args, format);
-	if (!hotplug_mode || use_stderr) {
-		vfprintf(stderr, format, args);
-	} else {
-		static int logging_init = 0;
-		if (!logging_init) {
-			openlog ("scsi_id", LOG_PID, LOG_DAEMON);
-			logging_init = 1;
-		}
-
-		vsyslog(level, format, args);
+		value = getenv("UDEV_LOG");
+		if (value)
+			udev_log = log_priority(value);
+		else
+			udev_log = LOG_ERR;
 	}
-	va_end (args);
-	return;
+
+	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)
 {
@@ -171,68 +156,35 @@ static void set_type(char *to, const char *from, size_t len)
 	to[len-1] = '\0';
 }
 
-static int get_major_minor(struct sysfs_class_device *class_dev, int *maj,
-			   int *min)
+static int create_tmp_dev(const char *devpath, char *tmpdev, int dev_type)
 {
-	struct sysfs_attribute *dev_attr;
+	unsigned int maj, min;
+	const char *attr;
 
-	dev_attr = sysfs_get_classdev_attr(class_dev, "dev");
-	if (!dev_attr) {
-		/*
-		 * XXX This happens a lot, since sg has no dev attr.
-		 * And now sysfsutils does not set a meaningful errno
-		 * value. Someday change this back to a LOG_WARNING.
-		 * And if sysfsutils changes, check for ENOENT and handle
-		 * it separately.
-		 */
-		log_message(LOG_DEBUG, "%s: could not get dev attribute: %s\n",
-			class_dev->name, strerror(errno));
+	dbg("%s", devpath);
+	attr = sysfs_attr_get_value(devpath, "dev");
+	if (attr == NULL) {
+		dbg("%s: could not get dev attribute: %s", devpath, strerror(errno));
 		return -1;
 	}
 
-	dprintf("dev value %s", dev_attr->value); /* value has a trailing \n */
-	if (sscanf(dev_attr->value, "%u:%u", maj, min) != 2) {
-		log_message(LOG_WARNING, "%s: invalid dev major/minor\n",
-			    class_dev->name);
+	dbg("dev value %s", attr);
+	if (sscanf(attr, "%u:%u", &maj, &min) != 2) {
+		err("%s: invalid dev major/minor", devpath);
 		return -1;
 	}
 
-	return 0;
-}
-
-static int create_tmp_dev(struct sysfs_class_device *class_dev, char *tmpdev,
-			  int dev_type)
-{
-	int maj, min;
-
-	dprintf("(%s)\n", class_dev->name);
-
-	if (get_major_minor(class_dev, &maj, &min))
-		return -1;
 	snprintf(tmpdev, MAX_NAME_LEN, "%s/%s-maj%d-min%d-%u",
 		 TMP_DIR, TMP_PREFIX, maj, min, getpid());
 
-	dprintf("tmpdev '%s'\n", tmpdev);
-
+	dbg("tmpdev '%s'", tmpdev);
 	if (mknod(tmpdev, 0600 | dev_type, makedev(maj, min))) {
-		log_message(LOG_WARNING, "mknod failed: %s\n", strerror(errno));
+		err("mknod failed: %s", strerror(errno));
 		return -1;
 	}
 	return 0;
 }
 
-static int has_sysfs_prefix(const char *path, const char *prefix)
-{
-	char match[MAX_NAME_LEN];
-
-	strncpy(match, sysfs_mnt_path, MAX_NAME_LEN);
-	strncat(match, prefix, MAX_NAME_LEN);
-	if (strncmp(path, match, strlen(match)) == 0)
-		return 1;
-	else
-		return 0;
-}
-
 /*
  * get_value:
  *
@@ -289,8 +241,8 @@ static int argc_count(char *opts)
  *
  * vendor and model can end in '\n'.
  */
-static int get_file_options(char *vendor, char *model, int *argc,
-			    char ***newargv)
+static int get_file_options(const char *vendor, const char *model,
+			    int *argc, char ***newargv)
 {
 	char *buffer;
 	FILE *fd;
@@ -301,15 +253,14 @@ static int get_file_options(char *vendor, char *model, int *argc,
 	int c;
 	int retval = 0;
 
-	dprintf("vendor='%s'; model='%s'\n", vendor, model);
+	dbg("vendor='%s'; model='%s'\n", vendor, model);
 	fd = fopen(config_file, "r");
 	if (fd == NULL) {
-		dprintf("can't open %s\n", config_file);
+		dbg("can't open %s\n", config_file);
 		if (errno == ENOENT) {
 			return 1;
 		} else {
-			log_message(LOG_WARNING, "can't open %s: %s\n",
-				config_file, strerror(errno));
+			err("can't open %s: %s", config_file, strerror(errno));
 			return -1;
 		}
 	}
@@ -321,7 +272,7 @@ static int get_file_options(char *vendor, char *model, int *argc,
 	 */
 	buffer = malloc(MAX_BUFFER_LEN);
 	if (!buffer) {
-		log_message(LOG_WARNING, "Can't allocate memory.\n");
+		err("Can't allocate memory.");
 		return -1;
 	}
 
@@ -335,29 +286,22 @@ static int get_file_options(char *vendor, char *model, int *argc,
 			break;
 		lineno++;
 		if (buf[strlen(buffer) - 1] != '\n') {
-			log_message(LOG_WARNING,
-				    "Config file line %d too long.\n", lineno);
+			info("Config file line %d too long.\n", lineno);
 			break;
 		}
 
 		while (isspace(*buf))
 			buf++;
 
+		/* blank or all whitespace line */
 		if (*buf == '\0')
-			/*
-			 * blank or all whitespace line
-			 */
 			continue;
 
+		/* comment line */
 		if (*buf == '#')
-			/*
-			 * comment line
-			 */
 			continue;
 
-#ifdef LOTS
-		dprintf("lineno %d: '%s'\n", lineno, buf);
-#endif
+		dbg("lineno %d: '%s'\n", lineno, buf);
 		str1 = strsep(&buf, "=");
 		if (str1 && strcasecmp(str1, "VENDOR") == 0) {
 			str1 = get_value(&buf);
@@ -387,22 +331,20 @@ static int get_file_options(char *vendor, char *model, int *argc,
 			}
 			options_in = str1;
 		}
-		dprintf("config file line %d:"
+		dbg("config file line %d:"
 			" vendor '%s'; model '%s'; options '%s'\n",
 			lineno, vendor_in, model_in, options_in);
 		/*
 		 * Only allow: [vendor=foo[,model=bar]]options=stuff
 		 */
 		if (!options_in || (!vendor_in && model_in)) {
-			log_message(LOG_WARNING,
-				    "Error parsing config file line %d '%s'\n",
-				    lineno, buffer);
+			info("Error parsing config file line %d '%s'", lineno, buffer);
 			retval = -1;
 			break;
 		}
 		if (vendor == NULL) {
 			if (vendor_in == NULL) {
-				dprintf("matched global option\n");
+				dbg("matched global option\n");
 				break;
 			}
 		} else if ((vendor_in && strncmp(vendor, vendor_in,
@@ -416,10 +358,10 @@ static int get_file_options(char *vendor, char *model, int *argc,
 				 * give a partial match (that is FOO
 				 * matches FOOBAR).
 				 */
-				dprintf("matched vendor/model\n");
+				dbg("matched vendor/model\n");
 				break;
 		} else {
-			dprintf("no match\n");
+			dbg("no match\n");
 		}
 	}
 
@@ -434,8 +376,7 @@ static int get_file_options(char *vendor, char *model, int *argc,
 			c = argc_count(buffer) + 2;
 			*newargv = calloc(c, sizeof(**newargv));
 			if (!*newargv) {
-				log_message(LOG_WARNING,
-					    "Can't allocate memory.\n");
+				err("Can't allocate memory.");
 				retval = -1;
 			} else {
 				*argc = c;
@@ -450,9 +391,7 @@ static int get_file_options(char *vendor, char *model, int *argc,
 					(*newargv)[c] = strsep(&buffer, " ");
 			}
 		} else {
-			/*
-			 * No matches.
-			 */
+			/* No matches  */
 			retval = 1;
 		}
 	}
@@ -480,9 +419,9 @@ static int set_options(int argc, char **argv, const char *short_opts,
 			break;
 
 		if (optarg)
-			dprintf("option '%c' arg '%s'\n", option, optarg);
+			dbg("option '%c' arg '%s'\n", option, optarg);
 		else
-			dprintf("option '%c'\n", option);
+			dbg("option '%c'\n", option);
 
 		switch (option) {
 		case 'a':
@@ -492,10 +431,6 @@ static int set_options(int argc, char **argv, const char *short_opts,
 			all_good = 0;
 			break;
 
-		case 'c':
-			default_callout = optarg;
-			break;
-
 		case 'd':
 			dev_specified = 1;
 			strncpy(maj_min_dev, optarg, MAX_NAME_LEN);
@@ -525,16 +460,15 @@ 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 {
-				log_message(LOG_WARNING,
-					    "Unknown page code '%s'\n", optarg);
+				info("Unknown page code '%s'", optarg);
 				return -1;
 			}
 			break;
 
 		case 's':
 			sys_specified = 1;
-			strncpy(target, sysfs_mnt_path, MAX_NAME_LEN);
-			strncat(target, optarg, MAX_NAME_LEN);
+			strncpy(target, optarg, MAX_NAME_LEN);
+			target[MAX_NAME_LEN-1] = '\0';
 			break;
 
 		case 'u':
@@ -550,71 +484,58 @@ static int set_options(int argc, char **argv, const char *short_opts,
 			break;
 
 		case 'V':
-			log_message(LOG_WARNING, "scsi_id version: %s\n",
-				    SCSI_ID_VERSION);
+			info("scsi_id version: %s\n", SCSI_ID_VERSION);
 			exit(0);
 			break;
 
 		default:
-			log_message(LOG_WARNING,
-				    "Unknown or bad option '%c' (0x%x)\n",
-				    option, option);
+			info("Unknown or bad option '%c' (0x%x)", option, option);
 			return -1;
 		}
 	}
 	return 0;
 }
 
-static int per_dev_options(struct sysfs_device *scsi_dev, int *good_bad,
-			   int *page_code, char *callout)
+static int per_dev_options(struct sysfs_device *dev_scsi, int *good_bad, int *page_code)
 {
 	int retval;
 	int newargc;
 	char **newargv = NULL;
-	struct sysfs_attribute *vendor, *model, *type;
+	const char *vendor, *model, *type;
 	int option;
 
 	*good_bad = all_good;
 	*page_code = default_page_code;
-	if (default_callout && (callout != default_callout))
-		strncpy(callout, default_callout, MAX_NAME_LEN);
-	else
-		callout[0] = '\0';
 
-	vendor = sysfs_get_device_attr(scsi_dev, "vendor");
+	vendor = sysfs_attr_get_value(dev_scsi->devpath, "vendor");
 	if (!vendor) {
-		log_message(LOG_WARNING, "%s: cannot get vendor attribute\n",
-			    scsi_dev->name);
+		info("%s: cannot get vendor attribute", dev_scsi->devpath);
 		return -1;
 	}
-	set_str(vendor_str, vendor->value, sizeof(vendor_str)-1);
+	set_str(vendor_str, vendor, sizeof(vendor_str)-1);
 
-	model = sysfs_get_device_attr(scsi_dev, "model");
+	model = sysfs_attr_get_value(dev_scsi->devpath, "model");
 	if (!model) {
-		log_message(LOG_WARNING, "%s: cannot get model attribute\n",
-			    scsi_dev->name);
+		info("%s: cannot get model attribute\n", dev_scsi->devpath);
 		return -1;
 	}
-	set_str(model_str, model->value, sizeof(model_str)-1);
+	set_str(model_str, model, sizeof(model_str)-1);
 
-	type = sysfs_get_device_attr(scsi_dev, "type");
+	type = sysfs_attr_get_value(dev_scsi->devpath, "type");
 	if (!type) {
-		log_message(LOG_WARNING, "%s: cannot get type attribute\n",
-			    scsi_dev->name);
+		info("%s: cannot get type attribute", dev_scsi->devpath);
 		return -1;
 	}
-	set_type(type_str, type->value, sizeof(type_str));
+	set_type(type_str, type, sizeof(type_str));
 
-	type = sysfs_get_device_attr(scsi_dev, "rev");
+	type = sysfs_attr_get_value(dev_scsi->devpath, "rev");
 	if (!type) {
-		log_message(LOG_WARNING, "%s: cannot get type attribute\n",
-			    scsi_dev->name);
+		info("%s: cannot get type attribute\n", dev_scsi->devpath);
 		return -1;
 	}
-	set_str(revision_str, type->value, sizeof(revision_str)-1);
+	set_str(revision_str, type, sizeof(revision_str)-1);
 
-	retval = get_file_options(vendor->value, model->value, &newargc,
-				  &newargv);
+	retval = get_file_options(vendor, model, &newargc, &newargv);
 
 	optind = 1; /* reset this global extern */
 	while (retval == 0) {
@@ -623,19 +544,15 @@ static int per_dev_options(struct sysfs_device *scsi_dev, int *good_bad,
 			break;
 
 		if (optarg)
-			dprintf("option '%c' arg '%s'\n", option, optarg);
+			dbg("option '%c' arg '%s'\n", option, optarg);
 		else
-			dprintf("option '%c'\n", option);
+			dbg("option '%c'\n", option);
 
 		switch (option) {
 		case 'b':
 			*good_bad = 0;
 			break;
 
-		case 'c':
-			strncpy(callout, default_callout, MAX_NAME_LEN);
-			break;
-
 		case 'g':
 			*good_bad = 1;
 			break;
@@ -648,16 +565,13 @@ static int per_dev_options(struct sysfs_device *scsi_dev, int *good_bad,
 			} else if (strcmp(optarg, "pre-spc3-83") == 0) {
 				*page_code = PAGE_83_PRE_SPC3; 
 			} else {
-				log_message(LOG_WARNING,
-					    "Unknown page code '%s'\n", optarg);
+				info("Unknown page code '%s'", optarg);
 				retval = -1;
 			}
 			break;
 
 		default:
-			log_message(LOG_WARNING,
-				    "Unknown or bad option '%c' (0x%x)\n",
-				    option, option);
+			info("Unknown or bad option '%c' (0x%x)", option, option);
 			retval = -1;
 			break;
 		}
@@ -702,129 +616,62 @@ 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(const char *target_path, char *maj_min_dev)
+static int scsi_id(const char *devpath, char *maj_min_dev)
 {
 	int retval;
 	int dev_type = 0;
 	char *serial, *unaligned_buf;
-	struct sysfs_class_device *class_dev; /* of target_path */
-	struct sysfs_class_device *class_dev_parent; /* for partitions */
-	struct sysfs_device *scsi_dev; /* the scsi_device */
+	struct sysfs_device *dev;
+	struct sysfs_device *dev_scsi;
 	int good_dev;
 	int page_code;
-	char callout[MAX_NAME_LEN];
-
-	dprintf("target_path %s\n", target_path);
 
-	/*
-	 * Ugly: depend on the sysfs path to tell us whether this is a
-	 * block or char device. This should probably be encoded in the
-	 * "dev" along with the major/minor.
-	 */
-	if (has_sysfs_prefix(target_path, "/block")) {
-		dev_type = S_IFBLK;
-	} else if (has_sysfs_prefix(target_path, "/class")) {
-		dev_type = S_IFCHR;
-	} else {
-		if (!hotplug_mode) {
-			log_message(LOG_WARNING,
-				    "Non block or class device '%s'\n",
-				    target_path);
-			return 1;
-		} else {
-			/*
-			 * Expected in some cases.
-			 */
-			dprintf("Non block or class device\n");
-			return 0;
-		}
-	}
+	dbg("devpath %s\n", devpath);
 
-	class_dev = sysfs_open_class_device_path(target_path);
-	if (!class_dev) {
-		log_message(LOG_WARNING, "open class %s failed: %s\n",
-			    target_path, strerror(errno));
+	dev = sysfs_device_get(devpath);
+	if (dev == NULL) {
+		err("unable to access '%s'", devpath);
 		return 1;
 	}
-	class_dev_parent = sysfs_get_classdev_parent(class_dev);
-	dprintf("class_dev 0x%p; class_dev_parent 0x%p\n", class_dev,
-		class_dev_parent);
-	if (class_dev_parent) {
-		scsi_dev = sysfs_get_classdev_device(class_dev_parent);
-	} else {
-		scsi_dev = sysfs_get_classdev_device(class_dev);
-	}
 
-	/*
-	 * The close of scsi_dev will close class_dev or class_dev_parent.
-	 */
+	if (strcmp(dev->subsystem, "block") == 0)
+		dev_type = S_IFBLK;
+	else
+		dev_type = S_IFCHR;
 
-	/*
-	 * We assume we are called after the device is completely ready,
-	 * so we don't have to loop here like udev. (And we are usually
-	 * called via udev.)
-	 */
-	if (!scsi_dev) {
-		/*
-		 * errno is not set if we can't find the device link, so
-		 * don't print it out here.
-		 */
-		log_message(LOG_WARNING, "Cannot find sysfs device associated with %s\n",
-			    target_path);
+	/* get scsi parent device */
+	dev_scsi = sysfs_device_get_parent(dev);
+	if (dev_scsi == NULL) {
+		err("unable to access parent device of '%s'", devpath);
 		return 1;
 	}
 
-
-	/*
-	 * Allow only scsi devices.
-	 *
-	 * Other block devices can support SG IO, but only ide-cd does, so
-	 * for now, don't bother with anything else.
-	 */
-	if (strcmp(scsi_dev->bus, "scsi") != 0) {
-		if (hotplug_mode)
-			/*
-			 * Expected in some cases.
-			 */
-			dprintf("%s is not a scsi device\n", target_path);
-		else
-			log_message(LOG_WARNING, "%s is not a scsi device\n",
-				    target_path);
+	/* allow only scsi devices */
+	if (strcmp(dev_scsi->subsystem, "scsi") != 0) {
+		info("%s is not a scsi device", devpath);
 		return 1;
 	}
 
-	/*
-	 * mknod a temp dev to communicate with the device.
-	 */
-	if (!dev_specified && create_tmp_dev(class_dev, maj_min_dev,
-					     dev_type)) {
-		dprintf("create_tmp_dev failed\n");
+	/* mknod a temp dev to communicate with the device */
+	if (!dev_specified && create_tmp_dev(dev->devpath, maj_min_dev, dev_type)) {
+		dbg("create_tmp_dev failed\n");
 		return 1;
 	}
 
-	/*
-	 * Get any per device (vendor + model) options from the config
-	 * file.
-	 */
-	retval = per_dev_options(scsi_dev, &good_dev, &page_code, callout);
-	dprintf("per dev options: good %d; page code 0x%x; callout '%s'\n",
-		good_dev, page_code, callout);
+	/* get per device (vendor + model) options from the config file */
+	retval = per_dev_options(dev_scsi, &good_dev, &page_code);
+	dbg("per dev options: good %d; page code 0x%x", good_dev, page_code);
 
 #define ALIGN   512
 	unaligned_buf = malloc(MAX_SERIAL_LEN + ALIGN);
 	serial = (char*) (((unsigned long) unaligned_buf + (ALIGN - 1))
 			  & ~(ALIGN - 1));
-	dprintf("buffer unaligned 0x%p; aligned 0x%p\n", unaligned_buf, serial);
+	dbg("buffer unaligned 0x%p; aligned 0x%p\n", unaligned_buf, serial);
 #undef ALIGN
 
 	if (!good_dev) {
 		retval = 1;
-	} else if (callout[0] != '\0') {
-		/*
-		 * XXX Disabled for now ('c' is not in any options[]).
-		 */
-		retval = 1;
-	} else if (scsi_get_serial(scsi_dev, maj_min_dev, page_code,
+	} else if (scsi_get_serial(dev_scsi, maj_min_dev, page_code,
 				   serial, MAX_SERIAL_LEN)) {
 		retval = always_info?0:1;
 	} else {
@@ -844,13 +691,12 @@ static int scsi_id(const char *target_path, char *maj_min_dev)
 			if (reformat_serial)
 				format_serial(serial);
 			if (display_bus_id)
-				printf("%s: ", scsi_dev->name);
+				printf("%s: ", dev_scsi->kernel_name);
 			printf("%s\n", serial);
 		}
-		dprintf("%s\n", serial);
+		dbg("%s\n", serial);
 		retval = 0;
 	}
-	sysfs_close_device(scsi_dev);
 
 	if (!dev_specified)
 		unlink(maj_min_dev);
@@ -860,32 +706,31 @@ static int scsi_id(const char *target_path, char *maj_min_dev)
 
 int main(int argc, char **argv)
 {
-	int retval;
-	char *devpath;
-	char target_path[MAX_NAME_LEN];
+	int retval = 0;
+	char devpath[MAX_NAME_LEN];
 	char maj_min_dev[MAX_NAME_LEN];
 	int newargc;
+	const char *env;
 	char **newargv;
 
-	if (getenv("DEBUG"))
-		debug++;
+	logging_init("scsi_id");
+	sysfs_init();
+	dbg("argc is %d\n", argc);
 
-	dprintf("argc is %d\n", argc);
-	if (sysfs_get_mnt_path(sysfs_mnt_path, MAX_NAME_LEN)) {
-		log_message(LOG_WARNING, "sysfs_get_mnt_path failed: %s\n",
-			strerror(errno));
-		exit(1);
-	}
+	/* sysfs path can be overridden for testing */
+	env = getenv("SYSFS_PATH");
+	if (env) {
+		strncpy(sysfs_path, env, sizeof(sysfs_path));
+		sysfs_path[sizeof(sysfs_path)-1] = '\0';
+	} else
+		strcpy(sysfs_path, "/sys");
 
-	devpath = getenv("DEVPATH");
-	if (devpath) {
-		/*
-		 * This implies that we were invoked via udev or hotplug.
-		 */
+	env = getenv("DEVPATH");
+	if (env) {
 		hotplug_mode = 1;
 		sys_specified = 1;
-		strncpy(target_path, sysfs_mnt_path, MAX_NAME_LEN);
-		strncat(target_path, devpath, MAX_NAME_LEN);
+		strncpy(devpath, env, MAX_NAME_LEN);
+		devpath[sizeof(devpath)-1] = '\0';
 	}
 
 	/*
@@ -894,26 +739,35 @@ int main(int argc, char **argv)
 	newargv = NULL;
 	retval = get_file_options(NULL, NULL, &newargc, &newargv);
 	if (retval < 0) {
-		exit(1);
-	} else if (newargv && (retval == 0)) {
-		if (set_options(newargc, newargv, short_options, target_path,
-				maj_min_dev) < 0)
-			exit(1);
+		retval = 1;
+		goto exit;
+	}
+	if (newargv && (retval == 0)) {
+		if (set_options(newargc, newargv, short_options, devpath,
+				maj_min_dev) < 0) {
+			retval = 2;
+			goto exit;
+		}
 		free(newargv);
 	}
+
 	/*
 	 * Get command line options (overriding any config file or DEVPATH
 	 * settings).
 	 */
-	if (set_options(argc, argv, short_options, target_path,
-			maj_min_dev) < 0)
+	if (set_options(argc, argv, short_options, devpath, maj_min_dev) < 0)
 		exit(1);
 
 	if (!sys_specified) {
-		log_message(LOG_WARNING, "-s must be specified\n");
-		exit(1);
+		info("-s must be specified\n");
+		retval = 1;
+		goto exit;
 	}
 
-	retval = scsi_id(target_path, maj_min_dev);
-	exit(retval);
+	retval = scsi_id(devpath, maj_min_dev);
+
+exit:
+	sysfs_cleanup();
+	logging_close();
+	return retval;
 }
diff --git a/extras/scsi_id/scsi_id.h b/extras/scsi_id/scsi_id.h
index 1c9ed969a7..b5312b8988 100644
--- a/extras/scsi_id/scsi_id.h
+++ b/extras/scsi_id/scsi_id.h
@@ -21,9 +21,6 @@
  *  USA
  */
 
-#define dprintf(format, arg...) \
-	log_message(LOG_DEBUG, "%s: " format, __FUNCTION__ , ## arg)
-
 #define	MAX_NAME_LEN	72
 
 /*
@@ -44,15 +41,8 @@
  */
 #define MAX_BUFFER_LEN	256
 
-extern int scsi_get_serial (struct sysfs_device *scsi_dev, const char
-			    *devname, int page_code, char *serial, int
-			    len);
-extern void log_message (int level, const char *format, ...)
-	__attribute__ ((format (printf, 2, 3)));
-
-#ifndef u8
-typedef unsigned char u8;
-#endif
+extern int scsi_get_serial (struct sysfs_device *dev_scsi, const char *devname,
+			    int page_code, char *serial, int len);
 
 /*
  * Page code values. 
diff --git a/extras/scsi_id/scsi_serial.c b/extras/scsi_id/scsi_serial.c
index 14955e676c..bdebe94eb3 100644
--- a/extras/scsi_id/scsi_serial.c
+++ b/extras/scsi_id/scsi_serial.c
@@ -30,11 +30,12 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <syslog.h>
-#include <linux/compiler.h> /* need __user when built via klibc */
 #include <scsi/sg.h>
-#include <sysfs/libsysfs.h>
-#include "scsi_id.h"
+
+#include "../../udev.h"
 #include "scsi.h"
+#include "scsi_id.h"
+#include "scsi_id_version.h"
 
 /*
  * A priority based list of id, naa, and binary/ascii for the identifier
@@ -75,23 +76,21 @@ static const char hex_str[]="0123456789abcdef";
  * are used here.
  */
 
-#define DID_NO_CONNECT 0x01     /* Unable to connect before timeout */
-
-#define DID_BUS_BUSY 0x02       /* Bus remain busy until timeout */
-#define DID_TIME_OUT 0x03       /* Timed out for some other reason */
-
-#define DRIVER_TIMEOUT 0x06
-#define DRIVER_SENSE 0x08       /* Sense_buffer has been set */
+#define DID_NO_CONNECT			0x01	/* Unable to connect before timeout */
+#define DID_BUS_BUSY			0x02	/* Bus remain busy until timeout */
+#define DID_TIME_OUT			0x03	/* Timed out for some other reason */
+#define DRIVER_TIMEOUT			0x06
+#define DRIVER_SENSE			0x08	/* Sense_buffer has been set */
 
 /* The following "category" function returns one of the following */
-#define SG_ERR_CAT_CLEAN	0      /* No errors or other information */
-#define SG_ERR_CAT_MEDIA_CHANGED	1 /* interpreted from sense buffer */
-#define SG_ERR_CAT_RESET	2      /* interpreted from sense buffer */
-#define SG_ERR_CAT_TIMEOUT	3
-#define SG_ERR_CAT_RECOVERED	4  /* Successful command after recovered err */
-#define SG_ERR_CAT_NOTSUPPORTED 5 /* Illegal / unsupported command */
-#define SG_ERR_CAT_SENSE	98     /* Something else in the sense buffer */
-#define SG_ERR_CAT_OTHER	99     /* Some other error/warning */
+#define SG_ERR_CAT_CLEAN		0	/* No errors or other information */
+#define SG_ERR_CAT_MEDIA_CHANGED	1	/* interpreted from sense buffer */
+#define SG_ERR_CAT_RESET		2	/* interpreted from sense buffer */
+#define SG_ERR_CAT_TIMEOUT		3
+#define SG_ERR_CAT_RECOVERED		4 	/* Successful command after recovered err */
+#define SG_ERR_CAT_NOTSUPPORTED 	5	/* Illegal / unsupported command */
+#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
 			       host_status, int driver_status, const
@@ -157,7 +156,7 @@ static int sg_err_category3(struct sg_io_hdr *hp)
 				   hp->sbp, hp->sb_len_wr);
 }
 
-static int scsi_dump_sense(struct sysfs_device *scsi_dev, struct sg_io_hdr *io)
+static int scsi_dump_sense(struct sysfs_device *dev_scsi, struct sg_io_hdr *io)
 {
 	unsigned char *sense_buffer;
 	int s;
@@ -184,12 +183,11 @@ static int scsi_dump_sense(struct sysfs_device *scsi_dev, struct sg_io_hdr *io)
 	 * we'll retry the command.
 	 */
 
-	dprintf("got check condition\n");
+	dbg("got check condition\n");
 
 	sb_len = io->sb_len_wr;
 	if (sb_len < 1) {
-		log_message(LOG_WARNING, "%s: sense buffer empty\n",
-			    scsi_dev->name);
+		info("%s: sense buffer empty", dev_scsi->kernel_name);
 		return -1;
 	}
 
@@ -203,10 +201,8 @@ static int scsi_dump_sense(struct sysfs_device *scsi_dev, struct sg_io_hdr *io)
 		 */
 		s = sense_buffer[7] + 8;
 		if (sb_len < s) {
-			log_message(LOG_WARNING,
-				    "%s: sense buffer too small %d bytes,"
-				    " %d bytes too short\n", scsi_dev->name,
-				    sb_len, s - sb_len);
+			info("%s: sense buffer too small %d bytes, %d bytes too short",
+			    dev_scsi->kernel_name, sb_len, s - sb_len);
 			return -1;
 		}
 		if ((code == 0x0) || (code == 0x1)) {
@@ -216,9 +212,8 @@ static int scsi_dump_sense(struct sysfs_device *scsi_dev, struct sg_io_hdr *io)
 				/*
 				 * Possible?
 				 */
-				log_message(LOG_WARNING, "%s: sense result too"
-					    " small %d bytes\n",
-					    scsi_dev->name, s);
+				info("%s: sense result too" " small %d bytes",
+				    dev_scsi->kernel_name, s);
 				return -1;
 			}
 			asc = sense_buffer[12];
@@ -229,72 +224,64 @@ static int scsi_dump_sense(struct sysfs_device *scsi_dev, struct sg_io_hdr *io)
 			asc = sense_buffer[2];
 			ascq = sense_buffer[3];
 		} else {
-			log_message(LOG_WARNING,
-				    "%s: invalid sense code 0x%x\n",
-				    scsi_dev->name, code);
+			info("%s: invalid sense code 0x%x",
+			    dev_scsi->kernel_name, code);
 			return -1;
 		}
-		log_message(LOG_WARNING,
-			    "%s: sense key 0x%x ASC 0x%x ASCQ 0x%x\n",
-			    scsi_dev->name, sense_key, asc, ascq);
+		info("%s: sense key 0x%x ASC 0x%x ASCQ 0x%x",
+		    dev_scsi->kernel_name, sense_key, asc, ascq);
 	} else {
 		if (sb_len < 4) {
-			log_message(LOG_WARNING,
-				    "%s: sense buffer too small %d bytes, %d bytes too short\n",
-				    scsi_dev->name, sb_len, 4 - sb_len);
+			info("%s: sense buffer too small %d bytes, %d bytes too short",
+			    dev_scsi->kernel_name, sb_len, 4 - sb_len);
 			return -1;
 		}
 
 		if (sense_buffer[0] < 15)
-			log_message(LOG_WARNING, "%s: old sense key: 0x%x\n",
-				    scsi_dev->name, sense_buffer[0] & 0x0f);
+			info("%s: old sense key: 0x%x", dev_scsi->kernel_name, sense_buffer[0] & 0x0f);
 		else
-			log_message(LOG_WARNING, "%s: sense = %2x %2x\n",
-				    scsi_dev->name,  sense_buffer[0],
-				    sense_buffer[2]);
-		log_message(LOG_WARNING,
-			    "%s: non-extended sense class %d code 0x%0x\n",
-			    scsi_dev->name, sense_class, code);
+			info("%s: sense = %2x %2x",
+			    dev_scsi->kernel_name, sense_buffer[0], sense_buffer[2]);
+		info("%s: non-extended sense class %d code 0x%0x",
+		    dev_scsi->kernel_name, sense_class, code);
 
 	}
 
 #ifdef DUMP_SENSE
 	for (i = 0, j = 0; (i < s) && (j < 254); i++) {
-		dprintf("i %d, j %d\n", i, j);
+		dbg("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';
-	log_message(LOG_WARNING, "%s: sense dump:\n", scsi_dev->name);
-	log_message(LOG_WARNING, "%s: %s\n", scsi_dev->name, out_buffer);
+	info("%s: sense dump:", dev_scsi->kernel_name);
+	info("%s: %s", dev_scsi->kernel_name, out_buffer);
 
 #endif
 	return -1;
 }
 
-static int scsi_dump(struct sysfs_device *scsi_dev, struct sg_io_hdr *io)
+static int scsi_dump(struct sysfs_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.
 		 */
-		log_message(LOG_WARNING, "%s: called with no error\n",
-			    __FUNCTION__);
+		info("%s: called with no error", __FUNCTION__);
 		return -1;
 	}
 
-	log_message(LOG_WARNING, "%s: sg_io failed status 0x%x 0x%x 0x%x 0x%x\n",
-		    scsi_dev->name, io->driver_status, io->host_status,
-		    io->msg_status, io->status);
+	info("%s: sg_io failed status 0x%x 0x%x 0x%x 0x%x",
+	    dev_scsi->kernel_name, io->driver_status, io->host_status, io->msg_status, io->status);
 	if (io->status == SCSI_CHECK_CONDITION)
-		return scsi_dump_sense(scsi_dev, io);
+		return scsi_dump_sense(dev_scsi, io);
 	else
 		return -1;
 }
 
-static int scsi_inquiry(struct sysfs_device *scsi_dev, int fd,
+static int scsi_inquiry(struct sysfs_device *dev_scsi, int fd,
 			unsigned char evpd, unsigned char page,
 			unsigned char *buf, unsigned int buflen)
 {
@@ -306,12 +293,12 @@ static int scsi_inquiry(struct sysfs_device *scsi_dev, int fd,
 	int retry = 3; /* rather random */
 
 	if (buflen > SCSI_INQ_BUFF_LEN) {
-		log_message(LOG_WARNING, "buflen %d too long\n", buflen);
+		info("buflen %d too long", buflen);
 		return -1;
 	}
 
 resend:
-	dprintf("%s evpd %d, page 0x%x\n", scsi_dev->name, evpd, page);
+	dbg("%s evpd %d, page 0x%x\n", dev_scsi->kernel_name, evpd, page);
 
 	memset(&io_hdr, 0, sizeof(struct sg_io_hdr));
 	io_hdr.interface_id = 'S';
@@ -325,8 +312,7 @@ resend:
 	io_hdr.timeout = DEF_TIMEOUT;
 
 	if (ioctl(fd, SG_IO, &io_hdr) < 0) {
-		log_message(LOG_WARNING, "%s: ioctl failed: %s\n",
-			    scsi_dev->name, strerror(errno));
+		info("%s: ioctl failed: %s", dev_scsi->kernel_name, strerror(errno));
 		retval = -1;
 		goto error;
 	}
@@ -343,14 +329,14 @@ resend:
 			break;
 
 		default:
-			retval = scsi_dump(scsi_dev, &io_hdr);
+			retval = scsi_dump(dev_scsi, &io_hdr);
 	}
 
 	if (!retval) {
 		retval = buflen;
 	} else if (retval > 0) {
 		if (--retry > 0) {
-			dprintf("%s: Retrying ...\n", scsi_dev->name);
+			dbg("%s: Retrying ...\n", dev_scsi->kernel_name);
 			goto resend;
 		}
 		retval = -1;
@@ -358,33 +344,30 @@ resend:
 
 error:
 	if (retval < 0)
-		log_message(LOG_WARNING,
-			    "%s: Unable to get INQUIRY vpd %d page 0x%x.\n",
-			    scsi_dev->name, evpd, page);
+		info("%s: Unable to get INQUIRY vpd %d page 0x%x.",
+		    dev_scsi->kernel_name, evpd, page);
 
 	return retval;
 }
 
 /* Get list of supported EVPD pages */
-static int do_scsi_page0_inquiry(struct sysfs_device *scsi_dev, int fd,
+static int do_scsi_page0_inquiry(struct sysfs_device *dev_scsi, int fd,
 				 unsigned char *buffer, unsigned int len)
 {
 	int retval;
-	struct sysfs_attribute *vendor;
+	const char *vendor;
 
 	memset(buffer, 0, len);
-	retval = scsi_inquiry(scsi_dev, fd, 1, 0x0, buffer, len);
+	retval = scsi_inquiry(dev_scsi, fd, 1, 0x0, buffer, len);
 	if (retval < 0)
 		return 1;
 
 	if (buffer[1] != 0) {
-		log_message(LOG_WARNING, "%s: page 0 not available.\n",
-			    scsi_dev->name);
+		info("%s: page 0 not available.", dev_scsi->kernel_name);
 		return 1;
 	}
 	if (buffer[3] > len) {
-		log_message(LOG_WARNING, "%s: page 0 buffer too long %d\n",
-			   scsi_dev->name,  buffer[3]);
+		info("%s: page 0 buffer too long %d", dev_scsi->kernel_name,  buffer[3]);
 		return 1;
 	}
 
@@ -400,17 +383,13 @@ static int do_scsi_page0_inquiry(struct sysfs_device *scsi_dev, int fd,
 		 * If the vendor id appears in the page assume the page is
 		 * invalid.
 		 */
-		vendor = sysfs_get_device_attr(scsi_dev, "vendor");
+		vendor = sysfs_attr_get_value(dev_scsi->devpath, "vendor");
 		if (!vendor) {
-			log_message(LOG_WARNING,
-				    "%s: cannot get model attribute\n",
-				    scsi_dev->name);
+			info("%s: cannot get model attribute", dev_scsi->kernel_name);
 			return 1;
 		}
-		if (!strncmp((char *)&buffer[VENDOR_LENGTH], vendor->value,
-			     VENDOR_LENGTH)) {
-			log_message(LOG_WARNING, "%s: invalid page0 data\n",
-				    scsi_dev->name);
+		if (!strncmp((char *)&buffer[VENDOR_LENGTH], vendor, VENDOR_LENGTH)) {
+			info("%s: invalid page0 data", dev_scsi->kernel_name);
 			return 1;
 		}
 	}
@@ -421,46 +400,35 @@ static int do_scsi_page0_inquiry(struct sysfs_device *scsi_dev, int fd,
  * The caller checks that serial is long enough to include the vendor +
  * model.
  */
-static int prepend_vendor_model(struct sysfs_device *scsi_dev, char *serial)
+static int prepend_vendor_model(struct sysfs_device *dev_scsi, char *serial)
 {
-	struct sysfs_attribute *attr;
+	const char *attr;
 	int ind;
 
-	attr = sysfs_get_device_attr(scsi_dev, "vendor");
+	attr = sysfs_attr_get_value(dev_scsi->devpath, "vendor");
 	if (!attr) {
-		log_message(LOG_WARNING, "%s: cannot get vendor attribute\n",
-			    scsi_dev->name);
+		info("%s: cannot get vendor attribute", dev_scsi->kernel_name);
 		return 1;
 	}
-	strncpy(serial, attr->value, VENDOR_LENGTH);
+	strncpy(serial, attr, VENDOR_LENGTH);
 	ind = strlen(serial) - 1;
-	/*
-	 * Remove sysfs added newlines.
-	 */
-	if (serial[ind] == '\n')
-		serial[ind] = '\0';
 
-	attr = sysfs_get_device_attr(scsi_dev, "model");
+	attr = sysfs_attr_get_value(dev_scsi->devpath, "model");
 	if (!attr) {
-		log_message(LOG_WARNING, "%s: cannot get model attribute\n",
-			    scsi_dev->name);
+		info("%s: cannot get model attribute", dev_scsi->kernel_name);
 		return 1;
 	}
-	strncat(serial, attr->value, MODEL_LENGTH);
+	strncat(serial, attr, MODEL_LENGTH);
 	ind = strlen(serial) - 1;
-	if (serial[ind] == '\n')
-		serial[ind] = '\0';
-	else
-		ind++;
+	ind++;
 
 	/*
 	 * This is not a complete check, since we are using strncat/cpy
 	 * above, ind will never be too large.
 	 */
 	if (ind != (VENDOR_LENGTH + MODEL_LENGTH)) {
-		log_message(LOG_WARNING, "%s: expected length %d, got length %d\n",
-			    scsi_dev->name, (VENDOR_LENGTH + MODEL_LENGTH),
-			    ind);
+		info("%s: expected length %d, got length %d",
+		     dev_scsi->kernel_name, (VENDOR_LENGTH + MODEL_LENGTH), ind);
 		return 1;
 	}
 	return ind;
@@ -470,7 +438,7 @@ static int prepend_vendor_model(struct sysfs_device *scsi_dev, 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 sysfs_device *scsi_dev,
+static int check_fill_0x83_id(struct sysfs_device *dev_scsi,
 			      unsigned char *page_83,
 			      const struct scsi_id_search_values
 			      *id_search, char *serial, int max_len)
@@ -517,8 +485,8 @@ static int check_fill_0x83_id(struct sysfs_device *scsi_dev,
 		len += VENDOR_LENGTH + MODEL_LENGTH;
 
 	if (max_len < len) {
-		log_message(LOG_WARNING, "%s: length %d too short - need %d\n",
-			    scsi_dev->name, max_len, len);
+		info("%s: length %d too short - need %d",
+		    dev_scsi->kernel_name, max_len, len);
 		return 1;
 	}
 
@@ -531,8 +499,8 @@ static int check_fill_0x83_id(struct sysfs_device *scsi_dev,
 	 * included in the identifier.
 	 */
 	if (id_search->id_type == SCSI_ID_VENDOR_SPECIFIC)
-		if (prepend_vendor_model(scsi_dev, &serial[1]) < 0) {
-			dprintf("prepend failed\n");
+		if (prepend_vendor_model(dev_scsi, &serial[1]) < 0) {
+			dbg("prepend failed\n");
 			return 1;
 		}
 
@@ -559,7 +527,7 @@ static int check_fill_0x83_id(struct sysfs_device *scsi_dev,
 }
 
 /* Extract the raw binary from VPD 0x83 pre-SPC devices */
-static int check_fill_0x83_prespc3(struct sysfs_device *scsi_dev,
+static int check_fill_0x83_prespc3(struct sysfs_device *dev_scsi,
 			           unsigned char *page_83,
 			           const struct scsi_id_search_values
 			           *id_search, char *serial, int max_len)
@@ -574,13 +542,13 @@ static int check_fill_0x83_prespc3(struct sysfs_device *scsi_dev,
 		serial[j++] = hex_str[(page_83[4+i] & 0xf0) >> 4];
 		serial[j++] = hex_str[ page_83[4+i] & 0x0f];
 	}
-	dprintf("using pre-spc3-83 for %s.\n", scsi_dev->name);
+	dbg("using pre-spc3-83 for %s.\n", dev_scsi->kernel_name);
 	return 0;
 }
 
 
 /* Get device identification VPD page */
-static int do_scsi_page83_inquiry(struct sysfs_device *scsi_dev, int fd,
+static int do_scsi_page83_inquiry(struct sysfs_device *dev_scsi, int fd,
 				  char *serial, int len)
 {
 	int retval;
@@ -588,14 +556,13 @@ static int do_scsi_page83_inquiry(struct sysfs_device *scsi_dev, int fd,
 	unsigned char page_83[SCSI_INQ_BUFF_LEN];
 
 	memset(page_83, 0, SCSI_INQ_BUFF_LEN);
-	retval = scsi_inquiry(scsi_dev, fd, 1, PAGE_83, page_83,
+	retval = scsi_inquiry(dev_scsi, fd, 1, PAGE_83, page_83,
 			      SCSI_INQ_BUFF_LEN);
 	if (retval < 0)
 		return 1;
 
 	if (page_83[1] != PAGE_83) {
-		log_message(LOG_WARNING, "%s: Invalid page 0x83\n",
-			    scsi_dev->name);
+		info("%s: Invalid page 0x83", dev_scsi->kernel_name);
 		return 1;
 	}
 	
@@ -629,7 +596,7 @@ static int do_scsi_page83_inquiry(struct sysfs_device *scsi_dev, int fd,
 	 */
 	
 	if (page_83[6] != 0) 
-		return check_fill_0x83_prespc3(scsi_dev, page_83, 
+		return check_fill_0x83_prespc3(dev_scsi, page_83, 
 					       id_search_list, serial, len);
 
 	/*
@@ -643,21 +610,21 @@ static int do_scsi_page83_inquiry(struct sysfs_device *scsi_dev, 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(scsi_dev, &page_83[j],
+			retval = check_fill_0x83_id(dev_scsi, &page_83[j],
 						    &id_search_list[id_ind],
 						    serial, len);
-			dprintf("%s id desc %d/%d/%d\n", scsi_dev->name,
+			dbg("%s id desc %d/%d/%d\n", dev_scsi->kernel_name,
 				id_search_list[id_ind].id_type,
 				id_search_list[id_ind].naa_type,
 				id_search_list[id_ind].code_set);
 			if (!retval) {
-				dprintf("	used\n");
+				dbg("	used\n");
 				return retval;
 			} else if (retval < 0) {
-				dprintf("	failed\n");
+				dbg("	failed\n");
 				return retval;
 			} else {
-				dprintf("	not used\n");
+				dbg("	not used\n");
 			}
 		}
 	}
@@ -671,7 +638,7 @@ static int do_scsi_page83_inquiry(struct sysfs_device *scsi_dev, 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 sysfs_device *scsi_dev, int fd,
+static int do_scsi_page83_prespc3_inquiry(struct sysfs_device *dev_scsi, int fd,
 				          char *serial, int len)
 {
 	int retval;
@@ -679,12 +646,12 @@ static int do_scsi_page83_prespc3_inquiry(struct sysfs_device *scsi_dev, int fd,
 	unsigned char page_83[SCSI_INQ_BUFF_LEN];
 
 	memset(page_83, 0, SCSI_INQ_BUFF_LEN);
-	retval = scsi_inquiry(scsi_dev, fd, 1, PAGE_83, page_83, SCSI_INQ_BUFF_LEN);
+	retval = scsi_inquiry(dev_scsi, fd, 1, PAGE_83, page_83, SCSI_INQ_BUFF_LEN);
 	if (retval < 0)
 		return 1;
 
 	if (page_83[1] != PAGE_83) {
-		log_message(LOG_WARNING, "%s: Invalid page 0x83\n", scsi_dev->name);
+		info("%s: Invalid page 0x83", dev_scsi->kernel_name);
 		return 1;
 	}
 	/*
@@ -728,12 +695,12 @@ static int do_scsi_page83_prespc3_inquiry(struct sysfs_device *scsi_dev, int fd,
 		serial[j++] = hex_str[page_83[i] & 0x0f];
 		i++;
 	}
-	dprintf("using pre-spc3-83 for %s.\n", scsi_dev->name);
+	dbg("using pre-spc3-83 for %s.\n", dev_scsi->kernel_name);
 	return 0;
 }
 
 /* Get unit serial number VPD page */
-static int do_scsi_page80_inquiry(struct sysfs_device *scsi_dev, int fd,
+static int do_scsi_page80_inquiry(struct sysfs_device *dev_scsi, int fd,
 				  char *serial, int max_len)
 {
 	int retval;
@@ -743,20 +710,19 @@ static int do_scsi_page80_inquiry(struct sysfs_device *scsi_dev, int fd,
 	unsigned char buf[SCSI_INQ_BUFF_LEN];
 
 	memset(buf, 0, SCSI_INQ_BUFF_LEN);
-	retval = scsi_inquiry(scsi_dev, fd, 1, PAGE_80, buf, SCSI_INQ_BUFF_LEN);
+	retval = scsi_inquiry(dev_scsi, fd, 1, PAGE_80, buf, SCSI_INQ_BUFF_LEN);
 	if (retval < 0)
 		return retval;
 
 	if (buf[1] != PAGE_80) {
-		log_message(LOG_WARNING, "%s: Invalid page 0x80\n",
-			    scsi_dev->name);
+		info("%s: Invalid page 0x80", dev_scsi->kernel_name);
 		return 1;
 	}
 
 	len = 1 + VENDOR_LENGTH + MODEL_LENGTH + buf[3];
 	if (max_len < len) {
-		log_message(LOG_WARNING, "%s: length %d too short - need %d\n",
-			    scsi_dev->name, max_len, len);
+		info("%s: length %d too short - need %d",
+		    dev_scsi->kernel_name, max_len, len);
 		return 1;
 	}
 	/*
@@ -764,7 +730,7 @@ static int do_scsi_page80_inquiry(struct sysfs_device *scsi_dev, int fd,
 	 * specific type where we prepend '0' + vendor + model.
 	 */
 	serial[0] = 'S';
-	ser_ind = prepend_vendor_model(scsi_dev, &serial[1]);
+	ser_ind = prepend_vendor_model(dev_scsi, &serial[1]);
 	if (ser_ind < 0)
 		return 1;
 	len = buf[3];
@@ -773,7 +739,7 @@ static int do_scsi_page80_inquiry(struct sysfs_device *scsi_dev, int fd,
 	return 0;
 }
 
-int scsi_get_serial (struct sysfs_device *scsi_dev, const char *devname,
+int scsi_get_serial (struct sysfs_device *dev_scsi, const char *devname,
 		     int page_code, char *serial, int len)
 {
 	unsigned char page0[SCSI_INQ_BUFF_LEN];
@@ -782,16 +748,16 @@ int scsi_get_serial (struct sysfs_device *scsi_dev, const char *devname,
 	int retval;
 
 	memset(serial, 0, len);
-	dprintf("opening %s\n", devname);
+	dbg("opening %s\n", devname);
 	fd = open(devname, O_RDONLY | O_NONBLOCK);
 	if (fd < 0) {
-		log_message(LOG_WARNING, "%s: cannot open %s: %s\n",
-			    scsi_dev->name, devname, strerror(errno));
+		info("%s: cannot open %s: %s",
+		    dev_scsi->kernel_name, devname, strerror(errno));
 		return 1;
 	}
 
 	if (page_code == PAGE_80) {
-		if (do_scsi_page80_inquiry(scsi_dev, fd, serial, len)) {
+		if (do_scsi_page80_inquiry(dev_scsi, fd, serial, len)) {
 			retval = 1;
 			goto completed;
 		} else  {
@@ -799,7 +765,7 @@ int scsi_get_serial (struct sysfs_device *scsi_dev, const char *devname,
 			goto completed;
 		}
 	} else if (page_code == PAGE_83) {
-		if (do_scsi_page83_inquiry(scsi_dev, fd, serial, len)) {
+		if (do_scsi_page83_inquiry(dev_scsi, fd, serial, len)) {
 			retval = 1;
 			goto completed;
 		} else  {
@@ -807,7 +773,7 @@ int scsi_get_serial (struct sysfs_device *scsi_dev, const char *devname,
 			goto completed;
 		}
 	} else if (page_code == PAGE_83_PRE_SPC3) {
-		retval = do_scsi_page83_prespc3_inquiry(scsi_dev, fd, serial, len);
+		retval = do_scsi_page83_prespc3_inquiry(dev_scsi, fd, serial, len);
 		if (retval) {
 			/*
 			 * Fallback to servicing a SPC-2/3 compliant page 83
@@ -815,7 +781,7 @@ int scsi_get_serial (struct sysfs_device *scsi_dev, const char *devname,
 			 * conform to pre-SPC3 expectations.
 			 */
 			if (retval == 2) {
-				if (do_scsi_page83_inquiry(scsi_dev, fd, serial, len)) {
+				if (do_scsi_page83_inquiry(dev_scsi, fd, serial, len)) {
 					retval = 1;
 					goto completed;
 				} else  {
@@ -832,8 +798,7 @@ int scsi_get_serial (struct sysfs_device *scsi_dev, const char *devname,
 			goto completed;
 		}
 	} else if (page_code != 0x00) {
-		log_message(LOG_WARNING, "%s: unsupported page code 0x%d\n",
-			    scsi_dev->name, page_code);
+		info("%s: unsupported page code 0x%d", dev_scsi->kernel_name, page_code);
 		return 1;
 	}
 
@@ -841,7 +806,7 @@ int scsi_get_serial (struct sysfs_device *scsi_dev, 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(scsi_dev, fd, page0, SCSI_INQ_BUFF_LEN)) {
+	if (do_scsi_page0_inquiry(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
@@ -851,11 +816,11 @@ int scsi_get_serial (struct sysfs_device *scsi_dev, const char *devname,
 		goto completed;
 	}
 
-	dprintf("%s: Checking page0\n", scsi_dev->name);
+	dbg("%s: Checking page0\n", dev_scsi->kernel_name);
 
 	for (ind = 4; ind <= page0[3] + 3; ind++)
 		if (page0[ind] == PAGE_83)
-			if (!do_scsi_page83_inquiry(scsi_dev, fd, serial,
+			if (!do_scsi_page83_inquiry(dev_scsi, fd, serial,
 						    len)) {
 				/*
 				 * Success
@@ -866,7 +831,7 @@ int scsi_get_serial (struct sysfs_device *scsi_dev, const char *devname,
 
 	for (ind = 4; ind <= page0[3] + 3; ind++)
 		if (page0[ind] == PAGE_80)
-			if (!do_scsi_page80_inquiry(scsi_dev, fd, serial,
+			if (!do_scsi_page80_inquiry(dev_scsi, fd, serial,
 						    len)) {
 				/*
 				 * Success
@@ -877,7 +842,6 @@ int scsi_get_serial (struct sysfs_device *scsi_dev, const char *devname,
 	retval = 1;
 completed:
 	if (close(fd) < 0)
-		log_message(LOG_WARNING, "%s: close failed: %s\n", 
-			    scsi_dev->name, strerror(errno));
+		info("%s: close failed: %s", dev_scsi->kernel_name, strerror(errno));
 	return retval;
 }
diff --git a/extras/usb_id/Makefile b/extras/usb_id/Makefile
index f6d26e1c4c..91b4d57d76 100644
--- a/extras/usb_id/Makefile
+++ b/extras/usb_id/Makefile
@@ -33,7 +33,7 @@ all: $(PROG) $(MAN_PAGES)
 	$(QUIET) $(CC) -c $(CFLAGS) $< -o $@
 
 $(PROG): %: $(HEADERS) %.o $(OBJS)
-	$(QUIET) $(LD) $(LDFLAGS) $@.o $(OBJS) -o $@ $(LIBUDEV) $(LIBSYSFS) $(LIB_OBJS)
+	$(QUIET) $(LD) $(LDFLAGS) $@.o $(OBJS) -o $@ $(LIBUDEV) $(LIB_OBJS)
 ifneq ($(strip $(STRIPCMD)),)
 	$(QUIET) $(STRIPCMD) $@
 endif
diff --git a/extras/usb_id/usb_id.c b/extras/usb_id/usb_id.c
index b7d67958c9..0bcd267f67 100644
--- a/extras/usb_id/usb_id.c
+++ b/extras/usb_id/usb_id.c
@@ -21,12 +21,10 @@
 #include <ctype.h>
 #include <errno.h>
 
-#include <../../libsysfs/sysfs/libsysfs.h>
-#include "../../udev_utils.h"
-#include "../../logging.h"
+#include "../../udev.h"
 
-#define	MAX_NAME_LEN			72
-#define	MAX_SERIAL_LEN			256
+#define MAX_NAME_LEN			72
+#define MAX_SERIAL_LEN			256
 #define BLKGETSIZE64 _IOR(0x12,114,size_t)
 
 #ifdef USE_LOG
@@ -54,7 +52,6 @@ void log_message(int priority, const char *format, ...)
 }
 #endif
 
-char sysfs_mnt_path[SYSFS_PATH_MAX];
 static char vendor_str[64];
 static char model_str[64];
 static char serial_str[MAX_SERIAL_LEN];
@@ -245,182 +242,176 @@ static void set_scsi_type(char *to, const char *from, int count)
  * 6.) If the device supplies a serial number, this number
  *     is concatenated with the identification with an underscore '_'.
  */
-static int usb_id(const char *target_path)
+static int usb_id(const char *devpath)
 {
-	struct sysfs_class_device *class_dev; /* of target_path */
-	struct sysfs_class_device *class_dev_parent; /* for partitions */
-	struct sysfs_device *scsi_dev; /* the scsi_device */
-	struct sysfs_device *target_dev;
-	struct sysfs_device *host_dev, *interface_dev, *usb_dev;
-	struct sysfs_attribute *scsi_model, *scsi_vendor, *scsi_type, *scsi_rev;
-	struct sysfs_attribute *usb_model = NULL, *usb_vendor = NULL, *usb_rev, *usb_serial;
-	struct sysfs_attribute *if_class, *if_subclass;
+	struct sysfs_device *dev;
+	struct sysfs_device *dev_scsi;
+	struct sysfs_device *dev_target;
+	struct sysfs_device *dev_host, *dev_interface, *dev_usb;
+	const char *scsi_model, *scsi_vendor, *scsi_type, *scsi_rev;
+	const char *usb_model = NULL, *usb_vendor = NULL, *usb_rev, *usb_serial;
+	const char *if_class, *if_subclass;
 	int if_class_num;
 	int protocol = 0;
 
-	class_dev = sysfs_open_class_device_path(target_path);
-	if (!class_dev) {
-		info("open class %s failed: %s", target_path, strerror(errno));
+	dbg("devpath %s\n", devpath);
+
+	dev = sysfs_device_get(devpath);
+	if (dev == NULL) {
+		err("unable to access '%s'", devpath);
 		return 1;
 	}
-	class_dev_parent = sysfs_get_classdev_parent(class_dev);
-	if (class_dev_parent) {
-		scsi_dev = sysfs_get_classdev_device(class_dev_parent);
-	} else {
-		scsi_dev = sysfs_get_classdev_device(class_dev);
-	}
 
-	/*
-	 * The close of scsi_dev will close class_dev or class_dev_parent.
-	 */
-
-	/*
-	 * We assume we are called after the device is completely ready,
-	 * so we don't have to loop here like udev. (And we are usually
-	 * called via udev.)
-	 */
-	if (!scsi_dev) {
-		/*
-		 * errno is not set if we can't find the device link, so
-		 * don't print it out here.
-		 */
-		info("Cannot find sysfs device associated with %s", target_path);
+	/* get scsi parent device */
+	dev_scsi = sysfs_device_get_parent(dev);
+	if (dev_scsi == NULL) {
+		err("unable to access parent device of '%s'", devpath);
 		return 1;
 	}
-
-	/*
-	 * Allow only scsi devices.
-	 *
-	 * Other block devices can support SG IO, but only ide-cd does, so
-	 * for now, don't bother with anything else.
-	 */
-	if (strcmp(scsi_dev->bus, "scsi") != 0) {
-		info("%s is not a scsi device", target_path);
+	/* allow only scsi devices */
+	if (strcmp(dev_scsi->subsystem, "scsi") != 0) {
+		info("%s is not a scsi device", devpath);
 		return 1;
 	}
 
 	/* target directory */
-	target_dev = sysfs_get_device_parent(scsi_dev);
+	dev_target = sysfs_device_get_parent(dev_scsi);
+	if (dev_target == NULL) {
+		err("unable to access parent device of '%s'", devpath);
+		return 1;
+	}
+
 	/* host directory */
-	host_dev = sysfs_get_device_parent(target_dev);
+	dev_host = sysfs_device_get_parent(dev_target);
+	if (dev_host == NULL) {
+		err("unable to access parent device of '%s'", devpath);
+		return 1;
+	}
+
 	/* usb interface directory */
-	interface_dev = sysfs_get_device_parent(host_dev);
-	/* usb device directory */
-	usb_dev = sysfs_get_device_parent(interface_dev);
+	dev_interface = sysfs_device_get_parent(dev_host);
+	if (dev_interface == NULL) {
+		err("unable to access parent device of '%s'", devpath);
+		return 1;
+	}
 
-	if (strcmp(interface_dev->bus, "usb") != 0) {
-		info("%s is not an usb device", target_path);
+	/* usb device directory */
+	dev_usb = sysfs_device_get_parent(dev_interface);
+	if (dev_usb == NULL) {
+		err("unable to access parent device of '%s'", devpath);
+		return 1;
+	}
+	if (strcmp(dev_interface->subsystem, "usb") != 0) {
+		info("%s is not an usb device", devpath);
 		return 1;
 	}
 
-	if_class = sysfs_get_device_attr(interface_dev, "bInterfaceClass");
+	if_class = sysfs_attr_get_value(dev_interface->devpath, "bInterfaceClass");
 	if (!if_class) {
-		info("%s: cannot get bInterfaceClass attribute", interface_dev->name);
+		info("%s: cannot get bInterfaceClass attribute", dev_interface->kernel_name);
 		return 1;
 	}
-	if_class_num = strtoul(if_class->value, NULL, 16);
+	if_class_num = strtoul(if_class, NULL, 16);
 	if (if_class_num != 8) {
-		set_usb_iftype(type_str, if_class->value, sizeof(type_str) - 1);
+		set_usb_iftype(type_str, if_class, sizeof(type_str)-1);
 		protocol = 0;
 	} else {
-		if_subclass = sysfs_get_device_attr(interface_dev, 
-						    "bInterfaceSubClass");
-		protocol = set_usb_ifsubtype(type_str, if_subclass->value, 
-					     sizeof(type_str) -1 );
+		if_subclass = sysfs_attr_get_value(dev_interface->devpath, "bInterfaceSubClass");
+		protocol = set_usb_ifsubtype(type_str, if_subclass, sizeof(type_str)-1);
 	}
 
 	if (!use_usb_info && protocol == 6) {
 		/* Generic SPC-2 device */
-		scsi_vendor = sysfs_get_device_attr(scsi_dev, "vendor");
+		scsi_vendor = sysfs_attr_get_value(dev_scsi->devpath, "vendor");
 		if (!scsi_vendor) {
-			info("%s: cannot get SCSI vendor attribute", scsi_dev->name);
+			info("%s: cannot get SCSI vendor attribute", dev_scsi->kernel_name);
 			return 1;
 		}
-		set_str(vendor_str, scsi_vendor->value, sizeof(vendor_str)-1);
+		set_str(vendor_str, scsi_vendor, sizeof(vendor_str)-1);
 
-		scsi_model = sysfs_get_device_attr(scsi_dev, "model");
+		scsi_model = sysfs_attr_get_value(dev_scsi->devpath, "model");
 		if (!scsi_model) {
-			info("%s: cannot get SCSI model attribute", scsi_dev->name);
+			info("%s: cannot get SCSI model attribute", dev_scsi->kernel_name);
 			return 1;
 		}
-		set_str(model_str, scsi_model->value, sizeof(model_str)-1);
+		set_str(model_str, scsi_model, sizeof(model_str)-1);
 
-		scsi_type = sysfs_get_device_attr(scsi_dev, "type");
+		scsi_type = sysfs_attr_get_value(dev_scsi->devpath, "type");
 		if (!scsi_type) {
-			info("%s: cannot get SCSI type attribute", scsi_dev->name);
+			info("%s: cannot get SCSI type attribute", dev_scsi->kernel_name);
 			return 1;
 		}
-		set_scsi_type(type_str, scsi_type->value, sizeof(type_str)-1);
+		set_scsi_type(type_str, scsi_type, sizeof(type_str)-1);
 
-		scsi_rev = sysfs_get_device_attr(scsi_dev, "rev");
+		scsi_rev = sysfs_attr_get_value(dev_scsi->devpath, "rev");
 		if (!scsi_rev) {
-			info("%s: cannot get SCSI revision attribute", scsi_dev->name);
+			info("%s: cannot get SCSI revision attribute", dev_scsi->kernel_name);
 			return 1;
 		}
-		set_str(revision_str, scsi_rev->value, sizeof(revision_str)-1);
+		set_str(revision_str, scsi_rev, sizeof(revision_str)-1);
 
 	}
 
 	/* Fallback to USB vendor & device */
 	if (vendor_str[0] == '\0') {
 		if (!use_num_info)
-			if (!(usb_vendor = sysfs_get_device_attr(usb_dev, "manufacturer")))
+			if (!(usb_vendor = sysfs_attr_get_value(dev_usb->devpath, "manufacturer")))
 				dbg("No USB vendor string found, using idVendor");
 
 		if (!usb_vendor) {
-			if (!(usb_vendor = sysfs_get_device_attr(usb_dev, "idVendor"))) {
+			if (!(usb_vendor = sysfs_attr_get_value(dev_usb->devpath, "idVendor"))) {
 				dbg("No USB vendor information available\n");
 				sprintf(vendor_str,"0000");
 			}
 		}
-		set_str(vendor_str,usb_vendor->value, sizeof(vendor_str) - 1);
+		set_str(vendor_str,usb_vendor, sizeof(vendor_str) - 1);
 	}
 	
 	if (model_str[0] == '\0') {
 		if (!use_num_info)
-			if (!(usb_model = sysfs_get_device_attr(usb_dev, "product")))
+			if (!(usb_model = sysfs_attr_get_value(dev_usb->devpath, "product")))
 				dbg("No USB model string found, using idProduct");
 		
 		if (!usb_model) {
-			if (!(usb_model = sysfs_get_device_attr(usb_dev, "idProduct"))) {
-				dbg("No USB model information available\n");
-				sprintf(model_str,"0000");
-			}
+			if (!(usb_model = sysfs_attr_get_value(dev_usb->devpath, "idProduct")))
+				dbg("No USB model information available\n"); sprintf(model_str,"0000");
 		}
-		set_str(model_str, usb_model->value, sizeof(model_str) - 1);
+		set_str(model_str, usb_model, sizeof(model_str) - 1);
 	}
 
 	if (revision_str[0] == '\0') {
-		usb_rev = sysfs_get_device_attr(usb_dev, "bcdDevice");
-		if (usb_rev) {
-			set_str(revision_str, usb_rev->value, 
-				sizeof(revision_str) - 1);
-		}
+		usb_rev = sysfs_attr_get_value(dev_usb->devpath, "bcdDevice");
+		if (usb_rev)
+			set_str(revision_str, usb_rev, sizeof(revision_str)-1);
 	}
 
 	if (serial_str[0] == '\0') {
-		usb_serial = sysfs_get_device_attr(usb_dev, "serial");
-		if (usb_serial) {
-			set_str(serial_str, usb_serial->value,
-				sizeof(serial_str) - 1);
-		}
+		usb_serial = sysfs_attr_get_value(dev_usb->devpath, "serial");
+		if (usb_serial)
+			set_str(serial_str, usb_serial, sizeof(serial_str)-1);
 	}
 	return 0;
 }
 
 int main(int argc, char **argv)
 {
-	int retval;
-	char *devpath;
-	char target_path[MAX_NAME_LEN];
+	int retval = 0;
+	const char *env;
+	char devpath[MAX_NAME_LEN];
 	int option;
 
+	logging_init("usb_id");
+	sysfs_init();
+
 	dbg("argc is %d", argc);
-	if (sysfs_get_mnt_path(sysfs_mnt_path, MAX_NAME_LEN)) {
-		info("sysfs_get_mnt_path failed: %s",
-			strerror(errno));
-		exit(1);
-	}
+
+	/* sysfs path can be overridden for testing */
+	env = getenv("SYSFS_PATH");
+	if (env) {
+		strlcpy(sysfs_path, env, sizeof(sysfs_path));
+		remove_trailing_chars(sysfs_path, '/');
+	} else
+		strcpy(sysfs_path, "/sys");
 
 	while ((option = getopt(argc, argv, "dnux")) != -1 ) {
 		if (optarg)
@@ -433,14 +424,14 @@ int main(int argc, char **argv)
 			debug = 1;
 			break;
 		case 'n':
-			use_num_info=1;
-			use_usb_info=1;
+			use_num_info = 1;
+			use_usb_info = 1;
 			break;
 		case 'u':
-			use_usb_info=1;
+			use_usb_info = 1;
 			break;
 		case 'x':
-			export=1;
+			export = 1;
 			break;
 		default:
 			info("Unknown or bad option '%c' (0x%x)", option, option);
@@ -449,20 +440,19 @@ int main(int argc, char **argv)
 		}
 	}
 
-	devpath = getenv("DEVPATH");
-	if (devpath) {
-		strncpy(target_path, sysfs_mnt_path, MAX_NAME_LEN);
-		strncat(target_path, devpath, MAX_NAME_LEN);
-	} else {
+	env = getenv("DEVPATH");
+	if (env != NULL)
+		strlcpy(devpath, env, sizeof(devpath));
+	else {
 		if (optind == argc) {
 			fprintf(stderr, "No device specified\n");
-			exit(1);
+			retval = 1;
+			goto exit;
 		}
-		devpath = argv[optind];
-		strncpy(target_path, devpath, MAX_NAME_LEN);
+		strlcpy(devpath, argv[optind], sizeof(devpath));
 	}
 
-	retval = usb_id(target_path);
+	retval = usb_id(devpath);
 
 	if (retval == 0) {
 		if (export) {
@@ -488,5 +478,9 @@ int main(int argc, char **argv)
 			}
 		}
 	}
-	exit(retval);
+
+exit:
+	sysfs_cleanup();
+	logging_close();
+	return retval;
 }
diff --git a/extras/volume_id/Makefile b/extras/volume_id/Makefile
index 6201044941..edb5d3ac68 100644
--- a/extras/volume_id/Makefile
+++ b/extras/volume_id/Makefile
@@ -35,7 +35,7 @@ $(LIBVOLUME_ID):
 	$(MAKE) -C libvolume_id
 
 $(PROG): %: $(HEADERS) %.o $(LIBVOLUME_ID)
-	$(QUIET) $(LD) $(LDFLAGS) $@.o $(LIBVOLUME_ID) -o $@ $(LIBUDEV) $(LIBSYSFS) $(LIB_OBJS)
+	$(QUIET) $(LD) $(LDFLAGS) $@.o $(LIBVOLUME_ID) -o $@ $(LIBUDEV) $(LIB_OBJS)
 ifneq ($(strip $(STRIPCMD)),)
 	$(QUIET) $(STRIPCMD) $@
 endif
diff --git a/extras/volume_id/vol_id.c b/extras/volume_id/vol_id.c
index 6f99c52728..a291eda51d 100644
--- a/extras/volume_id/vol_id.c
+++ b/extras/volume_id/vol_id.c
@@ -29,8 +29,7 @@
 #include <ctype.h>
 #include <sys/ioctl.h>
 
-#include "../../udev_utils.h"
-#include "../../logging.h"
+#include "../../udev.h"
 #include "libvolume_id/volume_id.h"
 
 #define BLKGETSIZE64 _IOR(0x12,114,size_t)