rt/snapraid
1
0
Fork 0
mirror of https://github.com/amadvance/snapraid.git synced 2026-10-26 19:01:57 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make readdir calls in devuuid consistent with other functions

Browse source
This commit is contained in:
Andrea Mazzoleni 2015-01-30 22:59:53 +01:00
parent 029df96268
commit c110a00452
1 changed files with 8 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

25
cmdline/unix.c
View file

@ -76,6 +76,7 @@ int devuuid(uint64_t device, char* uuid, size_t uuid_size)
{
int ret;
DIR* d;
struct dirent* dd;
struct stat st;
/* scan the UUID directory searching for the device */
@ -85,19 +86,10 @@ int devuuid(uint64_t device, char* uuid, size_t uuid_size)
return -1;
}
while (1) {
struct dirent* dd;
dd = readdir(d);
if (dd == 0) {
/* not found or generic error */
goto bail;
}
while ((dd = readdir(d)) != 0) {
/* skip "." and ".." files, UUIDs never start with '.' */
if (dd->d_name[0] == '.') {
if (dd->d_name[0] == '.')
continue;
}
ret = fstatat(dirfd(d), dd->d_name, &st, 0);
if (ret != 0) {
@ -107,15 +99,14 @@ int devuuid(uint64_t device, char* uuid, size_t uuid_size)
/* if it matches, we have the uuid */
if (S_ISBLK(st.st_mode) && st.st_rdev == (dev_t)device) {
snprintf(uuid, uuid_size, "%s", dd->d_name);
break;
/* found */
pathcpy(uuid, uuid_size, dd->d_name);
closedir(d);
return 0;
}
}
closedir(d);
return 0;
bail:
/* not found */
closedir(d);
return -1;
}