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

Merge pull request #319 from eplanet/fix-etc-mtab

Browse Source 
Read /proc/mounts if /etc/mtab can't be read
This commit is contained in:
Orestis 2018-11-08 11:52:47 +02:00 committed by GitHub
commit 2d38178063
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/print_disk_info.c
View File

@ -145,15 +145,22 @@ void print_disk_info(yajl_gen json_gen, char *buffer, const char *path, const ch
if (strlen(sanitized) > 1 && sanitized[strlen(sanitized) - 1] == '/') if (strlen(sanitized) > 1 && sanitized[strlen(sanitized) - 1] == '/')
sanitized[strlen(sanitized) - 1] = '\0'; sanitized[strlen(sanitized) - 1] = '\0';
FILE *mntentfile = setmntent("/etc/mtab", "r"); FILE *mntentfile = setmntent("/etc/mtab", "r");
struct mntent *m; if (mntentfile == NULL) {
mntentfile = setmntent("/proc/mounts", "r");
while ((m = getmntent(mntentfile)) != NULL) { }
if (strcmp(m->mnt_dir, sanitized) == 0) { if (mntentfile == NULL) {
mounted = true; fprintf(stderr, "i3status: files /etc/mtab and /proc/mounts aren't accessible\n");
break; } else {
} struct mntent *m;
while ((m = getmntent(mntentfile)) != NULL) {
if (strcmp(m->mnt_dir, sanitized) == 0) {
mounted = true;
break;
}
}
endmntent(mntentfile);
} }
endmntent(mntentfile);
free(sanitized); free(sanitized);
} }
#endif #endif