 @@ -1,14 +1,14 @@
-/*	$NetBSD: unistd.h,v 1.128 2011/11/05 09:27:06 joerg Exp $	*/
+/*	$NetBSD: unistd.h,v 1.128.2.1 2015/04/14 15:03:37 msaitoh Exp $	*/
 /*-
  * Copyright (c) 1998, 1999, 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Klaus Klein.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -294,27 +294,27 @@ ssize_t	 pwrite(int, const void *, size_
 /*
  * X/Open Extended API set 2 (a.k.a. C063)
  */
 #if defined(_INCOMPLETE_XOPEN_C063)
 int	linkat(int, const char *, int, const char *, int);
 int	renameat(int, const char *, int, const char *);
 int	mkfifoat(int, const char *, mode_t);
 int	mknodat(int, const char *, mode_t, uint32_t);
 int	mkdirat(int, const char *, mode_t);
 int	faccessat(int, const char *, int, int);
 int	fchmodat(int, const char *, mode_t, int);
 int	fchownat(int, const char *, uid_t, gid_t, int);
 int	fexecve(int, char * const *, char * const *);
-int	readlinkat(int, const char *, char *, size_t);
+ssize_t	readlinkat(int, const char *, char *, size_t);
 int	symlinkat(const char *, int, const char *);
 int	unlinkat(int, const char *, int);
 #endif
 /*
  * Implementation-defined extensions
  */
 #if defined(_NETBSD_SOURCE)
 int	 acct(const char *);
 int	 closefrom(int);
 int	 des_cipher(const char *, char *, long, int);
 int	 des_setkey(const char *);

 @@ -1,20 +1,20 @@
-/* $NetBSD: netbsd32_syscall.h,v 1.99.2.1 2012/04/12 20:13:08 riz Exp $ */
+/* $NetBSD: netbsd32_syscall.h,v 1.99.2.2 2015/04/14 15:03:37 msaitoh Exp $ */
 /*
  * System call numbers.
+ *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	NetBSD
+ * created from	NetBSD: syscalls.master,v 1.91.2.1 2012/04/12 17:05:37 riz Exp
  */
 #ifndef _NETBSD32_SYS_SYSCALL_H_
 #define	_NETBSD32_SYS_SYSCALL_H_
 #define	NETBSD32_SYS_MAXSYSARGS	8
 /* syscall: "netbsd32_syscall" ret: "int" args: "int" "..." */
 #define	NETBSD32_SYS_netbsd32_syscall	0
 /* syscall: "netbsd32_exit" ret: "void" args: "int" */
 #define	NETBSD32_SYS_netbsd32_exit	1
 @@ -1235,27 +1235,27 @@
 /* syscall: "netbsd32_fexecve" ret: "int" args: "int" "netbsd32_charpp" "netbsd32_charpp" */
 #define	NETBSD32_SYS_netbsd32_fexecve	465
 /* syscall: "netbsd32_fstatat" ret: "int" args: "int" "const netbsd32_charp" "netbsd32_statp_t" "int" */
 #define	NETBSD32_SYS_netbsd32_fstatat	466
 /* syscall: "netbsd32_utimensat" ret: "int" args: "int" "const netbsd32_charp" "const netbsd32_timespecp_t" "int" */
 #define	NETBSD32_SYS_netbsd32_utimensat	467
 /* syscall: "netbsd32_openat" ret: "int" args: "int" "const netbsd32_charp" "int" "..." */
 #define	NETBSD32_SYS_netbsd32_openat	468
-/* syscall: "netbsd32_readlinkat" ret: "int" args: "int" "const netbsd32_charp" "netbsd32_charp" "size_t" */
+/* syscall: "netbsd32_readlinkat" ret: "netbsd32_ssize_t" args: "int" "const netbsd32_charp" "netbsd32_charp" "size_t" */
 #define	NETBSD32_SYS_netbsd32_readlinkat	469
 /* syscall: "netbsd32_symlinkat" ret: "int" args: "const netbsd32_charp" "int" "const netbsd32_charp" */
 #define	NETBSD32_SYS_netbsd32_symlinkat	470
 /* syscall: "netbsd32_unlinkat" ret: "int" args: "int" "const netbsd32_charp" "int" */
 #define	NETBSD32_SYS_netbsd32_unlinkat	471
 /* syscall: "netbsd32_futimens" ret: "int" args: "int" "const netbsd32_timespecp_t" */
 #define	NETBSD32_SYS_netbsd32_futimens	472
 /* syscall: "netbsd32___quotactl" ret: "int" args: "const netbsd32_charp" "netbsd32_voidp" */
 #define	NETBSD32_SYS_netbsd32___quotactl	473

 @@ -1,20 +1,20 @@
