projects
/
project
/
mountd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
support for disk without partition table
[project/mountd.git]
/
mount.c
diff --git
a/mount.c
b/mount.c
index 0c2862a06f081e1323bff3e18063772526afb1b8..7cbb8fff365907a47b8b560f0d92f176c1611284 100644
(file)
--- a/
mount.c
+++ b/
mount.c
@@
-693,13
+693,19
@@
static void mount_enum_drives(void)
char tmp[64];
snprintf(tmp, 64, "/sys/block/%s/", namelist[n]->d_name);
m = scandir(tmp, &namelist2, dir_filter2, dir_sort);
char tmp[64];
snprintf(tmp, 64, "/sys/block/%s/", namelist[n]->d_name);
m = scandir(tmp, &namelist2, dir_filter2, dir_sort);
-
while(m--
)
+
if(m > 0
)
{
{
- strncpy(&block[blk_cnt][0], namelist2[m]->d_name, MAX_BLOCK);
+ while(m--)
+ {
+ strncpy(&block[blk_cnt][0], namelist2[m]->d_name, MAX_BLOCK);
+ blk_cnt++;
+ free(namelist2[m]);
+ }
+ free(namelist2);
+ } else {
+ strncpy(&block[blk_cnt][0], namelist[n]->d_name, MAX_BLOCK);
blk_cnt++;
blk_cnt++;
- free(namelist2[m]);
}
}
- free(namelist2);
}
free(namelist[n]);
}
}
free(namelist[n]);
}