Module Name: src
Committed By: njoly
Date: Fri Jun 4 16:33:32 UTC 2010
Modified Files:
src/sys/rump/include/rump: rump_syscalls.h
src/sys/rump/librump/rumpkern: rump_syscalls.c
Log Message:
Regen for pathconf/fpathconf rumpification.
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/rump/include/rump/rump_syscalls.h
cvs rdiff -u -r1.44 -r1.45 src/sys/rump/librump/rumpkern/rump_syscalls.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/include/rump/rump_syscalls.h
diff -u src/sys/rump/include/rump/rump_syscalls.h:1.24 src/sys/rump/include/rump/rump_syscalls.h:1.25
--- src/sys/rump/include/rump/rump_syscalls.h:1.24 Mon May 17 12:37:20 2010
+++ src/sys/rump/include/rump/rump_syscalls.h Fri Jun 4 16:33:32 2010
@@ -1,10 +1,10 @@
-/* $NetBSD: rump_syscalls.h,v 1.24 2010/05/17 12:37:20 njoly Exp $ */
+/* $NetBSD: rump_syscalls.h,v 1.25 2010/06/04 16:33:32 njoly Exp $ */
/*
* System call protos in rump namespace.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.233 2010/04/21 16:17:04 pooka Exp
+ * created from NetBSD: syscalls.master,v 1.234 2010/06/04 16:32:00 njoly Exp
*/
#ifndef _RUMP_RUMP_SYSCALLS_H_
@@ -69,6 +69,8 @@
int rump_sys_nfssvc(int, void *);
ssize_t rump_sys_pread(int, void *, size_t, off_t);
ssize_t rump_sys_pwrite(int, const void *, size_t, off_t);
+long rump_sys_pathconf(const char *, int);
+long rump_sys_fpathconf(int, int);
int rump_sys_getrlimit(int, struct rlimit *);
int rump_sys_setrlimit(int, const struct rlimit *);
off_t rump_sys_lseek(int, off_t, int);
Index: src/sys/rump/librump/rumpkern/rump_syscalls.c
diff -u src/sys/rump/librump/rumpkern/rump_syscalls.c:1.44 src/sys/rump/librump/rumpkern/rump_syscalls.c:1.45
--- src/sys/rump/librump/rumpkern/rump_syscalls.c:1.44 Tue May 11 20:11:47 2010
+++ src/sys/rump/librump/rumpkern/rump_syscalls.c Fri Jun 4 16:33:32 2010
@@ -1,14 +1,14 @@
-/* $NetBSD: rump_syscalls.c,v 1.44 2010/05/11 20:11:47 pooka Exp $ */
+/* $NetBSD: rump_syscalls.c,v 1.45 2010/06/04 16:33:32 njoly Exp $ */
/*
* System call vector and marshalling for rump.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.233 2010/04/21 16:17:04 pooka Exp
+ * created from NetBSD: syscalls.master,v 1.234 2010/06/04 16:32:00 njoly Exp
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rump_syscalls.c,v 1.44 2010/05/11 20:11:47 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rump_syscalls.c,v 1.45 2010/06/04 16:33:32 njoly Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -1106,6 +1106,48 @@
}
__weak_alias(sys_pwrite,rump_enosys);
+long rump_sys_pathconf(const char *, int);
+long
+rump_sys_pathconf(const char * path, int name)
+{
+ register_t rval[2] = {0, 0};
+ int error = 0;
+ struct sys_pathconf_args callarg;
+
+ SPARG(&callarg, path) = path;
+ SPARG(&callarg, name) = name;
+
+ error = rump_sysproxy(SYS_pathconf, rump_sysproxy_arg,
+ (uint8_t *)&callarg, sizeof(callarg), rval);
+ if (error) {
+ rval[0] = -1;
+ rumpuser_seterrno(error);
+ }
+ return rval[0];
+}
+__weak_alias(sys_pathconf,rump_enosys);
+
+long rump_sys_fpathconf(int, int);
+long
+rump_sys_fpathconf(int fd, int name)
+{
+ register_t rval[2] = {0, 0};
+ int error = 0;
+ struct sys_fpathconf_args callarg;
+
+ SPARG(&callarg, fd) = fd;
+ SPARG(&callarg, name) = name;
+
+ error = rump_sysproxy(SYS_fpathconf, rump_sysproxy_arg,
+ (uint8_t *)&callarg, sizeof(callarg), rval);
+ if (error) {
+ rval[0] = -1;
+ rumpuser_seterrno(error);
+ }
+ return rval[0];
+}
+__weak_alias(sys_fpathconf,rump_enosys);
+
int rump_sys_getrlimit(int, struct rlimit *);
int
rump_sys_getrlimit(int which, struct rlimit * rlp)
@@ -2913,10 +2955,10 @@
(sy_call_t *)sys_nomodule }, /* 189 = unrumped */
{ 0, 0, 0,
(sy_call_t *)sys_nomodule }, /* 190 = unrumped */
- { 0, 0, 0,
- (sy_call_t *)rump_enosys }, /* 191 = unrumped */
- { 0, 0, 0,
- (sy_call_t *)rump_enosys }, /* 192 = unrumped */
+ { ns(struct sys_pathconf_args), 0,
+ (sy_call_t *)sys_pathconf }, /* 191 = pathconf */
+ { ns(struct sys_fpathconf_args), 0,
+ (sy_call_t *)sys_fpathconf }, /* 192 = fpathconf */
{ 0, 0, 0,
(sy_call_t *)rump_enosys }, /* 193 = unimplemented */
{ ns(struct sys_getrlimit_args), 0,
