 @@ -1,14 +1,14 @@
-/*      $NetBSD: hijack.c,v 1.111 2014/11/04 19:05:17 pooka Exp $	*/
+/*      $NetBSD: hijack.c,v 1.112 2015/03/03 00:19:07 enami Exp $	*/
 /*-
  * Copyright (c) 2011 Antti Kantee.  All Rights Reserved.
+ *
  * 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.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
 @@ -24,27 +24,27 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 /*
  * XXX: rumphijack sort of works on glibc Linux.  But it's not
  * the same quality working as on NetBSD.
  * autoconf HAVE_FOO vs. __NetBSD__ / __linux__ could be further
  * improved.
  */
 #include <rump/rumpuser_port.h>
 #if !defined(lint)
-__RCSID("$NetBSD: hijack.c,v 1.111 2014/11/04 19:05:17 pooka Exp $");
+__RCSID("$NetBSD: hijack.c,v 1.112 2015/03/03 00:19:07 enami Exp $");
 #endif
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/ioctl.h>
 #include <sys/mman.h>
 #include <sys/mount.h>
 #include <sys/socket.h>
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <sys/uio.h>
 #ifdef __NetBSD__
 @@ -103,26 +103,27 @@ enum dualcall {
 #ifndef __linux__
 	DUALCALL_STAT, DUALCALL_LSTAT, DUALCALL_FSTAT,
 #endif
 	DUALCALL_CHMOD, DUALCALL_LCHMOD, DUALCALL_FCHMOD,
 	DUALCALL_CHOWN, DUALCALL_LCHOWN, DUALCALL_FCHOWN,
 	DUALCALL_OPEN,
 	DUALCALL_CHDIR, DUALCALL_FCHDIR,
 	DUALCALL_LSEEK,
 	DUALCALL_UNLINK, DUALCALL_SYMLINK, DUALCALL_READLINK,
 	DUALCALL_LINK, DUALCALL_RENAME,
 	DUALCALL_MKDIR, DUALCALL_RMDIR,
 	DUALCALL_UTIMES, DUALCALL_LUTIMES, DUALCALL_FUTIMES,
 	DUALCALL_UTIMENSAT,
 	DUALCALL_TRUNCATE, DUALCALL_FTRUNCATE,
 	DUALCALL_FSYNC,
 	DUALCALL_ACCESS,
 #ifndef __linux__
 	DUALCALL___GETCWD,
 	DUALCALL_GETDENTS,
 #endif
 #ifndef __linux__
 	DUALCALL_MKNOD,
 #endif
 @@ -295,26 +296,27 @@ struct sysnames {
 	{ DUALCALL_STAT,	S(REALSTAT),	RSYS_NAME(STAT)		},
 	{ DUALCALL_LSTAT,	S(REALLSTAT),	RSYS_NAME(LSTAT)	},
 	{ DUALCALL_FSTAT,	S(REALFSTAT),	RSYS_NAME(FSTAT)	},
 #endif
 	{ DUALCALL_CHOWN,	"chown",	RSYS_NAME(CHOWN)	},
 	{ DUALCALL_LCHOWN,	"lchown",	RSYS_NAME(LCHOWN)	},
 	{ DUALCALL_FCHOWN,	"fchown",	RSYS_NAME(FCHOWN)	},
 	{ DUALCALL_CHMOD,	"chmod",	RSYS_NAME(CHMOD)	},
 	{ DUALCALL_LCHMOD,	"lchmod",	RSYS_NAME(LCHMOD)	},
 	{ DUALCALL_FCHMOD,	"fchmod",	RSYS_NAME(FCHMOD)	},
 	{ DUALCALL_UTIMES,	S(REALUTIMES),	RSYS_NAME(UTIMES)	},
 	{ DUALCALL_LUTIMES,	S(REALLUTIMES),	RSYS_NAME(LUTIMES)	},
 	{ DUALCALL_FUTIMES,	S(REALFUTIMES),	RSYS_NAME(FUTIMES)	},
 	{ DUALCALL_UTIMENSAT,	"utimensat",	RSYS_NAME(UTIMENSAT)	},
 	{ DUALCALL_OPEN,	"open",		RSYS_NAME(OPEN)		},
 	{ DUALCALL_CHDIR,	"chdir",	RSYS_NAME(CHDIR)	},
 	{ DUALCALL_FCHDIR,	"fchdir",	RSYS_NAME(FCHDIR)	},
 	{ DUALCALL_LSEEK,	"lseek",	RSYS_NAME(LSEEK)	},
 	{ DUALCALL_UNLINK,	"unlink",	RSYS_NAME(UNLINK)	},
 	{ DUALCALL_SYMLINK,	"symlink",	RSYS_NAME(SYMLINK)	},
 	{ DUALCALL_READLINK,	"readlink",	RSYS_NAME(READLINK)	},
 	{ DUALCALL_LINK,	"link",		RSYS_NAME(LINK)		},
 	{ DUALCALL_RENAME,	"rename",	RSYS_NAME(RENAME)	},
 	{ DUALCALL_MKDIR,	"mkdir",	RSYS_NAME(MKDIR)	},
 	{ DUALCALL_RMDIR,	"rmdir",	RSYS_NAME(RMDIR)	},
 	{ DUALCALL_TRUNCATE,	"truncate",	RSYS_NAME(TRUNCATE)	},
 	{ DUALCALL_FTRUNCATE,	"ftruncate",	RSYS_NAME(FTRUNCATE)	},
 @@ -2486,26 +2488,31 @@ PATHCALL(int, rmdir, DUALCALL_RMDIR,
 	(const char *),							\
 	(path))
 PATHCALL(int, utimes, DUALCALL_UTIMES,					\
 	(const char *path, const struct timeval *tv),			\
 	(const char *, const struct timeval *),				\
 	(path, tv))
 PATHCALL(int, lutimes, DUALCALL_LUTIMES,				\
 	(const char *path, const struct timeval *tv),			\
 	(const char *, const struct timeval *),				\
 	(path, tv))
 PATHCALL(int, utimensat, DUALCALL_UTIMENSAT,				\
 	(int fd, const char *path, const struct timespec *ts, int flags), \
 	(int, const char *, const struct timespec *, int),		\
 	(fd, path, ts, flags))
 #ifdef HAVE_CHFLAGS
 PATHCALL(int, chflags, DUALCALL_CHFLAGS,				\
 	(const char *path, u_long flags),				\
 	(const char *, u_long),						\
 	(path, flags))
 PATHCALL(int, lchflags, DUALCALL_LCHFLAGS,				\
 	(const char *path, u_long flags),				\
 	(const char *, u_long),						\
 	(path, flags))
 #endif /* HAVE_CHFLAGS */
 PATHCALL(int, truncate, DUALCALL_TRUNCATE,				\