marco/i3status
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #207 from stapelberg/disk_info

Browse Source 
disk: sanitize trailing slashes
This commit is contained in:
Ingo Bürk 2017-03-08 22:25:51 +01:00 committed by GitHub
commit 554db9fcc1
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/print_disk_info.c
View File

@ -141,16 +141,20 @@ void print_disk_info(yajl_gen json_gen, char *buffer, const char *path, const ch
* we consider the device not mounted. */
mounted = false;
} else {
char *sanitized = sstrdup(path);
if (sanitized[strlen(sanitized) - 1] == '/')
sanitized[strlen(sanitized) - 1] = '\0';
FILE *mntentfile = setmntent("/etc/mtab", "r");
struct mntent *m;
while ((m = getmntent(mntentfile)) != NULL) {
if (strcmp(m->mnt_dir, path) == 0) {
if (strcmp(m->mnt_dir, sanitized) == 0) {
mounted = true;
break;
}
}
endmntent(mntentfile);
free(sanitized);
}
#endif