Use mntent in df(1)
I am slowly going to remove grabmntinfo and friends.
This commit is contained in:
parent
4b72fcf421
commit
005e90a7ff
23
df.c
23
df.c
@ -1,8 +1,8 @@
|
||||
/* See LICENSE file for copyright and license details. */
|
||||
#include <sys/statvfs.h>
|
||||
#include <mntent.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include "grabmntinfo.h"
|
||||
#include <sys/statvfs.h>
|
||||
#include "util.h"
|
||||
|
||||
static void mnt_show(const char *fsname, const char *dir);
|
||||
@ -16,8 +16,8 @@ usage(void)
|
||||
int
|
||||
main(int argc, char *argv[])
|
||||
{
|
||||
struct mntinfo *minfo = NULL;
|
||||
int siz, i;
|
||||
struct mntent *me = NULL;
|
||||
FILE *fp;
|
||||
|
||||
ARGBEGIN {
|
||||
case 'a':
|
||||
@ -31,16 +31,13 @@ main(int argc, char *argv[])
|
||||
} ARGEND;
|
||||
|
||||
printf("Filesystem 512-blocks Used Avail Capacity Mounted on\n");
|
||||
siz = grabmntinfo(&minfo);
|
||||
if (!siz)
|
||||
eprintf("grabmntinfo:");
|
||||
|
||||
for (i = 0; i < siz; i++) {
|
||||
mnt_show(minfo[i].fsname, minfo[i].mntdir);
|
||||
free(minfo[i].fsname);
|
||||
free(minfo[i].mntdir);
|
||||
}
|
||||
free(minfo);
|
||||
fp = setmntent("/proc/mounts", "r");
|
||||
if (!fp)
|
||||
eprintf("setmntent %s:", "/proc/mounts");
|
||||
while ((me = getmntent(fp)) != NULL)
|
||||
mnt_show(me->mnt_fsname, me->mnt_dir);
|
||||
endmntent(fp);
|
||||
|
||||
return EXIT_SUCCESS;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user