Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-12-25 20:11:11 +00:00
Code Issues Releases Activity

implement upwards path traversal to find fs type

Browse Source 
* yes, this is a feature and right now there is something
  like a feature freeze.
* BUT I tested this with: /, /tmp, /dev/mapper, /dev, //,
  /mnt/, /tmp/bla (the last one was non-existent, creating
  it during runtime and even mounting tmpfs on it led to
  expected results.


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1074 7f574dfc-610e-0410-a909-a81674777703
This commit is contained in:
Phil 2008-03-29 11:09:47 +00:00
parent 9d4c7ed14e
commit 5c4fee8d32
1 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/fs.c
View File

@ -138,10 +138,11 @@ void get_fs_type(const char *path, char *result)
#else /* HAVE_STRUCT_STATFS_F_FSTYPENAME */
/* TODO: walk up the directory tree so it works on on paths that are not actually mount points. */
struct mntent *me;
FILE *mtab = setmntent("/etc/mtab", "r");
char *search_path;
int match;
char *slash;
if (mtab == NULL) {
ERR("setmntent /etc/mtab: %s", strerror(errno));
@ -152,11 +153,28 @@ void get_fs_type(const char *path, char *result)
me = getmntent(mtab);
// find our path in the mtab
while (strcmp(path, me->mnt_dir) && getmntent(mtab));
search_path = strdup(path);
do {
while ((match = strcmp(search_path, me->mnt_dir))
&& getmntent(mtab));
if (!match)
break;
fseek(mtab, 0, SEEK_SET);
slash = strrchr(search_path, '/');
if (slash == NULL)
CRIT_ERR("invalid path '%s'", path);
if (strlen(slash) == 1) /* trailing slash */
*(slash) = '\0';
else if (strlen(slash) > 1)
*(slash + 1) = '\0';
else
CRIT_ERR("found a crack in the matrix!");
} while (strlen(search_path) > 0);
free(search_path);
endmntent(mtab);
if (me && !strcmp(path, me->mnt_dir)) {
if (me && !match) {
strncpy(result, me->mnt_type, DEFAULT_TEXT_BUFFER_SIZE);
return;
}