summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkay.sievers@vrfy.org <kay.sievers@vrfy.org>2004-03-31 23:00:45 -0800
committerGreg KH <gregkh@suse.de>2005-04-26 21:35:13 -0700
commit7b9b18392182e5cfa5d731288e8592549bdf67df (patch)
treec8e595d6cb53915a12e1025d97b3e9a8adc5dabe
parentc1f8ea9562765d920881d46aeac69cce554d7ce3 (diff)
[PATCH] udevinfo patch
On Fri, Mar 26, 2004 at 06:36:32PM +0500, Ananth N Mavinakayanahalli wrote: > On Fri, Mar 26, 2004 at 11:24:39AM +0100, Kay Sievers wrote: > > On Fri, Mar 26, 2004 at 11:21:29AM +0500, Ananth N Mavinakayanahalli wrote: > > > On Fri, Mar 26, 2004 at 04:47:35AM +0100, Kay Sievers wrote: > > > > On Fri, Mar 26, 2004 at 01:26:46AM +0100, Carl-Daniel Hailfinger wrote: > > > > > Greg KH wrote: > > > > > > On Tue, Mar 23, 2004 at 01:51:01PM -0800, Daniel Stekloff wrote: > > > > > > > > No, it breaks the net device handling. I think we should change > > > > libsysfs instead, not to return a class device for '/block', if > > > > we want to fix it. > > > > > > /sys/block is considered a sysfs "class" and not a class_device. So, > > > going by udevinfo's help, -p expects path to a class_device and _not_ > > > a class itself and hence option /sys/block with -p is not a valid query. > > > > > > Kay? > > > > Yes, it's invalid, but we shouldn't print major minor for a invalid > > path. sysfs_open_class_device_path("/block") returns a device. If this is > > the right behavior for libsysfs, I will change the get_device_type("/block") > > not to return a 'b'-type. > > Libsysfs validates the path given to it for opening a class_device to be > a valid directory; it does not however validate if the path is a valid > class_device path. So, in the case of udevinfo, a 'b' type should not > be returned if the path is just /sys/block or /sys/block/ This may prevent it.
-rw-r--r--udev_lib.c21
1 files changed, 16 insertions, 5 deletions
diff --git a/udev_lib.c b/udev_lib.c
index e9c16c863a..db1096ebf7 100644
--- a/udev_lib.c
+++ b/udev_lib.c
@@ -86,17 +86,28 @@ char *get_subsystem(char *subsystem)
return subsystem;
}
+#define BLOCK_PATH "/block/"
+#define CLASS_PATH "/class/"
+#define NET_PATH "/class/net/"
+
char get_device_type(const char *path, const char *subsystem)
{
- if (strcmp(subsystem, "block") == 0 ||
- strstr(path, "/block/") != NULL)
+ if (strcmp(subsystem, "block") == 0)
+ return 'b';
+
+ if (strcmp(subsystem, "net") == 0)
+ return 'n';
+
+ if (strncmp(path, BLOCK_PATH, strlen(BLOCK_PATH)) == 0 &&
+ strlen(path) > strlen(BLOCK_PATH))
return 'b';
- if (strcmp(subsystem, "net") == 0 ||
- strstr(path, "/class/net/") != NULL)
+ if (strncmp(path, NET_PATH, strlen(NET_PATH)) == 0 &&
+ strlen(path) > strlen(NET_PATH))
return 'n';
- if (strstr(path, "/class/") != NULL)
+ if (strncmp(path, CLASS_PATH, strlen(CLASS_PATH)) == 0 &&
+ strlen(path) > strlen(CLASS_PATH))
return 'c';
return '\0';