mirror of
https://github.com/uselessd/alcove.git
synced 2026-04-15 09:15:19 +00:00
mount: call per file
This commit is contained in:
@@ -12,7 +12,7 @@
|
||||
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
|
||||
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
*/
|
||||
const alcove_define_t alcove_mount_constants[] = {
|
||||
static const alcove_define_t alcove_mount_constants[] = {
|
||||
#ifdef MS_RDONLY
|
||||
{"rdonly", MS_RDONLY},
|
||||
ALCOVE_DEFINE(MS_RDONLY),
|
||||
@@ -14,9 +14,8 @@
|
||||
*/
|
||||
#include "alcove.h"
|
||||
#include "alcove_call.h"
|
||||
|
||||
#include <sys/mount.h>
|
||||
#include "alcove_mount.h"
|
||||
#include "alcove_mount_constants.h"
|
||||
|
||||
#define MAYBE_NULL(_len, _buf) ((_len) == 0 ? NULL : (_buf))
|
||||
|
||||
@@ -116,57 +115,3 @@ alcove_sys_mount(alcove_state_t *ap, const char *arg, size_t len,
|
||||
? alcove_mk_errno(reply, rlen, errno)
|
||||
: alcove_mk_atom(reply, rlen, "ok");
|
||||
}
|
||||
|
||||
/*
|
||||
* umount(2)
|
||||
*
|
||||
*/
|
||||
ssize_t
|
||||
alcove_sys_umount(alcove_state_t *ap, const char *arg, size_t len,
|
||||
char *reply, size_t rlen)
|
||||
{
|
||||
int index = 0;
|
||||
|
||||
char source[PATH_MAX] = {0};
|
||||
size_t slen = sizeof(source)-1;
|
||||
|
||||
int rv = 0;
|
||||
|
||||
/* source */
|
||||
if (alcove_decode_iolist(arg, len, &index, source, &slen) < 0 ||
|
||||
slen == 0)
|
||||
return -1;
|
||||
|
||||
#if defined(__linux__) || defined(__sunos__)
|
||||
rv = umount(source);
|
||||
#else
|
||||
rv = unmount(source, 0);
|
||||
#endif
|
||||
|
||||
return (rv < 0)
|
||||
? alcove_mk_errno(reply, rlen, errno)
|
||||
: alcove_mk_atom(reply, rlen, "ok");
|
||||
}
|
||||
|
||||
/*
|
||||
* mount constants
|
||||
*
|
||||
*/
|
||||
ssize_t
|
||||
alcove_sys_mount_define(alcove_state_t *ap, const char *arg, size_t len,
|
||||
char *reply, size_t rlen)
|
||||
{
|
||||
int index = 0;
|
||||
int rindex = 0;
|
||||
|
||||
char name[MAXATOMLEN] = {0};
|
||||
|
||||
/* flag */
|
||||
if (alcove_decode_atom(arg, len, &index, name) < 0)
|
||||
return -1;
|
||||
|
||||
ALCOVE_ERR(alcove_encode_version(reply, rlen, &rindex));
|
||||
ALCOVE_ERR(alcove_encode_define(reply, rlen, &rindex,
|
||||
name, alcove_mount_constants));
|
||||
return rindex;
|
||||
}
|
||||
41
c_src/sys/mount_define.c
Normal file
41
c_src/sys/mount_define.c
Normal file
@@ -0,0 +1,41 @@
|
||||
/* Copyright (c) 2014, Michael Santos <michael.santos@gmail.com>
|
||||
*
|
||||
* Permission to use, copy, modify, and/or distribute this software for any
|
||||
* purpose with or without fee is hereby granted, provided that the above
|
||||
* copyright notice and this permission notice appear in all copies.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
|
||||
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
|
||||
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
|
||||
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
||||
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
|
||||
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
|
||||
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
*/
|
||||
#include "alcove.h"
|
||||
#include "alcove_call.h"
|
||||
#include <sys/mount.h>
|
||||
#include "alcove_mount_constants.h"
|
||||
|
||||
/*
|
||||
* mount constants
|
||||
*
|
||||
*/
|
||||
ssize_t
|
||||
alcove_sys_mount_define(alcove_state_t *ap, const char *arg, size_t len,
|
||||
char *reply, size_t rlen)
|
||||
{
|
||||
int index = 0;
|
||||
int rindex = 0;
|
||||
|
||||
char name[MAXATOMLEN] = {0};
|
||||
|
||||
/* flag */
|
||||
if (alcove_decode_atom(arg, len, &index, name) < 0)
|
||||
return -1;
|
||||
|
||||
ALCOVE_ERR(alcove_encode_version(reply, rlen, &rindex));
|
||||
ALCOVE_ERR(alcove_encode_define(reply, rlen, &rindex,
|
||||
name, alcove_mount_constants));
|
||||
return rindex;
|
||||
}
|
||||
48
c_src/sys/umount.c
Normal file
48
c_src/sys/umount.c
Normal file
@@ -0,0 +1,48 @@
|
||||
/* Copyright (c) 2014, Michael Santos <michael.santos@gmail.com>
|
||||
*
|
||||
* Permission to use, copy, modify, and/or distribute this software for any
|
||||
* purpose with or without fee is hereby granted, provided that the above
|
||||
* copyright notice and this permission notice appear in all copies.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
|
||||
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
|
||||
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
|
||||
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
||||
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
|
||||
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
|
||||
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
*/
|
||||
#include "alcove.h"
|
||||
#include "alcove_call.h"
|
||||
#include <sys/mount.h>
|
||||
|
||||
/*
|
||||
* umount(2)
|
||||
*
|
||||
*/
|
||||
ssize_t
|
||||
alcove_sys_umount(alcove_state_t *ap, const char *arg, size_t len,
|
||||
char *reply, size_t rlen)
|
||||
{
|
||||
int index = 0;
|
||||
|
||||
char source[PATH_MAX] = {0};
|
||||
size_t slen = sizeof(source)-1;
|
||||
|
||||
int rv = 0;
|
||||
|
||||
/* source */
|
||||
if (alcove_decode_iolist(arg, len, &index, source, &slen) < 0 ||
|
||||
slen == 0)
|
||||
return -1;
|
||||
|
||||
#if defined(__linux__) || defined(__sunos__)
|
||||
rv = umount(source);
|
||||
#else
|
||||
rv = unmount(source, 0);
|
||||
#endif
|
||||
|
||||
return (rv < 0)
|
||||
? alcove_mk_errno(reply, rlen, errno)
|
||||
: alcove_mk_atom(reply, rlen, "ok");
|
||||
}
|
||||
Reference in New Issue
Block a user