diff options
Diffstat (limited to 'lib/getmountlist.c')
| -rw-r--r-- | lib/getmountlist.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/lib/getmountlist.c b/lib/getmountlist.c index d2484937..8410a923 100644 --- a/lib/getmountlist.c +++ b/lib/getmountlist.c @@ -1,4 +1,8 @@ /* vi: set sw=4 ts=4 : */ +/* getmountlist.c - Get a linked list of mount points, with stat information. + * + * Copyright 2006 Rob Landley <rob@landley.net> + */ #include "toys.h" @@ -6,8 +10,9 @@ char *path_mounts = "/proc/mounts"; -// Get a list of mount points from /etc/mtab or /proc/mounts. This returns -// a reversed list, which is good for finding overmounts and such. +// Get a list of mount points from /etc/mtab or /proc/mounts, including +// statvfs() information. This returns a reversed list, which is good for +// finding overmounts and such. struct mtab_list *getmountlist(int die) { @@ -21,9 +26,13 @@ struct mtab_list *getmountlist(int die) if (die) error_exit("cannot open %s", path_mounts); } else { while (getmntent_r(fp, &me, evilbuf, sizeof(evilbuf))) { - mt = xmalloc(sizeof(struct mtab_list) + strlen(me.mnt_fsname) + + mt = xzalloc(sizeof(struct mtab_list) + strlen(me.mnt_fsname) + strlen(me.mnt_dir) + strlen(me.mnt_type) + 3); mt->next = mtlist; + // Get information about this filesystem. Yes, we need both. + stat(me.mnt_dir, &(mt->stat)); + statvfs(me.mnt_dir, &(mt->statvfs)); + // Remember information from /proc/mounts strcpy(mt->type, me.mnt_type); mt->dir = mt->type + strlen(mt->type) + 1; strcpy(mt->dir, me.mnt_dir); |