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

Add smartctl_scan into support module

Browse source
This commit is contained in:
Andrea Mazzoleni 2015-01-24 22:50:42 +01:00
parent ebabaacfe9
commit 74026ddca8
3 changed files with 43 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

30
cmdline/mingw.c
View file

@ -1792,31 +1792,11 @@ static int devscan(tommy_list* list)
/* LCOV_EXCL_STOP */
}
while (1) {
char buf[256];
char* s;
s = fgets(buf, sizeof(buf), f);
if (s == 0)
break;
if (s[0] == '/') {
char* sep = strchr(s, ' ');
if (sep) {
devinfo_t* devinfo;
/* clear everything after the first space */
*sep = 0;
devinfo = calloc_nofail(1, sizeof(devinfo_t));
pathcpy(devinfo->file, sizeof(devinfo->file), s);
/* insert in the list */
tommy_list_insert_tail(list, &devinfo->node, devinfo);
}
}
if (smartctl_scan(f, list) != 0) {
/* LCOV_EXCL_START */
pclose(f);
return -1;
/* LCOV_EXCL_STOP */
}
ret = pclose(f);

32
cmdline/support.c
View file

@ -439,7 +439,6 @@ int smartctl_attribute(FILE* f, uint64_t* smart, char* serial)
char* s;
s = fgets(buf, sizeof(buf), f);
if (s == 0)
break;
@ -489,3 +488,34 @@ int smartctl_attribute(FILE* f, uint64_t* smart, char* serial)
return 0;
}
int smartctl_scan(FILE* f, tommy_list* list)
{
while (1) {
char buf[256];
char* s;
s = fgets(buf, sizeof(buf), f);
if (s == 0)
break;
if (*s == '/') {
char* sep = strchr(s, ' ');
if (sep) {
devinfo_t* devinfo;
/* clear everything after the first space */
*sep = 0;
devinfo = calloc_nofail(1, sizeof(devinfo_t));
pathcpy(devinfo->file, sizeof(devinfo->file), s);
/* insert in the list */
tommy_list_insert_tail(list, &devinfo->node, devinfo);
}
}
}
return 0;
}

8
cmdline/support.h
View file

@ -126,9 +126,15 @@ void malloc_fail(size_t size);
/**
* Reads smartctl attributes from a stream.
* Returns -1 on error.
* Returns 0 on success.
*/
int smartctl_attribute(FILE* f, uint64_t* smart, char* serial);
/**
* Reads smartctl --scan from a stream.
* Returns 0 on success.
*/
int smartctl_scan(FILE* f, tommy_list* list);
#endif