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

Get the UUID from the imported file or directory

Browse source
This commit is contained in:
Andrea Mazzoleni 2026-04-22 19:58:08 +02:00
parent 18aa07be36
commit ae8a89ec25
1 changed files with 7 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

16
cmdline/state.c
View file

@ -671,7 +671,6 @@ void state_config(struct snapraid_state* state, const char* path, const char* co
char device[PATH_MAX];
char* split_map[SPLIT_MAX + 1];
unsigned split_mac;
char* slash;
uint64_t dev;
int skip_access;
@ -717,16 +716,15 @@ void state_config(struct snapraid_state* state, const char* path, const char* co
/* get the device of the directory containing the parity file */
pathimport(device, sizeof(device), split_map[s]);
slash = strrchr(device, '/');
if (slash)
slash[1] = 0;
else
pathcpy(device, sizeof(device), ".");
/* use only the dir, as the parity file may not exist yet */
pathcut(device);
if (stat(device, &st) == 0) {
dev = st.st_dev;
/* read the uuid, if unsupported use an empty one */
if (devuuid(dev, split_map[s], uuid, sizeof(uuid)) != 0) {
if (devuuid(dev, device, uuid, sizeof(uuid)) != 0) {
*uuid = 0;
}
} else {
@ -964,7 +962,7 @@ void state_config(struct snapraid_state* state, const char* path, const char* co
dev = st.st_dev;
/* read the uuid, if unsupported use an empty one */
if (devuuid(dev, dir, uuid, sizeof(uuid)) != 0) {
if (devuuid(dev, device, uuid, sizeof(uuid)) != 0) {
*uuid = 0;
}
@ -1065,7 +1063,7 @@ void state_config(struct snapraid_state* state, const char* path, const char* co
dev = st.st_dev;
/* read the uuid, if unsupported use an empty one */
if (devuuid(dev, dir, uuid, sizeof(uuid)) != 0) {
if (devuuid(dev, device, uuid, sizeof(uuid)) != 0) {
*uuid = 0;
}