shihaam/isodrive
1
0
Fork 0
mirror of https://github.com/nitanmarcel/isodrive.git synced 2026-03-13 04:17:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

isodrive: remove getprop depedency, allow switching cdrom and ro modes

Browse Source
This commit is contained in:
Marcel Alexandru Nitan
2023-02-04 15:48:32 +02:00
parent 428659298b
commit fe880c156f
6 changed files with 95 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/util.cpp
View File

@@ -11,24 +11,13 @@
#include <memory>
#include <cstdio>
// https://stackoverflow.com/a/123724
void trim(char *s)
{
char * p = s;
int l = strlen(p);
while(isspace(p[l - 1])) p[--l] = 0;
while(* p && isspace(* p)) ++p, --l;
memmove(s, p, l + 1);
}
char *fs_mount_point(char *filesystem_type) {
struct mntent *ent;
FILE *mounts;
char *mount_point = NULL;
char *mount_point = nullptr;
mounts = setmntent("/proc/mounts", "r");
while (NULL != (ent = getmntent(mounts))) {
while (nullptr != (ent = getmntent(mounts))) {
if (strcmp(ent->mnt_fsname, filesystem_type) == 0)
{
mount_point = ent->mnt_dir;
@@ -73,21 +62,12 @@ char *sysfs_read(char *path)
}
sysfsFile >> value;
sysfsFile.close();
if (value.empty())
{
return nullptr;
}
char *result = new char[value.length() + 1];
strcpy(result, value.c_str());
return result;
}
char *getprop(char *key)
{
std::array<char, 128> buffer;
char *value;
char *cmd = strjin("getprop ", key);
std::unique_ptr<FILE, decltype(&pclose)> pipe(popen(cmd, "r"), pclose);
while (fgets(buffer.data(), buffer.size(), pipe.get()) != nullptr)
value = strjin("", buffer.data());
trim(value);
return value;
}