#include "fd-util.h"
#include "string-util.h"
#include "udev.h"
+#include "udevadm.h"
#include "udevadm-util.h"
static bool skip_attribute(const char *name) {
return 0;
}
-static int export_devices(struct udev *udev) {
+static int export_devices(void) {
_cleanup_(udev_enumerate_unrefp) struct udev_enumerate *udev_enumerate;
struct udev_list_entry *list_entry;
- udev_enumerate = udev_enumerate_new(udev);
+ udev_enumerate = udev_enumerate_new(NULL);
if (udev_enumerate == NULL)
return -ENOMEM;
udev_list_entry_foreach(list_entry, udev_enumerate_get_list_entry(udev_enumerate)) {
_cleanup_(udev_device_unrefp) struct udev_device *device;
- device = udev_device_new_from_syspath(udev, udev_list_entry_get_name(list_entry));
+ device = udev_device_new_from_syspath(NULL, udev_list_entry_get_name(list_entry));
if (device != NULL)
print_record(device);
}
}
}
-static void cleanup_db(struct udev *udev) {
+static void cleanup_db(void) {
_cleanup_closedir_ DIR *dir1 = NULL, *dir2 = NULL, *dir3 = NULL, *dir4 = NULL, *dir5 = NULL;
(void) unlink("/run/udev/queue.bin");
, program_invocation_short_name);
}
-static int uinfo(struct udev *udev, int argc, char *argv[]) {
+int info_main(int argc, char *argv[], void *userdata) {
_cleanup_(udev_device_unrefp) struct udev_device *device = NULL;
bool root = 0;
bool export = 0;
return 2;
}
- device = find_device(udev, optarg, "/dev/");
+ device = find_device(optarg, "/dev/");
if (device == NULL) {
fprintf(stderr, "device node not found\n");
return 2;
return 2;
}
- device = find_device(udev, optarg, "/sys");
+ device = find_device(optarg, "/sys");
if (device == NULL) {
fprintf(stderr, "syspath not found\n");
return 2;
action = ACTION_ATTRIBUTE_WALK;
break;
case 'e':
- if (export_devices(udev) < 0)
+ if (export_devices() < 0)
return 1;
return 0;
case 'c':
- cleanup_db(udev);
+ cleanup_db();
return 0;
case 'x':
export = true;
help();
return 2;
}
- device = find_device(udev, argv[optind], NULL);
+ device = find_device(argv[optind], NULL);
if (!device) {
fprintf(stderr, "Unknown device, --name=, --path=, or absolute path in /dev/ or /sys expected.\n");
return 4;
break;
case ACTION_ATTRIBUTE_WALK:
if (!device && argv[optind]) {
- device = find_device(udev, argv[optind], NULL);
+ device = find_device(argv[optind], NULL);
if (!device) {
fprintf(stderr, "Unknown device, absolute path in /dev/ or /sys expected.\n");
return 4;
return 0;
}
-
-const struct udevadm_cmd udevadm_info = {
- .name = "info",
- .cmd = uinfo,
- .help = "Query sysfs or the udev database",
-};