X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fudev%2Fudevadm-info.c;h=a56f159543da0d169363ba07d911f958d16d1cc6;hb=652212b0c2b60b9ef9b2e24eae82401f880fa21a;hp=2d2cf4336e1dcb0039bfcc4ce20ab37321a69704;hpb=7643ac9a8add1f07ffc237c054feb443b5612717;p=elogind.git diff --git a/src/udev/udevadm-info.c b/src/udev/udevadm-info.c index 2d2cf4336..a56f15954 100644 --- a/src/udev/udevadm-info.c +++ b/src/udev/udevadm-info.c @@ -30,9 +30,10 @@ #include #include "udev.h" +#include "udev-util.h" +#include "udevadm-util.h" -static bool skip_attribute(const char *name) -{ +static bool skip_attribute(const char *name) { static const char* const skip[] = { "uevent", "dev", @@ -50,8 +51,7 @@ static bool skip_attribute(const char *name) return false; } -static void print_all_attributes(struct udev_device *device, const char *key) -{ +static void print_all_attributes(struct udev_device *device, const char *key) { struct udev_list_entry *sysattr; udev_list_entry_foreach(sysattr, udev_device_get_sysattr_list_entry(device)) { @@ -83,8 +83,7 @@ static void print_all_attributes(struct udev_device *device, const char *key) printf("\n"); } -static int print_device_chain(struct udev_device *device) -{ +static int print_device_chain(struct udev_device *device) { struct udev_device *device_parent; const char *str; @@ -129,8 +128,7 @@ static int print_device_chain(struct udev_device *device) return 0; } -static void print_record(struct udev_device *device) -{ +static void print_record(struct udev_device *device) { const char *str; int i; struct udev_list_entry *list_entry; @@ -155,8 +153,7 @@ static void print_record(struct udev_device *device) printf("\n"); } -static int stat_device(const char *name, bool export, const char *prefix) -{ +static int stat_device(const char *name, bool export, const char *prefix) { struct stat statbuf; if (stat(name, &statbuf) != 0) @@ -174,8 +171,7 @@ static int stat_device(const char *name, bool export, const char *prefix) return 0; } -static int export_devices(struct udev *udev) -{ +static int export_devices(struct udev *udev) { struct udev_enumerate *udev_enumerate; struct udev_list_entry *list_entry; @@ -196,8 +192,7 @@ static int export_devices(struct udev *udev) return 0; } -static void cleanup_dir(DIR *dir, mode_t mask, int depth) -{ +static void cleanup_dir(DIR *dir, mode_t mask, int depth) { struct dirent *dent; if (depth <= 0) @@ -227,8 +222,7 @@ static void cleanup_dir(DIR *dir, mode_t mask, int depth) } } -static void cleanup_db(struct udev *udev) -{ +static void cleanup_db(struct udev *udev) { DIR *dir; unlink("/run/udev/queue.bin"); @@ -264,45 +258,14 @@ static void cleanup_db(struct udev *udev) } } -static struct udev_device *find_device(struct udev *udev, const char *id, const char *prefix) -{ - char name[UTIL_PATH_SIZE]; - - if (prefix && !startswith(id, prefix)) { - strscpyl(name, sizeof(name), prefix, id, NULL); - id = name; - } - - if (startswith(id, "/dev/")) { - struct stat statbuf; - char type; - - if (stat(id, &statbuf) < 0) - return NULL; - - if (S_ISBLK(statbuf.st_mode)) - type = 'b'; - else if (S_ISCHR(statbuf.st_mode)) - type = 'c'; - else - return NULL; - - return udev_device_new_from_devnum(udev, type, statbuf.st_rdev); - } else if (startswith(id, "/sys/")) - return udev_device_new_from_syspath(udev, id); - else - return NULL; -} - -static int uinfo(struct udev *udev, int argc, char *argv[]) -{ - struct udev_device *device = NULL; +static int uinfo(struct udev *udev, int argc, char *argv[]) { + _cleanup_udev_device_unref_ struct udev_device *device = NULL; bool root = 0; bool export = 0; const char *export_prefix = NULL; char name[UTIL_PATH_SIZE]; struct udev_list_entry *list_entry; - int rc = 0, c; + int c; static const struct option options[] = { { "name", required_argument, NULL, 'n' }, @@ -360,48 +323,43 @@ static int uinfo(struct udev *udev, int argc, char *argv[]) case 'n': { if (device != NULL) { fprintf(stderr, "device already specified\n"); - rc = 2; - goto exit; + return 2; } device = find_device(udev, optarg, "/dev/"); if (device == NULL) { fprintf(stderr, "device node not found\n"); - rc = 2; - goto exit; + return 2; } break; } case 'p': if (device != NULL) { fprintf(stderr, "device already specified\n"); - rc = 2; - goto exit; + return 2; } device = find_device(udev, optarg, "/sys"); if (device == NULL) { fprintf(stderr, "syspath not found\n"); - rc = 2; - goto exit; + return 2; } break; case 'q': action = ACTION_QUERY; - if (streq(optarg, "property") || streq(optarg, "env")) { + if (streq(optarg, "property") || streq(optarg, "env")) query = QUERY_PROPERTY; - } else if (streq(optarg, "name")) { + else if (streq(optarg, "name")) query = QUERY_NAME; - } else if (streq(optarg, "symlink")) { + else if (streq(optarg, "symlink")) query = QUERY_SYMLINK; - } else if (streq(optarg, "path")) { + else if (streq(optarg, "path")) query = QUERY_PATH; - } else if (streq(optarg, "all")) { + else if (streq(optarg, "all")) query = QUERY_ALL; - } else { + else { fprintf(stderr, "unknown query type\n"); - rc = 3; - goto exit; + return 3; } break; case 'r': @@ -416,10 +374,10 @@ static int uinfo(struct udev *udev, int argc, char *argv[]) break; case 'e': export_devices(udev); - goto exit; + return 0; case 'c': cleanup_db(udev); - goto exit; + return 0; case 'x': export = true; break; @@ -428,13 +386,12 @@ static int uinfo(struct udev *udev, int argc, char *argv[]) break; case 'V': printf("%s\n", VERSION); - goto exit; + return 0; case 'h': printf("%s\n", usage); - goto exit; + return 0; default: - rc = 1; - goto exit; + return 1; } switch (action) { @@ -442,14 +399,12 @@ static int uinfo(struct udev *udev, int argc, char *argv[]) if (!device) { if (!argv[optind]) { fprintf(stderr, "%s\n", usage); - rc = 2; - goto exit; + return 2; } device = find_device(udev, argv[optind], NULL); if (!device) { fprintf(stderr, "Unknown device, --name=, --path=, or absolute path in /dev/ or /sys expected.\n"); - rc = 4; - goto exit; + return 4; } } @@ -459,8 +414,7 @@ static int uinfo(struct udev *udev, int argc, char *argv[]) if (node == NULL) { fprintf(stderr, "no device node found\n"); - rc = 5; - goto exit; + return 5; } if (root) @@ -484,7 +438,7 @@ static int uinfo(struct udev *udev, int argc, char *argv[]) break; case QUERY_PATH: printf("%s\n", udev_device_get_devpath(device)); - goto exit; + return 0; case QUERY_PROPERTY: list_entry = udev_device_get_properties_list_entry(device); while (list_entry != NULL) { @@ -506,8 +460,7 @@ static int uinfo(struct udev *udev, int argc, char *argv[]) print_record(device); break; default: - fprintf(stderr, "unknown query type\n"); - break; + assert_not_reached("unknown query type"); } break; case ACTION_ATTRIBUTE_WALK: @@ -515,26 +468,22 @@ static int uinfo(struct udev *udev, int argc, char *argv[]) device = find_device(udev, argv[optind], NULL); if (!device) { fprintf(stderr, "Unknown device, absolute path in /dev/ or /sys expected.\n"); - rc = 4; - goto exit; + return 4; } } if (!device) { fprintf(stderr, "Unknown device, --name=, --path=, or absolute path in /dev/ or /sys expected.\n"); - rc = 4; - goto exit; + return 4; } print_device_chain(device); break; case ACTION_DEVICE_ID_FILE: if (stat_device(name, export, export_prefix) != 0) - rc = 1; + return 1; break; } -exit: - udev_device_unref(device); - return rc; + return 0; } const struct udevadm_cmd udevadm_info = {