wip mount() NetBSD emulation
This commit is contained in:
Jean-Baptiste Boric
parent
a32bbb008e
commit
5084102fbc
|
|
@ -11,7 +11,7 @@ SRCS+= accept.c access.c adjtime.c bind.c brk.c sbrk.c m_closefrom.c getsid.c \
|
|||
getsockopt.c setsockopt.c gettimeofday.c geteuid.c getuid.c \
|
||||
getvfsstat.c \
|
||||
ioctl.c issetugid.c kill.c link.c listen.c loadname.c lseek.c \
|
||||
minix_rs.c mkdir.c mkfifo.c mknod.c mmap.c mount.c nanosleep.c \
|
||||
minix_mount.c minix_rs.c mkdir.c mkfifo.c mknod.c mmap.c mount.c nanosleep.c \
|
||||
open.c pathconf.c pipe.c poll.c posix_spawn.c pread.c ptrace.c pwrite.c \
|
||||
read.c readlink.c reboot.c recvfrom.c recvmsg.c rename.c \
|
||||
rmdir.c select.c sem.c sendmsg.c sendto.c setgroups.c setsid.c \
|
||||
|
|
|
|||
232
minix/lib/libc/sys/minix_mount.c
Normal file
232
minix/lib/libc/sys/minix_mount.c
Normal file
|
|
@ -0,0 +1,232 @@
|
|||
#include <sys/cdefs.h>
|
||||
#include "namespace.h"
|
||||
#include <lib.h>
|
||||
|
||||
#include <string.h>
|
||||
#include <sys/mount.h>
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
#include <sys/stat.h>
|
||||
#include <minix/paths.h>
|
||||
#include <minix/rs.h>
|
||||
#include <minix/syslib.h>
|
||||
#include <unistd.h>
|
||||
#define OK 0
|
||||
|
||||
#define FSDEFAULT "mfs"
|
||||
|
||||
static char fspath[] = "/service/:/usr/pkg/service/"; /* Must include trailing '/' */
|
||||
|
||||
static int rs_down(char *label)
|
||||
{
|
||||
char cmd[200];
|
||||
if(strlen(_PATH_SERVICE)+strlen(label)+50 >= sizeof(cmd))
|
||||
return -1;
|
||||
sprintf(cmd, _PATH_SERVICE " down '%s'", label);
|
||||
return system(cmd);
|
||||
}
|
||||
|
||||
char *find_rslabel(char *args_line);
|
||||
|
||||
int minix_mount(char *special, char *name, int mountflags, int srvflags,
|
||||
char *type, char *args)
|
||||
{
|
||||
int r;
|
||||
message m;
|
||||
struct stat statbuf;
|
||||
char label[MNT_LABEL_LEN];
|
||||
char path[PATH_MAX];
|
||||
char cmd[200];
|
||||
char *p;
|
||||
char *rslabel;
|
||||
int reuse = 0;
|
||||
int use_existing = 0;
|
||||
|
||||
/* Default values. */
|
||||
if (type == NULL) type = __UNCONST(FSDEFAULT);
|
||||
if (args == NULL) args = __UNCONST("");
|
||||
reuse = 0;
|
||||
memset(path, '\0', sizeof(path));
|
||||
|
||||
/* Check service flags. */
|
||||
if(srvflags & MS_REUSE)
|
||||
reuse = 1;
|
||||
|
||||
if(srvflags & MS_EXISTING)
|
||||
use_existing = 1;
|
||||
|
||||
/* Make a label for the file system process. This label must be unique and
|
||||
* may currently not exceed 16 characters including terminating null. For
|
||||
* requests with an associated block device, we use the last path component
|
||||
* name of the block special file (truncated to 12 characters, which is
|
||||
* hopefully enough). For requests with no associated block device, we use
|
||||
* the device number and inode of the mount point, in hexadecimal form.
|
||||
*/
|
||||
if (!use_existing) {
|
||||
if (special) {
|
||||
p = strrchr(special, '/');
|
||||
p = p ? p + 1 : special;
|
||||
if (strchr(p, '\'')) {
|
||||
errno = EINVAL;
|
||||
return -1;
|
||||
}
|
||||
snprintf(label, MNT_LABEL_LEN, "fs_%.12s", p);
|
||||
} else {
|
||||
/* check for a rslabel option in the arguments and try to use
|
||||
* that.
|
||||
*/
|
||||
rslabel = find_rslabel(args);
|
||||
if (rslabel != NULL){
|
||||
snprintf(label, MNT_LABEL_LEN, "%s", rslabel);
|
||||
free(rslabel);
|
||||
} else {
|
||||
if (stat(name, &statbuf) < 0) return -1;
|
||||
snprintf(label, MNT_LABEL_LEN, "fs_%llx_%llx", statbuf.st_dev, statbuf.st_ino);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
/* label to long? */
|
||||
if (strlen(type) < MNT_LABEL_LEN) {
|
||||
snprintf(label, MNT_LABEL_LEN, "%s", type);
|
||||
} else {
|
||||
errno = ENOMEM;
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
|
||||
/* Sanity check on user input. */
|
||||
if(strchr(args, '\'')) {
|
||||
errno = EINVAL;
|
||||
return -1;
|
||||
}
|
||||
/* start the fs-server if not using existing one */
|
||||
if (!use_existing) {
|
||||
/* See if the given type is even remotely valid. */
|
||||
|
||||
char *testpath;
|
||||
testpath = strtok(fspath, ":");
|
||||
|
||||
do {
|
||||
if (strlen(testpath) + strlen(type) >= sizeof(path)) {
|
||||
errno = E2BIG;
|
||||
return(-1);
|
||||
}
|
||||
|
||||
strcpy(path, testpath);
|
||||
strcat(path, type);
|
||||
|
||||
if (access(path, F_OK) == 0) break;
|
||||
|
||||
} while ((testpath = strtok(NULL, ":")) != NULL);
|
||||
|
||||
if (testpath == NULL) {
|
||||
/* We were not able to find type somewhere in "fspath" */
|
||||
errno = EINVAL;
|
||||
return(-1);
|
||||
}
|
||||
|
||||
if (strlen(_PATH_SERVICE) + strlen(path) + strlen(label) +
|
||||
strlen(args) + 50 >= sizeof(cmd)) {
|
||||
errno = E2BIG;
|
||||
return -1;
|
||||
}
|
||||
|
||||
sprintf(cmd, _PATH_SERVICE " %sup %s -label '%s' -args '%s %s %s%s'",
|
||||
reuse ? "-r ": "", path, label, special, name,
|
||||
args[0] ? "-o " : "", args);
|
||||
|
||||
if ((r = system(cmd)) != 0) {
|
||||
fprintf(stderr, "mount: couldn't run %s\n", cmd);
|
||||
errno = r;
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
|
||||
/* Now perform mount(). */
|
||||
memset(&m, 0, sizeof(m));
|
||||
m.m_lc_vfs_mount.flags = mountflags;
|
||||
m.m_lc_vfs_mount.devlen = special ? strlen(special) + 1 : 0;
|
||||
m.m_lc_vfs_mount.pathlen = strlen(name) + 1;
|
||||
m.m_lc_vfs_mount.typelen = strlen(type) + 1;
|
||||
m.m_lc_vfs_mount.labellen = strlen(label) + 1;
|
||||
m.m_lc_vfs_mount.dev = (vir_bytes)special;
|
||||
m.m_lc_vfs_mount.path = (vir_bytes)name;
|
||||
m.m_lc_vfs_mount.type = (vir_bytes)type;
|
||||
m.m_lc_vfs_mount.label = (vir_bytes)label;
|
||||
r = _syscall(VFS_PROC_NR, VFS_MOUNT, &m);
|
||||
|
||||
if (r != OK && !use_existing) {
|
||||
/* If mount() failed, tell RS to shutdown FS process.
|
||||
* No error check - won't do anything with this error anyway.
|
||||
*/
|
||||
rs_down(label);
|
||||
}
|
||||
|
||||
return r;
|
||||
}
|
||||
|
||||
int minix_umount(const char *name, int srvflags)
|
||||
{
|
||||
char label[MNT_LABEL_LEN];
|
||||
message m;
|
||||
int r;
|
||||
|
||||
memset(&m, 0, sizeof(m));
|
||||
m.m_lc_vfs_umount.name = (vir_bytes)name;
|
||||
m.m_lc_vfs_umount.namelen = strlen(name) + 1;
|
||||
m.m_lc_vfs_umount.label = (vir_bytes)label;
|
||||
m.m_lc_vfs_umount.labellen = sizeof(label);
|
||||
r = _syscall(VFS_PROC_NR, VFS_UMOUNT, &m);
|
||||
|
||||
/* don't shut down the driver when exist flag is set */
|
||||
if (!(srvflags & MS_EXISTING)) {
|
||||
if (r == OK) {
|
||||
/* VFS returns the label of the unmounted file system to us. */
|
||||
rs_down(label);
|
||||
}
|
||||
}
|
||||
|
||||
return r;
|
||||
}
|
||||
|
||||
char *find_rslabel(char *args_line)
|
||||
{
|
||||
/**
|
||||
* Find and return the rslabel as given as optional
|
||||
* agument to the mount command e.g.
|
||||
* mount -o rslabel=bla
|
||||
* or
|
||||
* mount -o rw,rslabel=bla
|
||||
* or as found in fstab
|
||||
**/
|
||||
char *buf, *input,*saveptr;
|
||||
buf = input = saveptr = NULL;
|
||||
|
||||
if (args_line == NULL) return NULL;
|
||||
|
||||
/* copy the input args_line we are going to modify it*/
|
||||
input = strndup(args_line,20);
|
||||
if (input == NULL) /* EOM */
|
||||
return NULL; /* it is not that bad to not find a label */
|
||||
|
||||
/* locate rslabel= in the input */
|
||||
buf = strstr(input,"rslabel=");
|
||||
if (buf == NULL) {
|
||||
free(input);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/* tokenise on "," starting from rslabel (e.g null terminate )*/
|
||||
buf = strtok_r(buf,",",&saveptr);
|
||||
/* tokenise the result again using = and take the second entry */
|
||||
buf = strtok_r(buf,"=",&saveptr);
|
||||
buf = strtok_r(NULL,"=",&saveptr);
|
||||
/* buf is now either NULL if there was no second token or
|
||||
* the value we are searchig for
|
||||
*/
|
||||
if (buf != NULL)
|
||||
buf = strdup(buf);
|
||||
free(input);
|
||||
return buf;
|
||||
}
|
||||
|
||||
|
|
@ -6,227 +6,10 @@
|
|||
#include <sys/mount.h>
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
#include <sys/stat.h>
|
||||
#include <minix/paths.h>
|
||||
#include <minix/rs.h>
|
||||
#include <minix/syslib.h>
|
||||
#include <unistd.h>
|
||||
#define OK 0
|
||||
|
||||
#define FSDEFAULT "mfs"
|
||||
|
||||
static char fspath[] = "/service/:/usr/pkg/service/"; /* Must include trailing '/' */
|
||||
|
||||
static int rs_down(char *label)
|
||||
int __mount50(const char *type, const char *dir, int flags, void *data,
|
||||
size_t len)
|
||||
{
|
||||
char cmd[200];
|
||||
if(strlen(_PATH_SERVICE)+strlen(label)+50 >= sizeof(cmd))
|
||||
return -1;
|
||||
sprintf(cmd, _PATH_SERVICE " down '%s'", label);
|
||||
return system(cmd);
|
||||
}
|
||||
|
||||
char *find_rslabel(char *args_line);
|
||||
|
||||
int minix_mount(char *special, char *name, int mountflags, int srvflags,
|
||||
char *type, char *args)
|
||||
{
|
||||
int r;
|
||||
message m;
|
||||
struct stat statbuf;
|
||||
char label[MNT_LABEL_LEN];
|
||||
char path[PATH_MAX];
|
||||
char cmd[200];
|
||||
char *p;
|
||||
char *rslabel;
|
||||
int reuse = 0;
|
||||
int use_existing = 0;
|
||||
|
||||
/* Default values. */
|
||||
if (type == NULL) type = __UNCONST(FSDEFAULT);
|
||||
if (args == NULL) args = __UNCONST("");
|
||||
reuse = 0;
|
||||
memset(path, '\0', sizeof(path));
|
||||
|
||||
/* Check service flags. */
|
||||
if(srvflags & MS_REUSE)
|
||||
reuse = 1;
|
||||
|
||||
if(srvflags & MS_EXISTING)
|
||||
use_existing = 1;
|
||||
|
||||
/* Make a label for the file system process. This label must be unique and
|
||||
* may currently not exceed 16 characters including terminating null. For
|
||||
* requests with an associated block device, we use the last path component
|
||||
* name of the block special file (truncated to 12 characters, which is
|
||||
* hopefully enough). For requests with no associated block device, we use
|
||||
* the device number and inode of the mount point, in hexadecimal form.
|
||||
*/
|
||||
if (!use_existing) {
|
||||
if (special) {
|
||||
p = strrchr(special, '/');
|
||||
p = p ? p + 1 : special;
|
||||
if (strchr(p, '\'')) {
|
||||
errno = EINVAL;
|
||||
return -1;
|
||||
}
|
||||
snprintf(label, MNT_LABEL_LEN, "fs_%.12s", p);
|
||||
} else {
|
||||
/* check for a rslabel option in the arguments and try to use
|
||||
* that.
|
||||
*/
|
||||
rslabel = find_rslabel(args);
|
||||
if (rslabel != NULL){
|
||||
snprintf(label, MNT_LABEL_LEN, "%s", rslabel);
|
||||
free(rslabel);
|
||||
} else {
|
||||
if (stat(name, &statbuf) < 0) return -1;
|
||||
snprintf(label, MNT_LABEL_LEN, "fs_%llx_%llx", statbuf.st_dev, statbuf.st_ino);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
/* label to long? */
|
||||
if (strlen(type) < MNT_LABEL_LEN) {
|
||||
snprintf(label, MNT_LABEL_LEN, "%s", type);
|
||||
} else {
|
||||
errno = ENOMEM;
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
|
||||
/* Sanity check on user input. */
|
||||
if(strchr(args, '\'')) {
|
||||
errno = EINVAL;
|
||||
errno = ENOTSUP;
|
||||
return -1;
|
||||
}
|
||||
/* start the fs-server if not using existing one */
|
||||
if (!use_existing) {
|
||||
/* See if the given type is even remotely valid. */
|
||||
|
||||
char *testpath;
|
||||
testpath = strtok(fspath, ":");
|
||||
|
||||
do {
|
||||
if (strlen(testpath) + strlen(type) >= sizeof(path)) {
|
||||
errno = E2BIG;
|
||||
return(-1);
|
||||
}
|
||||
|
||||
strcpy(path, testpath);
|
||||
strcat(path, type);
|
||||
|
||||
if (access(path, F_OK) == 0) break;
|
||||
|
||||
} while ((testpath = strtok(NULL, ":")) != NULL);
|
||||
|
||||
if (testpath == NULL) {
|
||||
/* We were not able to find type somewhere in "fspath" */
|
||||
errno = EINVAL;
|
||||
return(-1);
|
||||
}
|
||||
|
||||
if (strlen(_PATH_SERVICE) + strlen(path) + strlen(label) +
|
||||
strlen(args) + 50 >= sizeof(cmd)) {
|
||||
errno = E2BIG;
|
||||
return -1;
|
||||
}
|
||||
|
||||
sprintf(cmd, _PATH_SERVICE " %sup %s -label '%s' -args '%s %s %s%s'",
|
||||
reuse ? "-r ": "", path, label, special, name,
|
||||
args[0] ? "-o " : "", args);
|
||||
|
||||
if ((r = system(cmd)) != 0) {
|
||||
fprintf(stderr, "mount: couldn't run %s\n", cmd);
|
||||
errno = r;
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
|
||||
/* Now perform mount(). */
|
||||
memset(&m, 0, sizeof(m));
|
||||
m.m_lc_vfs_mount.flags = mountflags;
|
||||
m.m_lc_vfs_mount.devlen = special ? strlen(special) + 1 : 0;
|
||||
m.m_lc_vfs_mount.pathlen = strlen(name) + 1;
|
||||
m.m_lc_vfs_mount.typelen = strlen(type) + 1;
|
||||
m.m_lc_vfs_mount.labellen = strlen(label) + 1;
|
||||
m.m_lc_vfs_mount.dev = (vir_bytes)special;
|
||||
m.m_lc_vfs_mount.path = (vir_bytes)name;
|
||||
m.m_lc_vfs_mount.type = (vir_bytes)type;
|
||||
m.m_lc_vfs_mount.label = (vir_bytes)label;
|
||||
r = _syscall(VFS_PROC_NR, VFS_MOUNT, &m);
|
||||
|
||||
if (r != OK && !use_existing) {
|
||||
/* If mount() failed, tell RS to shutdown FS process.
|
||||
* No error check - won't do anything with this error anyway.
|
||||
*/
|
||||
rs_down(label);
|
||||
}
|
||||
|
||||
return r;
|
||||
}
|
||||
|
||||
int minix_umount(const char *name, int srvflags)
|
||||
{
|
||||
char label[MNT_LABEL_LEN];
|
||||
message m;
|
||||
int r;
|
||||
|
||||
memset(&m, 0, sizeof(m));
|
||||
m.m_lc_vfs_umount.name = (vir_bytes)name;
|
||||
m.m_lc_vfs_umount.namelen = strlen(name) + 1;
|
||||
m.m_lc_vfs_umount.label = (vir_bytes)label;
|
||||
m.m_lc_vfs_umount.labellen = sizeof(label);
|
||||
r = _syscall(VFS_PROC_NR, VFS_UMOUNT, &m);
|
||||
|
||||
/* don't shut down the driver when exist flag is set */
|
||||
if (!(srvflags & MS_EXISTING)) {
|
||||
if (r == OK) {
|
||||
/* VFS returns the label of the unmounted file system to us. */
|
||||
rs_down(label);
|
||||
}
|
||||
}
|
||||
|
||||
return r;
|
||||
}
|
||||
|
||||
char *find_rslabel(char *args_line)
|
||||
{
|
||||
/**
|
||||
* Find and return the rslabel as given as optional
|
||||
* agument to the mount command e.g.
|
||||
* mount -o rslabel=bla
|
||||
* or
|
||||
* mount -o rw,rslabel=bla
|
||||
* or as found in fstab
|
||||
**/
|
||||
char *buf, *input,*saveptr;
|
||||
buf = input = saveptr = NULL;
|
||||
|
||||
if (args_line == NULL) return NULL;
|
||||
|
||||
/* copy the input args_line we are going to modify it*/
|
||||
input = strndup(args_line,20);
|
||||
if (input == NULL) /* EOM */
|
||||
return NULL; /* it is not that bad to not find a label */
|
||||
|
||||
/* locate rslabel= in the input */
|
||||
buf = strstr(input,"rslabel=");
|
||||
if (buf == NULL) {
|
||||
free(input);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/* tokenise on "," starting from rslabel (e.g null terminate )*/
|
||||
buf = strtok_r(buf,",",&saveptr);
|
||||
/* tokenise the result again using = and take the second entry */
|
||||
buf = strtok_r(buf,"=",&saveptr);
|
||||
buf = strtok_r(NULL,"=",&saveptr);
|
||||
/* buf is now either NULL if there was no second token or
|
||||
* the value we are searchig for
|
||||
*/
|
||||
if (buf != NULL)
|
||||
buf = strdup(buf);
|
||||
free(input);
|
||||
return buf;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -507,20 +507,19 @@ int getfh(const char *, void *, size_t *)
|
|||
__RENAME(__getfh30);
|
||||
#endif
|
||||
|
||||
#if !defined(__minix)
|
||||
int unmount(const char *, int);
|
||||
#else
|
||||
#if defined(__minix)
|
||||
int minix_umount(const char *_name, int srvflags);
|
||||
#endif /* !defined(__minix) */
|
||||
#else
|
||||
int unmount(const char *, int);
|
||||
#endif /* defined(__minix) */
|
||||
|
||||
#if defined(_NETBSD_SOURCE)
|
||||
#ifndef __LIBC12_SOURCE__
|
||||
#if !defined(__minix)
|
||||
int mount(const char *, const char *, int, void *, size_t) __RENAME(__mount50);
|
||||
#else
|
||||
#if defined(__minix)
|
||||
int minix_mount(char *_spec, char *_name, int _mountflags, int srvflags, char *type,
|
||||
char *args);
|
||||
#endif /* !defined(__minix) */
|
||||
#endif /* defined(__minix) */
|
||||
int fhopen(const void *, size_t, int) __RENAME(__fhopen40);
|
||||
int fhstat(const void *, size_t, struct stat *) __RENAME(__fhstat50);
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user