mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-31 01:11:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

hdd_menu: fix is_mounted for device links

Browse Source 
It is possible to mount e.g. '/dev/disk/by-label/ext_drive', but
is_mounted did not handle this case. Fix that.
This commit is contained in:
Stefan Seyfried
2015-02-08 15:11:37 +01:00
parent b3c82180a5
commit 33730236d6
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/gui/hdd_menu.cpp
View File

@@ -142,14 +142,25 @@ bool CHDDMenuHandler::is_mounted(const char *dev)
else else
snprintf(devpath, sizeof(devpath), "/dev/%s", dev); snprintf(devpath, sizeof(devpath), "/dev/%s", dev);
int devpathlen = strlen(devpath);
char buffer[255]; char buffer[255];
string realdev = backtick("readlink -f " + string(devpath));
realdev = trim(realdev);
FILE *f = fopen("/proc/mounts", "r"); FILE *f = fopen("/proc/mounts", "r");
if(f) { if(f) {
while (!res && fgets(buffer, sizeof(buffer), f)) while (!res && fgets(buffer, sizeof(buffer), f)) {
if (!strncmp(buffer, devpath, devpathlen) if (buffer[0] != '/')
&& (buffer[devpathlen] == ' ' || buffer[devpathlen] == '\t')) continue; /* only "real" devices are interesting */
char *p = strchr(buffer, ' ');
if (p)
*p = 0; /* terminate at first space, kernel-user ABI is fixed */
if (!strcmp(buffer, devpath)) /* default '/dev/sda1' mount */
res = true; res = true;
else { /* now the case of '/dev/disk/by-label/myharddrive' mounts */
string realmount = backtick("readlink -f " + string(buffer));
if (realdev == trim(realmount))
res = true;
}
}
fclose(f); fclose(f);
} }
printf("CHDDMenuHandler::is_mounted: dev [%s] is %s\n", devpath, res ? "mounted" : "not mounted"); printf("CHDDMenuHandler::is_mounted: dev [%s] is %s\n", devpath, res ? "mounted" : "not mounted");