-/* $NetBSD: netbsd32_syscallargs.h,v 1.99.2.1 2012/04/12 20:13:09 riz Exp $ */
+/* $NetBSD: netbsd32_syscallargs.h,v 1.99.2.2 2015/04/14 15:03:37 msaitoh Exp $ */
 /*
  * System call argument lists.
+ *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	NetBSD
+ * created from	NetBSD: syscalls.master,v 1.91.2.1 2012/04/12 17:05:37 riz Exp
  */
 #ifndef _NETBSD32_SYS_SYSCALLARGS_H_
 #define	_NETBSD32_SYS_SYSCALLARGS_H_
 #define	NETBSD32_SYS_MAXSYSARGS	8
 #undef	syscallarg
 #define	syscallarg(x)							\
 	union {								\
 		register32_t pad;						\
 		struct { x datum; } le;					\
 		struct { /* LINTED zero array dimension */		\

 @@ -1,24 +1,24 @@
-/* $NetBSD: netbsd32_syscalls.c,v 1.98.2.1 2012/04/12 20:13:09 riz Exp $ */
+/* $NetBSD: netbsd32_syscalls.c,v 1.98.2.2 2015/04/14 15:03:37 msaitoh Exp $ */
 /*
  * System call names.
+ *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	NetBSD
+ * created from	NetBSD: syscalls.master,v 1.91.2.1 2012/04/12 17:05:37 riz Exp
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.98.2.1 2012/04/12 20:13:09 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.98.2.2 2015/04/14 15:03:37 msaitoh Exp $");
 #if defined(_KERNEL_OPT)
 #if defined(_KERNEL_OPT)
 #include "opt_compat_netbsd.h"
 #include "opt_ntp.h"
 #include "opt_sysv.h"
 #include "opt_compat_43.h"
 #include "opt_posix.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/signal.h>
 #include <sys/mount.h>

 @@ -1,24 +1,24 @@
-/* $NetBSD: netbsd32_sysent.c,v 1.98.2.1 2012/04/12 20:13:09 riz Exp $ */
+/* $NetBSD: netbsd32_sysent.c,v 1.98.2.2 2015/04/14 15:03:37 msaitoh Exp $ */
 /*
  * System call switch table.
+ *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	NetBSD
+ * created from	NetBSD: syscalls.master,v 1.91.2.1 2012/04/12 17:05:37 riz Exp
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_sysent.c,v 1.98.2.1 2012/04/12 20:13:09 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_sysent.c,v 1.98.2.2 2015/04/14 15:03:37 msaitoh Exp $");
 #if defined(_KERNEL_OPT)
 #include "opt_compat_netbsd.h"
 #include "opt_ntp.h"
 #include "opt_sysv.h"
 #include "opt_compat_43.h"
 #include "opt_posix.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/signal.h>
 #include <sys/mount.h>
 #include <sys/syscallargs.h>

 @@ -1,14 +1,14 @@
-	$NetBSD: syscalls.master,v 1.91.2.1 2012/04/12 17:05:37 riz Exp $
+	$NetBSD: syscalls.master,v 1.91.2.2 2015/04/14 15:03:37 msaitoh Exp $
 ;	from: NetBSD: syscalls.master,v 1.81 1998/07/05 08:49:50 jonathan Exp
 ;	@(#)syscalls.master	8.2 (Berkeley) 1/13/94
 ; NetBSD system call name/number "master" file.
 ; (See syscalls.conf to see what it is processed into.)
+;
 ; Fields: number type [type-dependent ...]
 ;	number	system call number, must be in order
 ;	type	one of STD, OBSOL, UNIMPL, IGNORED, NODEF, NOARGS, or one of
 ;		the compatibility options defined in syscalls.conf.
+;
 ; types:
 @@ -1015,27 +1015,27 @@
 			    netbsd32_charpp envp); }
 	STD  		{ int|netbsd32||fstatat(int fd, \
 			    const netbsd32_charp path, \
 			    netbsd32_statp_t buf, \
 			    int flag); }
 	STD  		{ int|netbsd32||utimensat(int fd, \
 			    const netbsd32_charp path, \
 			    const netbsd32_timespecp_t tptr, \
 			    int flag); }
 	STD  		{ int|netbsd32||openat(int fd, \
 			    const netbsd32_charp path, \
 			    int oflags, ... \
 			    mode_t mode); }
-	STD  		{ int|netbsd32||readlinkat(int fd, \
+	STD  		{ netbsd32_ssize_t|netbsd32||readlinkat(int fd, \
 			    const netbsd32_charp path, \
 			    netbsd32_charp buf, \
 			    size_t bufsize); }
 	STD  		{ int|netbsd32||symlinkat(const netbsd32_charp path1, \
 			    int fd, \
 			    const netbsd32_charp path2); }
 	STD  		{ int|netbsd32||unlinkat(int fd, \
 			    const netbsd32_charp path, \
 			    int flag); }
 	STD  		{ int|netbsd32||futimens(int fd, \
 			    const netbsd32_timespecp_t tptr); }
 	STD		{ int|netbsd32||__quotactl(const netbsd32_charp path, \
 			    netbsd32_voidp args); }

 @@ -1,24 +1,24 @@
-/* $NetBSD: init_sysent.c,v 1.261 2012/02/11 23:18:13 martin Exp $ */
+/* $NetBSD: init_sysent.c,v 1.261.2.1 2015/04/14 15:03:38 msaitoh Exp $ */
 /*
  * System call switch table.
+ *
  * DO NOT EDIT-- this file is automatically generated.
  * created from	NetBSD: syscalls.master,v 1.254 2012/02/11 23:16:17 martin Exp
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: init_sysent.c,v 1.261 2012/02/11 23:18:13 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: init_sysent.c,v 1.261.2.1 2015/04/14 15:03:38 msaitoh Exp $");
 #include "opt_modular.h"
 #include "opt_ntp.h"
 #include "opt_sysv.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/signal.h>
 #include <sys/socket.h>
 #include <sys/mount.h>
 #include <sys/sched.h>
 #include <sys/syscallargs.h>
 #ifdef COMPAT_43

 @@ -1,24 +1,24 @@
-/* $NetBSD: syscalls.c,v 1.252 2012/02/11 23:18:13 martin Exp $ */
+/* $NetBSD: syscalls.c,v 1.252.2.1 2015/04/14 15:03:38 msaitoh Exp $ */
 /*
  * System call names.
+ *
  * DO NOT EDIT-- this file is automatically generated.
  * created from	NetBSD: syscalls.master,v 1.254 2012/02/11 23:16:17 martin Exp
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: syscalls.c,v 1.252 2012/02/11 23:18:13 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: syscalls.c,v 1.252.2.1 2015/04/14 15:03:38 msaitoh Exp $");
 #if defined(_KERNEL_OPT)
 #include "opt_modular.h"
 #include "opt_ntp.h"
 #include "opt_sysv.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/signal.h>
 #include <sys/socket.h>
 #include <sys/mount.h>
 #include <sys/sched.h>
 #include <sys/syscallargs.h>
 #endif /* _KERNEL_OPT */

 @@ -1,14 +1,14 @@
-	$NetBSD: syscalls.master,v 1.254 2012/02/11 23:16:17 martin Exp $
+	$NetBSD: syscalls.master,v 1.254.2.1 2015/04/14 15:03:38 msaitoh Exp $
 ;	@(#)syscalls.master	8.2 (Berkeley) 1/13/94
 ; NetBSD system call name/number "master" file.
 ; (See syscalls.conf to see what it is processed into.)
+;
 ; Fields: number type [type-dependent ...]
 ;	number	system call number, must be in order
 ;	type	one of STD, OBSOL, UNIMPL, IGNORED, NODEF, NOARGS, or one of
 ;		the compatibility options defined in syscalls.conf.
+;
 ; Optional fields are specified after the type field
 ; (NOTE! they *must* be specified in this order):
 @@ -907,27 +907,27 @@
 			    int amode, int flag); }
 	STD  RUMP	{ int|sys||fchmodat(int fd, const char *path, \
 			    mode_t mode, int flag); }
 	STD  RUMP	{ int|sys||fchownat(int fd, const char *path, \
 			    uid_t owner, gid_t group, int flag); }
 	STD  RUMP	{ int|sys||fexecve(int fd, \
 			    char * const *argp, char * const *envp); }
 	STD  RUMP	{ int|sys||fstatat(int fd, const char *path, \
 			    struct stat *buf, int flag); }
 	STD  RUMP	{ int|sys||utimensat(int fd, const char *path, \
 			    const struct timespec *tptr, int flag); }
 	STD  RUMP	{ int|sys||openat(int fd, const char *path, \
 			    int oflags, ... mode_t mode); }
-	STD  RUMP	{ int|sys||readlinkat(int fd, const char *path, \
+	STD  RUMP	{ ssize_t|sys||readlinkat(int fd, const char *path, \
 			    char *buf, size_t bufsize); }
 	STD  RUMP	{ int|sys||symlinkat(const char *path1, int fd, \
 			    const char *path2); }
 	STD  RUMP	{ int|sys||unlinkat(int fd, const char *path, \
 			    int flag); }
 	STD  RUMP	{ int|sys||futimens(int fd, \
 			    const struct timespec *tptr); }
 	STD  RUMP	{ int|sys||__quotactl(const char *path, \
 			    struct quotactl_args *args); }
 	NOERR		{ int|sys||posix_spawn(pid_t *pid, const char *path, \
 				const struct posix_spawn_file_actions *file_actions, \
 				const struct posix_spawnattr *attrp, \
 				char *const *argv, char *const *envp); }

 @@ -1,14 +1,14 @@
-/* $NetBSD: rump_syscalls.h,v 1.55 2012/02/11 23:18:13 martin Exp $ */
+/* $NetBSD: rump_syscalls.h,v 1.55.2.1 2015/04/14 15:03:38 msaitoh Exp $ */
 /*
  * System call protos in rump namespace.
+ *
  * DO NOT EDIT-- this file is automatically generated.
  * created from	NetBSD: syscalls.master,v 1.254 2012/02/11 23:16:17 martin Exp
  */
 #ifndef _RUMP_RUMP_SYSCALLS_H_
 #define _RUMP_RUMP_SYSCALLS_H_
 #ifdef _KERNEL
 #error Interface not supported inside kernel
 @@ -873,21 +873,21 @@ int rump_sys_kqueue1(int) __RENAME(RUMP_
 int rump_sys_paccept(int, struct sockaddr *, socklen_t *, const sigset_t *, int) __RENAME(RUMP_SYS_RENAME_PACCEPT);
 int rump_sys_linkat(int, const char *, int, const char *, int) __RENAME(RUMP_SYS_RENAME_LINKAT);
 int rump_sys_renameat(int, const char *, int, const char *) __RENAME(RUMP_SYS_RENAME_RENAMEAT);
 int rump_sys_mkfifoat(int, const char *, mode_t) __RENAME(RUMP_SYS_RENAME_MKFIFOAT);
 int rump_sys_mknodat(int, const char *, mode_t, uint32_t) __RENAME(RUMP_SYS_RENAME_MKNODAT);
 int rump_sys_mkdirat(int, const char *, mode_t) __RENAME(RUMP_SYS_RENAME_MKDIRAT);
 int rump_sys_faccessat(int, const char *, int, int) __RENAME(RUMP_SYS_RENAME_FACCESSAT);
 int rump_sys_fchmodat(int, const char *, mode_t, int) __RENAME(RUMP_SYS_RENAME_FCHMODAT);
 int rump_sys_fchownat(int, const char *, uid_t, gid_t, int) __RENAME(RUMP_SYS_RENAME_FCHOWNAT);
 int rump_sys_fexecve(int, char *const *, char *const *) __RENAME(RUMP_SYS_RENAME_FEXECVE);
 int rump_sys_fstatat(int, const char *, struct stat *, int) __RENAME(RUMP_SYS_RENAME_FSTATAT);
 int rump_sys_utimensat(int, const char *, const struct timespec *, int) __RENAME(RUMP_SYS_RENAME_UTIMENSAT);
 int rump_sys_openat(int, const char *, int, ...) __RENAME(RUMP_SYS_RENAME_OPENAT);
-int rump_sys_readlinkat(int, const char *, char *, size_t) __RENAME(RUMP_SYS_RENAME_READLINKAT);
+ssize_t rump_sys_readlinkat(int, const char *, char *, size_t) __RENAME(RUMP_SYS_RENAME_READLINKAT);
 int rump_sys_symlinkat(const char *, int, const char *) __RENAME(RUMP_SYS_RENAME_SYMLINKAT);
 int rump_sys_unlinkat(int, const char *, int) __RENAME(RUMP_SYS_RENAME_UNLINKAT);
 int rump_sys_futimens(int, const struct timespec *) __RENAME(RUMP_SYS_RENAME_FUTIMENS);
 int rump_sys___quotactl(const char *, struct quotactl_args *) __RENAME(RUMP_SYS_RENAME___QUOTACTL);
 int rump_sys_pipe(int *);
 #endif /* _RUMP_RUMP_SYSCALLS_H_ */

 @@ -1,24 +1,24 @@
-/* $NetBSD: rump_syscalls.c,v 1.77 2012/02/11 23:18:14 martin Exp $ */
+/* $NetBSD: rump_syscalls.c,v 1.77.2.1 2015/04/14 15:03:38 msaitoh Exp $ */
 /*
  * System call vector and marshalling for rump.
+ *
  * DO NOT EDIT-- this file is automatically generated.
  * created from	NetBSD: syscalls.master,v 1.254 2012/02/11 23:16:17 martin Exp
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rump_syscalls.c,v 1.77 2012/02/11 23:18:14 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rump_syscalls.c,v 1.77.2.1 2015/04/14 15:03:38 msaitoh Exp $");
 #include <sys/param.h>
 #include <sys/fstypes.h>
 #include <sys/proc.h>
 #ifdef RUMP_CLIENT
 #include <srcsys/syscall.h>
 #include <srcsys/syscallargs.h>
 #include <errno.h>
 #include <rump/rumpclient.h>
 #define rsys_syscall(num, data, dlen, retval)	\
     rumpclient_syscall(num, data, dlen, retval)
 @@ -4398,45 +4398,45 @@ rump___sysimpl_openat(int fd, const char
 	error = rsys_syscall(SYS_openat, &callarg, sizeof(callarg), retval);
 	rsys_seterrno(error);
 	if (error == 0) {
 		if (sizeof(int) > sizeof(register_t))
 			rv = *(int *)retval;
 		else
 			rv = *retval;
+	}
 	return rv;
+}
 rsys_alias(sys_openat,rump_enosys)
-int rump___sysimpl_readlinkat(int, const char *, char *, size_t);
+ssize_t rump___sysimpl_readlinkat(int, const char *, char *, size_t);
-int
+ssize_t
 rump___sysimpl_readlinkat(int fd, const char * path, char * buf, size_t bufsize)
+{
 	register_t retval[2] = {0, 0};
 	int error = 0;
-	int rv = -1;
+	ssize_t rv = -1;
 	struct sys_readlinkat_args callarg;
 	SPARG(&callarg, fd) = fd;
 	SPARG(&callarg, path) = path;
 	SPARG(&callarg, buf) = buf;
 	SPARG(&callarg, bufsize) = bufsize;
 	error = rsys_syscall(SYS_readlinkat, &callarg, sizeof(callarg), retval);
 	rsys_seterrno(error);
 	if (error == 0) {
-		if (sizeof(int) > sizeof(register_t))
+		if (sizeof(ssize_t) > sizeof(register_t))
-			rv = *(int *)retval;
+			rv = *(ssize_t *)retval;
 		else
 			rv = *retval;
+	}
 	return rv;
+}
 rsys_alias(sys_readlinkat,rump_enosys)
 int rump___sysimpl_symlinkat(const char *, int, const char *);
 int
 rump___sysimpl_symlinkat(const char * path1, int fd, const char * path2)
+{
 	register_t retval[2] = {0, 0};
 	int error = 0;

 @@ -1,14 +1,14 @@
-/* $NetBSD: syscall.h,v 1.248 2012/02/11 23:18:14 martin Exp $ */
+/* $NetBSD: syscall.h,v 1.248.2.1 2015/04/14 15:03:38 msaitoh Exp $ */
 /*
  * System call numbers.
+ *
  * DO NOT EDIT-- this file is automatically generated.
  * created from	NetBSD: syscalls.master,v 1.254 2012/02/11 23:16:17 martin Exp
  */
 #ifndef _SYS_SYSCALL_H_
 #define	_SYS_SYSCALL_H_
 #define	SYS_MAXSYSARGS	8
 @@ -1318,27 +1318,27 @@
 /* syscall: "fexecve" ret: "int" args: "int" "char *const *" "char *const *" */
 #define	SYS_fexecve	465
 /* syscall: "fstatat" ret: "int" args: "int" "const char *" "struct stat *" "int" */
 #define	SYS_fstatat	466
 /* syscall: "utimensat" ret: "int" args: "int" "const char *" "const struct timespec *" "int" */
 #define	SYS_utimensat	467
 /* syscall: "openat" ret: "int" args: "int" "const char *" "int" "..." */
 #define	SYS_openat	468
-/* syscall: "readlinkat" ret: "int" args: "int" "const char *" "char *" "size_t" */
+/* syscall: "readlinkat" ret: "ssize_t" args: "int" "const char *" "char *" "size_t" */
 #define	SYS_readlinkat	469
 /* syscall: "symlinkat" ret: "int" args: "const char *" "int" "const char *" */
 #define	SYS_symlinkat	470
 /* syscall: "unlinkat" ret: "int" args: "int" "const char *" "int" */
 #define	SYS_unlinkat	471
 /* syscall: "futimens" ret: "int" args: "int" "const struct timespec *" */
 #define	SYS_futimens	472
 /* syscall: "__quotactl" ret: "int" args: "const char *" "struct quotactl_args *" */
 #define	SYS___quotactl	473