X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=extras%2Fedd_id%2Fedd_id.c;h=4154387cb6ded8ab2fa9713067d7a3c981bedc41;hb=e32135825f70ec1f1c449a9201a80917abe5d842;hp=b53700e7561cba2e36af100a778bc8aa4fe4e77c;hpb=7d563a17f3967890331daf08d43f2f005418139b;p=elogind.git diff --git a/extras/edd_id/edd_id.c b/extras/edd_id/edd_id.c index b53700e75..4154387cb 100644 --- a/extras/edd_id/edd_id.c +++ b/extras/edd_id/edd_id.c @@ -45,9 +45,9 @@ int main(int argc, char *argv[]) int sysfs_fd; DIR *dir = NULL; int rc = 1; - char match[NAME_MAX] = ""; + char match[NAME_MAX]; - udev = udev_new(); + udev = udev_new(); if (udev == NULL) goto exit; @@ -124,8 +124,9 @@ int main(int argc, char *argv[]) } /* lookup signature in sysfs to determine the name */ + match[0] = '\0'; for (dent = readdir(dir); dent != NULL; dent = readdir(dir)) { - char file[PATH_SIZE]; + char file[UTIL_PATH_SIZE]; char sysfs_id_buf[256]; uint32_t sysfs_id; ssize_t size; @@ -156,7 +157,7 @@ int main(int argc, char *argv[]) if (disk_id == sysfs_id) { if (match[0] == '\0') { /* store id */ - strlcpy(match, dent->d_name, sizeof(match)); + util_strlcpy(match, dent->d_name, sizeof(match)); } else { /* error, same signature for another device */ info(udev, "'%s' does not have a unique signature\n", node);