X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udevtest.c;h=5ce257005804460dbaf35cfd3bcb0a6d74cf0294;hb=882af735ec18cb4e6ba6f59ca60f8266cc96c330;hp=19cf9ec4f41aa66cc02443a257a99b9142e14453;hpb=5ce120d366b54ea2bae12ec6ce01bb0d38ff1f50;p=elogind.git

diff --git a/udevtest.c b/udevtest.c
index 19cf9ec4f..5ce257005 100644
--- a/udevtest.c
+++ b/udevtest.c
@@ -1,5 +1,5 @@
 /*
- * udev.c
+ * udevtest.c
  *
  * Userspace devfs
  *
@@ -29,14 +29,14 @@
 
 #include "libsysfs/sysfs/libsysfs.h"
 #include "udev.h"
+#include "udev_sysfs.h"
 #include "udev_utils.h"
 #include "udev_version.h"
 #include "namedev.h"
 #include "logging.h"
 
 
-#ifdef LOG
-unsigned char logname[LOGNAME_SIZE];
+#ifdef USE_LOG
 void log_message (int level, const char *format, ...)
 {
 	va_list args;
@@ -53,8 +53,8 @@ int main(int argc, char *argv[], char *envp[])
 {
 	struct sysfs_class_device *class_dev;
 	char *devpath;
-	char path[SYSFS_PATH_MAX];
-	char temp[NAME_SIZE];
+	char path[PATH_SIZE];
+	char temp[PATH_SIZE];
 	struct udevice udev;
 	char *subsystem = NULL;
 
@@ -69,18 +69,16 @@ int main(int argc, char *argv[], char *envp[])
 	udev_init_config();
 
 	/* remove sysfs_path if given */
-	if (strncmp(argv[1], sysfs_path, strlen(sysfs_path)) == 0) {
+	if (strncmp(argv[1], sysfs_path, strlen(sysfs_path)) == 0)
 		devpath = &argv[1][strlen(sysfs_path)] ;
-	}
 	else
 		if (argv[1][0] != '/') {
 			/* prepend '/' if missing */
-			strfieldcpy(temp, "/");
-			strfieldcat(temp, argv[1]);
+			snprintf(temp, sizeof(temp), "/%s", argv[1]);
+			temp[sizeof(temp)-1] = '\0';
 			devpath = temp;
-		} else {
+		} else
 			devpath = argv[1];
-		}
 
 	info("looking at '%s'", devpath);
 
@@ -94,13 +92,14 @@ int main(int argc, char *argv[], char *envp[])
 	udev_init_device(&udev, devpath, subsystem);
 
 	/* skip subsystems without "dev", but handle net devices */
-	if (udev.type != 'n' && subsystem_expect_no_dev(udev.subsystem)) {
+	if (udev.type != NET && subsystem_expect_no_dev(udev.subsystem)) {
 		info("don't care about '%s' devices", udev.subsystem);
 		return 2;
 	}
 
 	/* open the device */
-	snprintf(path, SYSFS_PATH_MAX, "%s%s", sysfs_path, udev.devpath);
+	snprintf(path, sizeof(path), "%s%s", sysfs_path, udev.devpath);
+	path[sizeof(path)-1] = '\0';
 	class_dev = sysfs_open_class_device_path(path);
 	if (class_dev == NULL) {
 		info("sysfs_open_class_device_path failed");