5965373e69
- Make getvfsbyname() take a struct xvfsconf *. - Convert several consumers of getvfsbyname() to use struct xvfsconf. - Correct the getvfsbyname.3 manpage. - Create a new vfs.conflist sysctl to dump all the struct xvfsconf in the kernel, and rewrite getvfsbyname() to use this instead of the weird existing API. - Convert some {set,get,end}vfsent() consumers to use the new vfs.conflist sysctl. - Convert a vfsload() call in nfsiod.c to kldload() and remove the useless vfsisloadable() and endvfsent() calls. - Add a warning printf() in vfs_sysctl() to tell people they are using an old userland. After these changes, it's possible to modify struct vfsconf without breaking the binary compatibility. Please note that these changes don't break this compatibility either. When bp will have updated mount_smbfs(8) with the patch I sent him, there will be no more consumers of the {set,get,end}vfsent(), vfsisloadable() and vfsload() API, and I will promptly delete it.
150 lines
2.1 KiB
C
150 lines
2.1 KiB
C
/*
|
|
* getvfsent.c - get a listing of installed filesystems
|
|
* Written September 1994 by Garrett A. Wollman
|
|
* This file is in the public domain.
|
|
*
|
|
*/
|
|
|
|
#include <sys/cdefs.h>
|
|
__FBSDID("$FreeBSD$");
|
|
|
|
#include <sys/param.h>
|
|
#include <sys/types.h>
|
|
#include <sys/mount.h>
|
|
#include <sys/sysctl.h>
|
|
#include <unistd.h>
|
|
#include <sys/file.h>
|
|
#include <sys/wait.h>
|
|
#include <string.h>
|
|
#include <stdlib.h>
|
|
#include <stdio.h>
|
|
#include <paths.h>
|
|
|
|
/* XXX hide some compatibility problems. */
|
|
#define vfsconf ovfsconf
|
|
|
|
static struct vfsconf *_vfslist = 0;
|
|
static struct vfsconf _vfsconf;
|
|
static size_t _vfslistlen = 0;
|
|
static int _vfs_keeplist = 0;
|
|
static int _vfs_index = 0;
|
|
|
|
static int
|
|
initvfs(void)
|
|
{
|
|
int mib[2] = { CTL_VFS, VFS_VFSCONF };
|
|
size_t size = 0;
|
|
int rv;
|
|
|
|
rv = sysctl(mib, 2, (void *)0, &size, (void *)0, (size_t)0);
|
|
if(rv < 0)
|
|
return 0;
|
|
|
|
if(_vfslist)
|
|
free(_vfslist);
|
|
_vfslist = malloc(size);
|
|
if(!_vfslist)
|
|
return 0;
|
|
|
|
rv = sysctl(mib, 2, _vfslist, &size, (void *)0, (size_t)0);
|
|
if(rv < 0) {
|
|
free(_vfslist);
|
|
_vfslist = 0;
|
|
return 0;
|
|
}
|
|
|
|
_vfslistlen = size / sizeof _vfslist[0];
|
|
return 1;
|
|
}
|
|
|
|
struct vfsconf *
|
|
getvfsent(void)
|
|
{
|
|
if(!_vfslist && !initvfs()) {
|
|
return 0;
|
|
}
|
|
|
|
do {
|
|
if(_vfs_index >= _vfslistlen) {
|
|
return 0;
|
|
}
|
|
|
|
_vfsconf = _vfslist[_vfs_index++];
|
|
} while(!_vfsconf.vfc_vfsops);
|
|
|
|
if(!_vfs_keeplist) {
|
|
free(_vfslist);
|
|
_vfslist = 0;
|
|
}
|
|
return &_vfsconf;
|
|
}
|
|
|
|
struct vfsconf *
|
|
getvfsbytype(int type)
|
|
{
|
|
int i;
|
|
|
|
if(!_vfslist && !initvfs()) {
|
|
return 0;
|
|
}
|
|
|
|
for(i = 0; i < _vfslistlen; i++) {
|
|
if(_vfslist[i].vfc_index == type)
|
|
break;
|
|
}
|
|
|
|
if(i < _vfslistlen) {
|
|
_vfsconf = _vfslist[i];
|
|
}
|
|
|
|
if(!_vfs_keeplist) {
|
|
free(_vfslist);
|
|
_vfslist = 0;
|
|
}
|
|
|
|
if(i < _vfslistlen) {
|
|
return &_vfsconf;
|
|
} else {
|
|
return 0;
|
|
}
|
|
}
|
|
|
|
void
|
|
setvfsent(int keep)
|
|
{
|
|
if(_vfslist && !keep) {
|
|
free(_vfslist);
|
|
_vfslist = 0;
|
|
}
|
|
|
|
_vfs_keeplist = keep;
|
|
_vfs_index = 0;
|
|
}
|
|
|
|
void
|
|
endvfsent(void)
|
|
{
|
|
if(_vfslist) {
|
|
free(_vfslist);
|
|
_vfslist = 0;
|
|
}
|
|
|
|
_vfs_index = 0;
|
|
}
|
|
|
|
int
|
|
vfsisloadable(const char *name)
|
|
{
|
|
return 1;
|
|
}
|
|
|
|
int
|
|
vfsload(const char *name)
|
|
{
|
|
int status;
|
|
|
|
status = kldload(name);
|
|
return status == -1 ? status : 0;
|
|
}
|
|
|