udevadm: trigger fix long option --type=

[elogind.git] / udev / udevadm-settle.c

diff --git a/udev/udevadm-settle.c b/udev/udevadm-settle.c
index c6c95a1ddcfb355785951d16f0459ad1594b5cda..78ac47ff41260886cc64cc3aa47be5acc4c358ce 100644 (file)
--- a/udev/udevadm-settle.c
+++ b/udev/udevadm-settle.c
@@ -44,7 +44,7 @@ static void print_queue(struct udev *udev, const char *dir)
        printf("\n\nAfter the udevadm settle timeout, the events queue contains:\n\n");
 
        list_for_each_entry(item, &files, node) {
-               char target[NAME_SIZE];
+               char target[UTIL_NAME_SIZE];
                size_t len;
                const char *filename = strrchr(item->name, '/');
 
@@ -67,8 +67,8 @@ static void print_queue(struct udev *udev, const char *dir)
 
 int udevadm_settle(struct udev *udev, int argc, char *argv[])
 {
-       char queuename[PATH_SIZE];
-       char filename[PATH_SIZE];
+       char queuename[UTIL_PATH_SIZE];
+       char filename[UTIL_PATH_SIZE];
        unsigned long long seq_kernel;
        unsigned long long seq_udev;
        char seqnum[32];
@@ -107,8 +107,8 @@ int udevadm_settle(struct udev *udev, int argc, char *argv[])
                }
        }
 
-       strlcpy(queuename, udev_get_dev_path(udev), sizeof(queuename));
-       strlcat(queuename, "/.udev/queue", sizeof(queuename));
+       util_strlcpy(queuename, udev_get_dev_path(udev), sizeof(queuename));
+       util_strlcat(queuename, "/.udev/queue", sizeof(queuename));
 
        loop = timeout * LOOP_PER_SECOND;
        while (loop--) {
@@ -129,8 +129,8 @@ int udevadm_settle(struct udev *udev, int argc, char *argv[])
                }
 
                /* read current udev seqnum */
-               strlcpy(filename, udev_get_dev_path(udev), sizeof(filename));
-               strlcat(filename, "/.udev/uevent_seqnum", sizeof(filename));
+               util_strlcpy(filename, udev_get_dev_path(udev), sizeof(filename));
+               util_strlcat(filename, "/.udev/uevent_seqnum", sizeof(filename));
                fd = open(filename, O_RDONLY);
                if (fd < 0)
                        goto exit;
@@ -143,8 +143,8 @@ int udevadm_settle(struct udev *udev, int argc, char *argv[])
                info(udev, "udev seqnum = %llu\n", seq_udev);
 
                /* read current kernel seqnum */
-               strlcpy(filename, udev_get_sys_path(udev), sizeof(filename));
-               strlcat(filename, "/kernel/uevent_seqnum", sizeof(filename));
+               util_strlcpy(filename, udev_get_sys_path(udev), sizeof(filename));
+               util_strlcat(filename, "/kernel/uevent_seqnum", sizeof(filename));
                fd = open(filename, O_RDONLY);
                if (fd < 0)
                        goto exit;