[PATCH] udev - reverse user query options
Here we get the ability to query with the name of the node instead of the device path. It uses a linear search over the whole database. kay@pim:~/src/udev.kay$ ./udev -q path -n video/webcam0 /class/video4linux/video0 New version, with better function return codes for error handling.
This commit is contained in:
parent
7780509143
commit
b2a21a3547
7
udev.8
7
udev.8
|
@ -50,10 +50,13 @@ will be prepended.
|
||||||
.BI -q " query_type"
|
.BI -q " query_type"
|
||||||
Query the database for specified value of a created device node.
|
Query the database for specified value of a created device node.
|
||||||
Valid types are:
|
Valid types are:
|
||||||
.BR name ", " symlink ", " owner " or " group .
|
.BR name ", " symlink ", " owner " , " group " or " path.
|
||||||
.TP
|
.TP
|
||||||
.BI -p " sysfs_path"
|
.BI -p " sysfs_path"
|
||||||
Specify the sysfs path needed for the query.
|
Specify the sysfs path of the device to query.
|
||||||
|
.TP
|
||||||
|
.BI -n " name"
|
||||||
|
Specify the name of the node for the device to query.
|
||||||
.TP
|
.TP
|
||||||
.B -d
|
.B -d
|
||||||
Dump the whole database.
|
Dump the whole database.
|
||||||
|
|
64
udev.c
64
udev.c
|
@ -83,7 +83,8 @@ static inline char *get_seqnum(void)
|
||||||
return seqnum;
|
return seqnum;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void print_record(char *path, struct udevice *dev)
|
/* callback for database dump */
|
||||||
|
static int print_record(char *path, struct udevice *dev)
|
||||||
{
|
{
|
||||||
printf("P: %s\n", path);
|
printf("P: %s\n", path);
|
||||||
printf("N: %s\n", dev->name);
|
printf("N: %s\n", dev->name);
|
||||||
|
@ -91,11 +92,13 @@ static void print_record(char *path, struct udevice *dev)
|
||||||
printf("O: %s\n", dev->owner);
|
printf("O: %s\n", dev->owner);
|
||||||
printf("G: %s\n", dev->group);
|
printf("G: %s\n", dev->group);
|
||||||
printf("\n");
|
printf("\n");
|
||||||
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
enum query_type {
|
enum query_type {
|
||||||
NONE,
|
NONE,
|
||||||
NAME,
|
NAME,
|
||||||
|
PATH,
|
||||||
SYMLINK,
|
SYMLINK,
|
||||||
OWNER,
|
OWNER,
|
||||||
GROUP
|
GROUP
|
||||||
|
@ -103,7 +106,7 @@ enum query_type {
|
||||||
|
|
||||||
static inline int udev_user(int argc, char **argv)
|
static inline int udev_user(int argc, char **argv)
|
||||||
{
|
{
|
||||||
static const char short_options[] = "dp:q:rVh";
|
static const char short_options[] = "dn:p:q:rVh";
|
||||||
int option;
|
int option;
|
||||||
int retval = -EINVAL;
|
int retval = -EINVAL;
|
||||||
struct udevice dev;
|
struct udevice dev;
|
||||||
|
@ -111,6 +114,7 @@ static inline int udev_user(int argc, char **argv)
|
||||||
enum query_type query = NONE;
|
enum query_type query = NONE;
|
||||||
char result[NAME_SIZE] = "";
|
char result[NAME_SIZE] = "";
|
||||||
char path[NAME_SIZE] = "";
|
char path[NAME_SIZE] = "";
|
||||||
|
char name[NAME_SIZE] = "";
|
||||||
|
|
||||||
/* get command line options */
|
/* get command line options */
|
||||||
while (1) {
|
while (1) {
|
||||||
|
@ -120,6 +124,11 @@ static inline int udev_user(int argc, char **argv)
|
||||||
|
|
||||||
dbg("option '%c'", option);
|
dbg("option '%c'", option);
|
||||||
switch (option) {
|
switch (option) {
|
||||||
|
case 'n':
|
||||||
|
dbg("udev name: %s\n", optarg);
|
||||||
|
strfieldcpy(name, optarg);
|
||||||
|
break;
|
||||||
|
|
||||||
case 'p':
|
case 'p':
|
||||||
dbg("udev path: %s\n", optarg);
|
dbg("udev path: %s\n", optarg);
|
||||||
strfieldcpy(path, optarg);
|
strfieldcpy(path, optarg);
|
||||||
|
@ -148,6 +157,11 @@ static inline int udev_user(int argc, char **argv)
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (strcmp(optarg, "path") == 0) {
|
||||||
|
query = PATH;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
printf("unknown query type\n");
|
printf("unknown query type\n");
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
||||||
|
@ -161,7 +175,7 @@ static inline int udev_user(int argc, char **argv)
|
||||||
printf("unable to open udev database\n");
|
printf("unable to open udev database\n");
|
||||||
return -EACCES;
|
return -EACCES;
|
||||||
}
|
}
|
||||||
retval = udevdb_dump(print_record);
|
retval = udevdb_call_foreach(print_record);
|
||||||
udevdb_exit();
|
udevdb_exit();
|
||||||
return retval;
|
return retval;
|
||||||
|
|
||||||
|
@ -179,18 +193,34 @@ static inline int udev_user(int argc, char **argv)
|
||||||
|
|
||||||
/* process options */
|
/* process options */
|
||||||
if (query != NONE) {
|
if (query != NONE) {
|
||||||
if (path[0] == '\0') {
|
|
||||||
printf("query needs device path specified\n");
|
|
||||||
return -EINVAL;
|
|
||||||
}
|
|
||||||
|
|
||||||
retval = udevdb_open_ro();
|
retval = udevdb_open_ro();
|
||||||
if (retval != 0) {
|
if (retval != 0) {
|
||||||
printf("unable to open udev database\n");
|
printf("unable to open udev database\n");
|
||||||
return -EACCES;
|
return -EACCES;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (path[0] != '\0') {
|
||||||
retval = udevdb_get_dev(path, &dev);
|
retval = udevdb_get_dev(path, &dev);
|
||||||
if (retval == 0) {
|
if (retval != 0) {
|
||||||
|
printf("device not found in database\n");
|
||||||
|
goto exit;
|
||||||
|
}
|
||||||
|
goto print;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (name[0] != '\0') {
|
||||||
|
retval = udevdb_get_dev_byname(name, path, &dev);
|
||||||
|
if (retval != 0) {
|
||||||
|
printf("device not found in database\n");
|
||||||
|
goto exit;
|
||||||
|
}
|
||||||
|
goto print;
|
||||||
|
}
|
||||||
|
|
||||||
|
printf("query needs device path(-p) or node name(-n) specified\n");
|
||||||
|
goto exit;
|
||||||
|
|
||||||
|
print:
|
||||||
switch(query) {
|
switch(query) {
|
||||||
case NAME:
|
case NAME:
|
||||||
if (root)
|
if (root)
|
||||||
|
@ -210,13 +240,16 @@ static inline int udev_user(int argc, char **argv)
|
||||||
strfieldcpy(result, dev.owner);
|
strfieldcpy(result, dev.owner);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
case PATH:
|
||||||
|
strfieldcpy(result, path);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
default:
|
||||||
|
goto exit;
|
||||||
}
|
}
|
||||||
printf("%s\n", result);
|
printf("%s\n", result);
|
||||||
} else {
|
|
||||||
printf("device not found in udev database\n");
|
exit:
|
||||||
}
|
|
||||||
udevdb_exit();
|
udevdb_exit();
|
||||||
return retval;
|
return retval;
|
||||||
}
|
}
|
||||||
|
@ -227,13 +260,16 @@ static inline int udev_user(int argc, char **argv)
|
||||||
}
|
}
|
||||||
|
|
||||||
help:
|
help:
|
||||||
printf("Usage: [-pqrdVh]\n"
|
printf("Usage: [-npqrdVh]\n"
|
||||||
" -q TYPE query database for the specified value:\n"
|
" -q TYPE query database for the specified value:\n"
|
||||||
" 'name' name of device node\n"
|
" 'name' name of device node\n"
|
||||||
" 'symlink' pointing to node\n"
|
" 'symlink' pointing to node\n"
|
||||||
" 'owner' of node\n"
|
" 'owner' of node\n"
|
||||||
" 'group' of node\n"
|
" 'group' of node\n"
|
||||||
|
" 'path' sysfs device path\n"
|
||||||
" -p PATH sysfs device path used for query\n"
|
" -p PATH sysfs device path used for query\n"
|
||||||
|
" -n NAME node name used for query\n"
|
||||||
|
"\n"
|
||||||
" -r print udev root\n"
|
" -r print udev root\n"
|
||||||
" -d dump whole database\n"
|
" -d dump whole database\n"
|
||||||
" -V print udev version\n"
|
" -V print udev version\n"
|
||||||
|
|
49
udevdb.c
49
udevdb.c
|
@ -143,25 +143,62 @@ int udevdb_open_ro(void)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
void (*user_record_callback) (char *path, struct udevice *dev);
|
static int (*user_record_callback) (char *path, struct udevice *dev);
|
||||||
|
|
||||||
static int traverse_callback(TDB_CONTEXT *tdb, TDB_DATA key, TDB_DATA dbuf, void *state)
|
static int traverse_callback(TDB_CONTEXT *tdb, TDB_DATA key, TDB_DATA dbuf, void *state)
|
||||||
{
|
{
|
||||||
user_record_callback((char*) key.dptr, (struct udevice*) dbuf.dptr);
|
return user_record_callback((char*) key.dptr, (struct udevice*) dbuf.dptr);
|
||||||
return 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* udevdb_dump: dumps whole database by passing record data to user function
|
* udevdb_call_foreach: dumps whole database by passing record data to user function
|
||||||
* @user_record_handler: user function called for every record in the database
|
* @user_record_handler: user function called for every record in the database
|
||||||
*/
|
*/
|
||||||
int udevdb_dump(void (*user_record_handler) (char *path, struct udevice *dev))
|
int udevdb_call_foreach(int (*user_record_handler) (char *path, struct udevice *dev))
|
||||||
{
|
{
|
||||||
|
int retval = 0;
|
||||||
|
|
||||||
if (user_record_handler == NULL) {
|
if (user_record_handler == NULL) {
|
||||||
dbg("invalid user record handling function");
|
dbg("invalid user record handling function");
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
}
|
}
|
||||||
user_record_callback = user_record_handler;
|
user_record_callback = user_record_handler;
|
||||||
tdb_traverse(udevdb, traverse_callback, NULL);
|
retval = tdb_traverse(udevdb, traverse_callback, NULL);
|
||||||
|
if (retval < 0)
|
||||||
|
return -ENODEV;
|
||||||
|
else
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static struct udevice *find_dev;
|
||||||
|
static char *find_path;
|
||||||
|
static const char *find_name;
|
||||||
|
static int find_found;
|
||||||
|
|
||||||
|
static int find_device_by_name(char *path, struct udevice *dev)
|
||||||
|
{
|
||||||
|
if (strncmp(dev->name, find_name, sizeof(dev->name)) == 0) {
|
||||||
|
memcpy(find_dev, dev, sizeof(*find_dev));
|
||||||
|
strncpy(find_path, path, NAME_SIZE);
|
||||||
|
find_found = 1;
|
||||||
|
/* stop search */
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* udevdb_get_dev_byname: search device with given name by traversing the whole database
|
||||||
|
*/
|
||||||
|
int udevdb_get_dev_byname(const char *name, char *path, struct udevice *dev)
|
||||||
|
{
|
||||||
|
find_found = 0;
|
||||||
|
find_path = path;
|
||||||
|
find_dev = dev;
|
||||||
|
find_name = name;
|
||||||
|
udevdb_call_foreach(find_device_by_name);
|
||||||
|
if (find_found == 1)
|
||||||
|
return 0;
|
||||||
|
else
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
3
udevdb.h
3
udevdb.h
|
@ -12,10 +12,11 @@
|
||||||
extern void udevdb_exit(void);
|
extern void udevdb_exit(void);
|
||||||
extern int udevdb_init(int init_flag);
|
extern int udevdb_init(int init_flag);
|
||||||
extern int udevdb_open_ro(void);
|
extern int udevdb_open_ro(void);
|
||||||
extern int udevdb_dump(void (*user_record_handler) (char *path, struct udevice *dev));
|
extern int udevdb_call_foreach(int (*user_record_handler) (char *path, struct udevice *dev));
|
||||||
|
|
||||||
extern int udevdb_add_dev(const char *path, const struct udevice *dev);
|
extern int udevdb_add_dev(const char *path, const struct udevice *dev);
|
||||||
extern int udevdb_get_dev(const char *path, struct udevice *dev);
|
extern int udevdb_get_dev(const char *path, struct udevice *dev);
|
||||||
extern int udevdb_delete_dev(const char *path);
|
extern int udevdb_delete_dev(const char *path);
|
||||||
|
extern int udevdb_get_dev_byname(const char *name, char *path, struct udevice *dev);
|
||||||
|
|
||||||
#endif /* _UDEVDB_H_ */
|
#endif /* _UDEVDB_H_ */
|
||||||
|
|
Loading…
Reference in a new issue