Enable getmntinfo(3)
Change-Id: Ida9b0660471bb9fde3cdca6c9b9fd9e94341e02f
This commit is contained in:
parent
51dbf35d9d
commit
430c2113c7
3 changed files with 9 additions and 13 deletions
|
@ -9,7 +9,7 @@
|
||||||
|
|
||||||
.if defined(__MINIX)
|
.if defined(__MINIX)
|
||||||
# Unsupported by Minix.
|
# Unsupported by Minix.
|
||||||
# closefrom.c confstr.c extattr.c getdevmajor.c getmntinfo.c \
|
# closefrom.c confstr.c extattr.c getdevmajor.c \
|
||||||
# pthread_atfork.c setdomainname.c sethostname.c setproctitle.c \
|
# pthread_atfork.c setdomainname.c sethostname.c setproctitle.c \
|
||||||
# sysctl.c sysctlbyname.c sysctlgetmibinfo.c sysctlnametomib.c \
|
# sysctl.c sysctlbyname.c sysctlgetmibinfo.c sysctlnametomib.c \
|
||||||
# devname.c wait3.c
|
# devname.c wait3.c
|
||||||
|
@ -32,7 +32,7 @@ SRCS+= _errno.c alarm.c alphasort.c arc4random.c assert.c basename.c clock.c \
|
||||||
fts.c ftw.c getbsize.c getcap.c getcwd.c \
|
fts.c ftw.c getbsize.c getcap.c getcwd.c \
|
||||||
getdomainname.c getgrent.c \
|
getdomainname.c getgrent.c \
|
||||||
getgrouplist.c getgroupmembership.c gethostname.c \
|
getgrouplist.c getgroupmembership.c gethostname.c \
|
||||||
getloadavg.c getlogin.c \
|
getloadavg.c getlogin.c getmntinfo.c \
|
||||||
getnetgrent.c getpagesize.c \
|
getnetgrent.c getpagesize.c \
|
||||||
getpass.c getprogname.c getpwent.c getttyent.c \
|
getpass.c getprogname.c getpwent.c getttyent.c \
|
||||||
getusershell.c glob.c humanize_number.c initdir.c initgroups.c \
|
getusershell.c glob.c humanize_number.c initdir.c initgroups.c \
|
||||||
|
|
|
@ -136,12 +136,12 @@ main(int argc, char *argv[])
|
||||||
#ifndef __minix
|
#ifndef __minix
|
||||||
struct disk_geom geo;
|
struct disk_geom geo;
|
||||||
struct dkwedge_info dkw;
|
struct dkwedge_info dkw;
|
||||||
struct statvfs *mp;
|
|
||||||
char *s2;
|
|
||||||
int len, n;
|
|
||||||
#else
|
#else
|
||||||
u64_t minix_fssize;
|
u64_t minix_fssize;
|
||||||
#endif
|
#endif
|
||||||
|
struct statvfs *mp;
|
||||||
|
char *s2;
|
||||||
|
int len, n;
|
||||||
struct stat sb;
|
struct stat sb;
|
||||||
int ch, fsi, fso, Fflag, Iflag, Zflag;
|
int ch, fsi, fso, Fflag, Iflag, Zflag;
|
||||||
char *cp, *s1, *special;
|
char *cp, *s1, *special;
|
||||||
|
@ -280,7 +280,6 @@ main(int argc, char *argv[])
|
||||||
if (fsi < 0 || fstat(fsi, &sb) == -1)
|
if (fsi < 0 || fstat(fsi, &sb) == -1)
|
||||||
err(EXIT_FAILURE, "%s: open for read", special);
|
err(EXIT_FAILURE, "%s: open for read", special);
|
||||||
|
|
||||||
#ifndef __minix
|
|
||||||
if (!Nflag) {
|
if (!Nflag) {
|
||||||
fso = open(special, O_WRONLY, 0);
|
fso = open(special, O_WRONLY, 0);
|
||||||
if (fso < 0)
|
if (fso < 0)
|
||||||
|
@ -312,6 +311,7 @@ main(int argc, char *argv[])
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifndef __minix
|
||||||
if (getdiskinfo(special, fsi, disktype, &geo, &dkw) == -1)
|
if (getdiskinfo(special, fsi, disktype, &geo, &dkw) == -1)
|
||||||
errx(EXIT_FAILURE, lmsg, special);
|
errx(EXIT_FAILURE, lmsg, special);
|
||||||
|
|
||||||
|
@ -335,12 +335,6 @@ main(int argc, char *argv[])
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
{
|
|
||||||
fso = open(special, O_WRONLY, 0);
|
|
||||||
if (fso < 0)
|
|
||||||
err(EXIT_FAILURE,
|
|
||||||
"%s: open for write", special);
|
|
||||||
|
|
||||||
if(minix_sizeup(special, &minix_fssize) < 0)
|
if(minix_sizeup(special, &minix_fssize) < 0)
|
||||||
errx(EXIT_FAILURE, "minix_sizeup failed");
|
errx(EXIT_FAILURE, "minix_sizeup failed");
|
||||||
|
|
||||||
|
@ -349,7 +343,6 @@ main(int argc, char *argv[])
|
||||||
|
|
||||||
if (sectorsize == 0)
|
if (sectorsize == 0)
|
||||||
sectorsize = 512;
|
sectorsize = 512;
|
||||||
}
|
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -118,6 +118,9 @@ __BEGIN_DECLS
|
||||||
int statvfs(const char *__restrict, struct statvfs *__restrict);
|
int statvfs(const char *__restrict, struct statvfs *__restrict);
|
||||||
int fstatvfs(int, struct statvfs *);
|
int fstatvfs(int, struct statvfs *);
|
||||||
int getvfsstat(struct statvfs *, size_t, int);
|
int getvfsstat(struct statvfs *, size_t, int);
|
||||||
|
#ifndef __LIBC12_SOURCE__
|
||||||
|
int getmntinfo(struct statvfs **, int) __RENAME(__getmntinfo13);
|
||||||
|
#endif /* __LIBC12_SOURCE__ */
|
||||||
|
|
||||||
int statvfs1(const char *__restrict, struct statvfs *__restrict, int);
|
int statvfs1(const char *__restrict, struct statvfs *__restrict, int);
|
||||||
int fstatvfs1(int, struct statvfs *, int);
|
int fstatvfs1(int, struct statvfs *, int);
|
||||||
|
|
Loading…
Reference in a new issue