Tue Apr 14 15:03:38 2015 UTC ()
Pull up following revision(s) (requested by khorben in ticket #1264):
include/unistd.h 1.144
sys/kern/init_sysent.c regen
sys/kern/syscalls.c regen
sys/kern/syscalls.master 1.272
sys/rump/include/rump/rump_syscalls.h regen
sys/rump/librump/rumpkern/rump_syscalls.c regen
sys/sys/syscall.h regen
sys/sys/syscallargs.h regen
sys/compat/netbds32/netbsd32_syscall.h regen
sys/compat/netbds32/netbsd32_syscallargs.h regen
sys/compat/netbds32/netbsd32_syscalls.c regen
sys/compat/netbds32/netbsd32_sysent.c regen
sys/compat/netbsd32/syscalls.master 1.102
Fix return type of the readlinkat(2) syscall. PR#49684.
(msaitoh)
diff -r1.128 -r1.128.2.1 src/include/unistd.h
diff -r1.99.2.1 -r1.99.2.2 src/sys/compat/netbsd32/netbsd32_syscall.h
diff -r1.99.2.1 -r1.99.2.2 src/sys/compat/netbsd32/netbsd32_syscallargs.h
diff -r1.98.2.1 -r1.98.2.2 src/sys/compat/netbsd32/netbsd32_syscalls.c
diff -r1.98.2.1 -r1.98.2.2 src/sys/compat/netbsd32/netbsd32_sysent.c
diff -r1.91.2.1 -r1.91.2.2 src/sys/compat/netbsd32/syscalls.master
diff -r1.261 -r1.261.2.1 src/sys/kern/init_sysent.c
diff -r1.252 -r1.252.2.1 src/sys/kern/syscalls.c
diff -r1.254 -r1.254.2.1 src/sys/kern/syscalls.master
diff -r1.55 -r1.55.2.1 src/sys/rump/include/rump/rump_syscalls.h
diff -r1.77 -r1.77.2.1 src/sys/rump/librump/rumpkern/rump_syscalls.c
diff -r1.248 -r1.248.2.1 src/sys/sys/syscall.h
diff -r1.231 -r1.231.2.1 src/sys/sys/syscallargs.h
--- src/include/unistd.h 2011/11/05 09:27:06 1.128
+++ src/include/unistd.h 2015/04/14 15:03:37 1.128.2.1
@@ -1,4 +1,4 @@
-/* $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.
@@ -304,7 +304,7 @@
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
--- src/sys/compat/netbsd32/netbsd32_syscall.h 2012/04/12 20:13:08 1.99.2.1
+++ src/sys/compat/netbsd32/netbsd32_syscall.h 2015/04/14 15:03:37 1.99.2.2
@@ -1,10 +1,10 @@
-/* $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_
@@ -1245,7 +1245,7 @@
/* 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" */
--- src/sys/compat/netbsd32/netbsd32_syscallargs.h 2012/04/12 20:13:09 1.99.2.1
+++ src/sys/compat/netbsd32/netbsd32_syscallargs.h 2015/04/14 15:03:37 1.99.2.2
@@ -1,10 +1,10 @@
-/* $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_
--- src/sys/compat/netbsd32/netbsd32_syscalls.c 2012/04/12 20:13:09 1.98.2.1
+++ src/sys/compat/netbsd32/netbsd32_syscalls.c 2015/04/14 15:03:37 1.98.2.2
@@ -1,14 +1,14 @@
-/* $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)
--- src/sys/compat/netbsd32/netbsd32_sysent.c 2012/04/12 20:13:09 1.98.2.1
+++ src/sys/compat/netbsd32/netbsd32_sysent.c 2015/04/14 15:03:37 1.98.2.2
@@ -1,14 +1,14 @@
-/* $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"
--- src/sys/compat/netbsd32/syscalls.master 2012/04/12 17:05:37 1.91.2.1
+++ src/sys/compat/netbsd32/syscalls.master 2015/04/14 15:03:37 1.91.2.2
@@ -1,4 +1,4 @@
- $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
@@ -1025,7 +1025,7 @@
const netbsd32_charp path, \
int oflags, ... \
mode_t mode); }
-469 STD { int|netbsd32||readlinkat(int fd, \
+469 STD { netbsd32_ssize_t|netbsd32||readlinkat(int fd, \
const netbsd32_charp path, \
netbsd32_charp buf, \
size_t bufsize); }
--- src/sys/kern/init_sysent.c 2012/02/11 23:18:13 1.261
+++ src/sys/kern/init_sysent.c 2015/04/14 15:03:38 1.261.2.1
@@ -1,4 +1,4 @@
-/* $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.
@@ -8,7 +8,7 @@
*/
#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"
--- src/sys/kern/syscalls.c 2012/02/11 23:18:13 1.252
+++ src/sys/kern/syscalls.c 2015/04/14 15:03:38 1.252.2.1
@@ -1,4 +1,4 @@
-/* $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.
@@ -8,7 +8,7 @@
*/
#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"
--- src/sys/kern/syscalls.master 2012/02/11 23:16:17 1.254
+++ src/sys/kern/syscalls.master 2015/04/14 15:03:38 1.254.2.1
@@ -1,4 +1,4 @@
- $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
@@ -917,7 +917,7 @@
const struct timespec *tptr, int flag); }
468 STD RUMP { int|sys||openat(int fd, const char *path, \
int oflags, ... mode_t mode); }
-469 STD RUMP { int|sys||readlinkat(int fd, const char *path, \
+469 STD RUMP { ssize_t|sys||readlinkat(int fd, const char *path, \
char *buf, size_t bufsize); }
470 STD RUMP { int|sys||symlinkat(const char *path1, int fd, \
const char *path2); }
--- src/sys/rump/include/rump/rump_syscalls.h 2012/02/11 23:18:13 1.55
+++ src/sys/rump/include/rump/rump_syscalls.h 2015/04/14 15:03:38 1.55.2.1
@@ -1,4 +1,4 @@
-/* $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.
@@ -883,7 +883,7 @@
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);
--- src/sys/rump/librump/rumpkern/rump_syscalls.c 2012/02/11 23:18:14 1.77
+++ src/sys/rump/librump/rumpkern/rump_syscalls.c 2015/04/14 15:03:38 1.77.2.1
@@ -1,4 +1,4 @@
-/* $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.
@@ -8,7 +8,7 @@
*/
#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>
@@ -4408,13 +4408,13 @@
}
rsys_alias(sys_openat,rump_enosys)
-int rump___sysimpl_readlinkat(int, const char *, char *, size_t);
-int
+ssize_t rump___sysimpl_readlinkat(int, const char *, char *, size_t);
+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;
@@ -4425,8 +4425,8 @@
error = rsys_syscall(SYS_readlinkat, &callarg, sizeof(callarg), retval);
rsys_seterrno(error);
if (error == 0) {
- if (sizeof(int) > sizeof(register_t))
- rv = *(int *)retval;
+ if (sizeof(ssize_t) > sizeof(register_t))
+ rv = *(ssize_t *)retval;
else
rv = *retval;
}
--- src/sys/sys/syscall.h 2012/02/11 23:18:14 1.248
+++ src/sys/sys/syscall.h 2015/04/14 15:03:38 1.248.2.1
@@ -1,4 +1,4 @@
-/* $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.
@@ -1328,7 +1328,7 @@
/* 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 *" */
--- src/sys/sys/syscallargs.h 2012/02/11 23:18:14 1.231
+++ src/sys/sys/syscallargs.h 2015/04/14 15:03:38 1.231.2.1
@@ -1,4 +1,4 @@
-/* $NetBSD: syscallargs.h,v 1.231 2012/02/11 23:18:14 martin Exp $ */
+/* $NetBSD: syscallargs.h,v 1.231.2.1 2015/04/14 15:03:38 msaitoh Exp $ */
/*
* System call argument lists.