Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-11-15 17:47:09 +00:00
Code Issues Releases Activity

Search device labels for diskio

Browse Source
This commit is contained in:
Troy C 2015-02-19 13:42:50 -06:00
parent c35c8520ba
commit 345d62a555
1 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/diskio.cc
View File

@ -58,19 +58,33 @@ void clear_diskio_stats(void)
struct diskio_stat *prepare_diskio_stat(const char *s) struct diskio_stat *prepare_diskio_stat(const char *s)
{ {
struct stat sb; struct stat sb;
std::vector<char> stat_name(text_buffer_size.get(*state)), device_name(text_buffer_size.get(*state)); std::vector<char> stat_name(text_buffer_size.get(*state)), device_name(text_buffer_size.get(*state)), device_s(text_buffer_size.get(*state));
struct diskio_stat *cur = &stats; struct diskio_stat *cur = &stats;
if (!s) if (!s) {
return &stats; return &stats;
} else {
strncpy(&(device_s[0]), s, text_buffer_size.get(*state));
}
#if defined(__FreeBSD__) || defined(__DragonFly__) if (strncmp(&(device_s[0]), "label:", 6) == 0) {
if (strncmp(s, "/dev/", 5) == 0) { snprintf(&(device_name[0]), text_buffer_size.get(*state), "/dev/disk/by-label/%s", &(device_s[6]));
// supplied a /dev/device arg, so cut off the /dev part
strncpy(&(device_name[0]), s + 5, text_buffer_size.get(*state)); char * rpbuf;
} else rpbuf = realpath(&device_name[0], NULL);
strncpy(&device_s[0], rpbuf, text_buffer_size.get(*state));
free(rpbuf);
} else {
strncpy(&device_s[0], s, text_buffer_size.get(*state));
}
#if defined(__FreeBSD__) || defined(__DragonFly__) || defined(__linux__)
if (strncmp(&device_s[0], "/dev/", 5) == 0) {
device_s.erase(device_s.begin(), device_s.begin()+5);
}
#endif #endif
strncpy(&(device_name[0]), s, text_buffer_size.get(*state)); strncpy(&(device_name[0]), &device_s[0], text_buffer_size.get(*state));
snprintf(&(stat_name[0]), text_buffer_size.get(*state), "/dev/%s", &(device_name[0])); snprintf(&(stat_name[0]), text_buffer_size.get(*state), "/dev/%s", &(device_name[0]));
@ -89,7 +103,7 @@ struct diskio_stat *prepare_diskio_stat(const char *s)
/* no existing found, make a new one */ /* no existing found, make a new one */
cur->next = new diskio_stat; cur->next = new diskio_stat;
cur = cur->next; cur = cur->next;
cur->dev = strndup(&(device_name[0]), text_buffer_size.get(*state)); cur->dev = strndup(&(device_s[0]), text_buffer_size.get(*state));
cur->last = UINT_MAX; cur->last = UINT_MAX;
cur->last_read = UINT_MAX; cur->last_read = UINT_MAX;
cur->last_write = UINT_MAX; cur->last_write = UINT_MAX;