X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev_db.c;h=4515998fcd8c311fa950f63142269567c5d939cf;hp=36da2647165dc0b925c09993aa3ebc1a7916a860;hb=03cfa1394fcc2c4386f8af22e5a4d9fdd7cecc50;hpb=9af5bb2f8fdbf54c064ddbd319d61092f28a4132

diff --git a/udev_db.c b/udev_db.c
index 36da26471..4515998fc 100644
--- a/udev_db.c
+++ b/udev_db.c
@@ -4,7 +4,7 @@
  * Userspace devfs
  *
  * Copyright (C) 2003 Greg Kroah-Hartman <greg@kroah.com>
- * Copyright (C) 2004 Kay Sievers <kay.sievers@vrfy.org>
+ * Copyright (C) 2004-2005 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
@@ -39,19 +39,19 @@
 
 #define PATH_TO_NAME_CHAR		'@'
 
-static int get_db_filename(struct udevice *udev, char *filename, int len)
+static int get_db_filename(const char *devpath, char *filename, int len)
 {
-	char devpath[SYSFS_PATH_MAX];
+	char temp[SYSFS_PATH_MAX];
 	char *pos;
 
 	/* replace '/' to transform path into a filename */
-	strfieldcpy(devpath, udev->devpath);
-	pos = strchr(&devpath[1], '/');
+	strfieldcpy(temp, devpath);
+	pos = strchr(&temp[1], '/');
 	while (pos) {
 		pos[0] = PATH_TO_NAME_CHAR;
 		pos = strchr(&pos[1], '/');
 	}
-	snprintf(filename, len, "%s%s", udev_db_path, devpath);
+	snprintf(filename, len, "%s%s", udev_db_path, temp);
 	filename[len-1] = '\0';
 
 	return 0;
@@ -65,7 +65,7 @@ int udev_db_add_device(struct udevice *udev)
 	if (udev->test_run)
 		return 0;
 
-	get_db_filename(udev, filename, SYSFS_PATH_MAX);
+	get_db_filename(udev->devpath, filename, SYSFS_PATH_MAX);
 
 	create_path(filename);
 
@@ -79,6 +79,7 @@ int udev_db_add_device(struct udevice *udev)
 	fprintf(f, "P:%s\n", udev->devpath);
 	fprintf(f, "N:%s\n", udev->name);
 	fprintf(f, "S:%s\n", udev->symlink);
+	fprintf(f, "M:%u:%u\n", major(udev->devt), minor(udev->devt));
 	fprintf(f, "A:%u\n", udev->partitions);
 	fprintf(f, "R:%u\n", udev->ignore_remove);
 
@@ -90,6 +91,8 @@ int udev_db_add_device(struct udevice *udev)
 static int parse_db_file(struct udevice *udev, const char *filename)
 {
 	char line[NAME_SIZE];
+	char temp[NAME_SIZE];
+	unsigned int major, minor;
 	char *bufline;
 	char *buf;
 	size_t bufsize;
@@ -120,6 +123,14 @@ static int parse_db_file(struct udevice *udev, const char *filename)
 			strncpy(udev->name, &bufline[2], count-2);
 			udev->name[count-2] = '\0';
 			break;
+		case 'M':
+			if (count > NAME_SIZE)
+				count = NAME_SIZE-1;
+			strncpy(temp, &bufline[2], count-2);
+			temp[count-2] = '\0';
+			sscanf(temp, "%u:%u", &major, &minor);
+			udev->devt = makedev(major, minor);
+			break;
 		case 'S':
 			if (count > NAME_SIZE)
 				count = NAME_SIZE-1;
@@ -149,26 +160,26 @@ static int parse_db_file(struct udevice *udev, const char *filename)
 	return 0;
 }
 
-int udev_db_get_device(struct udevice *udev)
+int udev_db_delete_device(struct udevice *udev)
 {
 	char filename[SYSFS_PATH_MAX];
 
-	get_db_filename(udev, filename, SYSFS_PATH_MAX);
+	get_db_filename(udev->devpath, filename, SYSFS_PATH_MAX);
+	unlink(filename);
 
-	return parse_db_file(udev, filename);
+	return 0;
 }
 
-int udev_db_delete_device(struct udevice *udev)
+int udev_db_get_device_by_devpath(struct udevice *udev, const char *devpath)
 {
 	char filename[SYSFS_PATH_MAX];
 
-	get_db_filename(udev, filename, SYSFS_PATH_MAX);
-	unlink(filename);
+	get_db_filename(devpath, filename, SYSFS_PATH_MAX);
 
-	return 0;
+	return parse_db_file(udev, filename);
 }
 
-int udev_db_get_device_byname(struct udevice *udev, const char *name)
+int udev_db_get_device_by_name(struct udevice *udev, const char *name)
 {
 	struct dirent *ent;
 	DIR *dir;
@@ -195,7 +206,7 @@ int udev_db_get_device_byname(struct udevice *udev, const char *name)
 		memset(&db_udev, 0x00, sizeof(struct udevice));
 		if (parse_db_file(&db_udev, filename) == 0) {
 			char *pos;
-			int len;
+			unsigned int len;
 
 			if (strncmp(name, db_udev.name, NAME_SIZE) == 0) {
 				goto found;
@@ -223,6 +234,43 @@ found:
 	strfieldcpy(udev->name, db_udev.name);
 	strfieldcpy(udev->symlink, db_udev.symlink);
 	udev->partitions = db_udev.partitions;
+	udev->ignore_remove = db_udev.ignore_remove;
+	udev->devt = db_udev.devt;
 
 	return 0;
 }
+
+int udev_db_call_foreach(int (*handler_function)(struct udevice *udev))
+{
+	struct dirent *ent;
+	DIR *dir;
+	char filename[NAME_SIZE];
+	struct udevice db_udev;
+
+	dir = opendir(udev_db_path);
+	if (dir == NULL) {
+		dbg("unable to udev db '%s'", udev_db_path);
+		return -1;
+	}
+
+	while (1) {
+		ent = readdir(dir);
+		if (ent == NULL || ent->d_name[0] == '\0')
+			break;
+
+		if (ent->d_name[0] == '.')
+			continue;
+
+		snprintf(filename, NAME_SIZE, "%s/%s", udev_db_path, ent->d_name);
+		filename[NAME_SIZE-1] = '\0';
+
+		memset(&db_udev, 0x00, sizeof(struct udevice));
+		if (parse_db_file(&db_udev, filename) == 0) {
+			if (handler_function(&db_udev) != 0)
+				break;
+		}
+	}
+
+	closedir(dir);
+	return 0;
+}