Module Name: src
Committed By: njoly
Date: Sun Jul 24 13:22:01 UTC 2016
Modified Files:
src/sys/compat/linux/arch/alpha: syscalls.master
src/sys/compat/linux/arch/amd64: syscalls.master
src/sys/compat/linux/arch/arm: syscalls.master
src/sys/compat/linux/arch/i386: syscalls.master
src/sys/compat/linux/arch/m68k: syscalls.master
src/sys/compat/linux/arch/mips: syscalls.master
src/sys/compat/linux/arch/powerpc: syscalls.master
Log Message:
Small cleanup. Adjust readlink/readlinkat signatures to reduce diffs with
native.
To generate a diff of this commit:
cvs rdiff -u -r1.90 -r1.91 src/sys/compat/linux/arch/alpha/syscalls.master
cvs rdiff -u -r1.56 -r1.57 src/sys/compat/linux/arch/amd64/syscalls.master
cvs rdiff -u -r1.63 -r1.64 src/sys/compat/linux/arch/arm/syscalls.master
cvs rdiff -u -r1.120 -r1.121 src/sys/compat/linux/arch/i386/syscalls.master
cvs rdiff -u -r1.89 -r1.90 src/sys/compat/linux/arch/m68k/syscalls.master
cvs rdiff -u -r1.59 -r1.60 src/sys/compat/linux/arch/mips/syscalls.master
cvs rdiff -u -r1.68 -r1.69 src/sys/compat/linux/arch/powerpc/syscalls.master
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/linux/arch/alpha/syscalls.master
diff -u src/sys/compat/linux/arch/alpha/syscalls.master:1.90 src/sys/compat/linux/arch/alpha/syscalls.master:1.91
--- src/sys/compat/linux/arch/alpha/syscalls.master:1.90 Sun Oct 25 15:55:05 2015
+++ src/sys/compat/linux/arch/alpha/syscalls.master Sun Jul 24 13:22:01 2016
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.90 2015/10/25 15:55:05 njoly Exp $
+ $NetBSD: syscalls.master,v 1.91 2016/07/24 13:22:01 njoly Exp $
;
; @(#)syscalls.master 8.1 (Berkeley) 7/19/93
@@ -155,7 +155,7 @@
55 UNIMPL
56 UNIMPL
57 NOARGS { int|sys||symlink(const char *path, const char *to); }
-58 NOARGS { int|sys||readlink(const char *name, char *buf, \
+58 NOARGS { ssize_t|sys||readlink(const char *path, char *buf, \
int count); }
59 NOARGS { int|sys||execve(const char *path, char **argp, \
char **envp); }
@@ -725,7 +725,7 @@
int fd2, const char *name2, int flags); }
459 NOARGS { int|sys||symlinkat(const char *path1, int fd, \
const char *path2); }
-460 NOARGS { int|sys||readlinkat(int fd, const char *path, \
+460 NOARGS { ssize_t|sys||readlinkat(int fd, const char *path, \
char *buf, size_t bufsize); }
461 STD { int|linux_sys||fchmodat(int fd, const char *path, \
linux_umode_t mode); }
Index: src/sys/compat/linux/arch/amd64/syscalls.master
diff -u src/sys/compat/linux/arch/amd64/syscalls.master:1.56 src/sys/compat/linux/arch/amd64/syscalls.master:1.57
--- src/sys/compat/linux/arch/amd64/syscalls.master:1.56 Tue Oct 27 07:15:38 2015
+++ src/sys/compat/linux/arch/amd64/syscalls.master Sun Jul 24 13:22:01 2016
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.56 2015/10/27 07:15:38 njoly Exp $
+ $NetBSD: syscalls.master,v 1.57 2016/07/24 13:22:01 njoly Exp $
; @(#)syscalls.master 8.1 (Berkeley) 7/19/93
@@ -235,7 +235,7 @@
86 NOARGS { int|sys||link(const char *path, const char *link); }
87 STD { int|linux_sys||unlink(const char *path); }
88 NOARGS { int|sys||symlink(const char *path, const char *link); }
-89 NOARGS { int|sys||readlink(const char *path, char *buf, \
+89 NOARGS { ssize_t|sys||readlink(const char *path, char *buf, \
int count); }
90 NOARGS { int|sys||chmod(const char *path, linux_umode_t mode); }
91 NOARGS { int|sys||fchmod(int fd, linux_umode_t mode); }
@@ -483,7 +483,7 @@
int fd2, const char *name2, int flags); }
266 NOARGS { int|sys||symlinkat(const char *path1, int fd, \
const char *path2); }
-267 NOARGS { int|sys||readlinkat(int fd, const char *path, \
+267 NOARGS { ssize_t|sys||readlinkat(int fd, const char *path, \
char *buf, size_t bufsize); }
268 STD { int|linux_sys||fchmodat(int fd, const char *path, \
linux_umode_t mode); }
Index: src/sys/compat/linux/arch/arm/syscalls.master
diff -u src/sys/compat/linux/arch/arm/syscalls.master:1.63 src/sys/compat/linux/arch/arm/syscalls.master:1.64
--- src/sys/compat/linux/arch/arm/syscalls.master:1.63 Mon Mar 23 07:50:03 2015
+++ src/sys/compat/linux/arch/arm/syscalls.master Sun Jul 24 13:22:01 2016
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.63 2015/03/23 07:50:03 ozaki-r Exp $
+ $NetBSD: syscalls.master,v 1.64 2016/07/24 13:22:01 njoly Exp $
; Derived from sys/compat/linux/arch/*/syscalls.master
; and from Linux 2.4.12 arch/arm/kernel/calls.S
@@ -164,7 +164,7 @@
83 NOARGS { int|sys||symlink(const char *path, const char *link); }
84 NOARGS { int|compat_43_sys||lstat(const char *path, \
struct stat43 *ub); } oolstat
-85 NOARGS { int|sys||readlink(const char *path, char *buf, \
+85 NOARGS { ssize_t|sys||readlink(const char *path, char *buf, \
int count); }
#ifdef EXEC_AOUT
86 STD { int|linux_sys||uselib(const char *path); }
@@ -524,7 +524,7 @@
int fd2, const char *name2, int flags); }
331 NOARGS { int|sys||symlinkat(const char *path1, int fd, \
const char *path2); }
-332 NOARGS { int|sys||readlinkat(int fd, const char *path, \
+332 NOARGS { ssize_t|sys||readlinkat(int fd, const char *path, \
char *buf, size_t bufsize); }
333 STD { int|linux_sys||fchmodat(int fd, const char *path, \
linux_umode_t mode); }
Index: src/sys/compat/linux/arch/i386/syscalls.master
diff -u src/sys/compat/linux/arch/i386/syscalls.master:1.120 src/sys/compat/linux/arch/i386/syscalls.master:1.121
--- src/sys/compat/linux/arch/i386/syscalls.master:1.120 Mon Mar 23 07:30:15 2015
+++ src/sys/compat/linux/arch/i386/syscalls.master Sun Jul 24 13:22:01 2016
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.120 2015/03/23 07:30:15 ozaki-r Exp $
+ $NetBSD: syscalls.master,v 1.121 2016/07/24 13:22:01 njoly Exp $
; @(#)syscalls.master 8.1 (Berkeley) 7/19/93
@@ -165,7 +165,7 @@
83 NOARGS { int|sys||symlink(const char *path, const char *link); }
84 NOARGS { int|compat_43_sys||lstat(const char *path, \
struct stat43 *ub); } oolstat
-85 NOARGS { int|sys||readlink(const char *path, char *buf, \
+85 NOARGS { ssize_t|sys||readlink(const char *path, char *buf, \
int count); }
#ifdef EXEC_AOUT
86 STD { int|linux_sys||uselib(const char *path); }
@@ -497,7 +497,7 @@
int fd2, const char *name2, int flags); }
304 NOARGS { int|sys||symlinkat(const char *path1, int fd, \
const char *path2); }
-305 NOARGS { int|sys||readlinkat(int fd, const char *path, \
+305 NOARGS { ssize_t|sys||readlinkat(int fd, const char *path, \
char *buf, size_t bufsize); }
306 STD { int|linux_sys||fchmodat(int fd, const char *path, \
linux_umode_t mode); }
Index: src/sys/compat/linux/arch/m68k/syscalls.master
diff -u src/sys/compat/linux/arch/m68k/syscalls.master:1.89 src/sys/compat/linux/arch/m68k/syscalls.master:1.90
--- src/sys/compat/linux/arch/m68k/syscalls.master:1.89 Sat Nov 22 13:18:45 2014
+++ src/sys/compat/linux/arch/m68k/syscalls.master Sun Jul 24 13:22:01 2016
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.89 2014/11/22 13:18:45 njoly Exp $
+ $NetBSD: syscalls.master,v 1.90 2016/07/24 13:22:01 njoly Exp $
; @(#)syscalls.master 8.1 (Berkeley) 7/19/93
@@ -180,7 +180,7 @@
#else
84 UNIMPL compat_43_sys_lstat
#endif
-85 NOARGS { int|sys||readlink(const char *name, char *buf, \
+85 NOARGS { ssize_t|sys||readlink(const char *path, char *buf, \
int count); }
#ifdef EXEC_AOUT
86 STD { int|linux_sys||uselib(const char *path); }
@@ -505,7 +505,7 @@
int fd2, const char *name2, int flags); }
297 NOARGS { int|sys||symlinkat(const char *path1, int fd, \
const char *path2); }
-298 NOARGS { int|sys||readlinkat(int fd, const char *path, \
+298 NOARGS { ssize_t|sys||readlinkat(int fd, const char *path, \
char *buf, size_t bufsize); }
299 STD { int|linux_sys||fchmodat(int fd, const char *path, \
linux_umode_t mode); }
Index: src/sys/compat/linux/arch/mips/syscalls.master
diff -u src/sys/compat/linux/arch/mips/syscalls.master:1.59 src/sys/compat/linux/arch/mips/syscalls.master:1.60
--- src/sys/compat/linux/arch/mips/syscalls.master:1.59 Tue Oct 27 06:29:35 2015
+++ src/sys/compat/linux/arch/mips/syscalls.master Sun Jul 24 13:22:01 2016
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.59 2015/10/27 06:29:35 njoly Exp $
+ $NetBSD: syscalls.master,v 1.60 2016/07/24 13:22:01 njoly Exp $
; @(#)syscalls.master 8.1 (Berkeley) 7/19/93
@@ -164,7 +164,7 @@
83 NOARGS { int|sys||symlink(const char *path, const char *to); }
84 NOARGS { int|compat_43_sys||lstat(const char *path, \
struct stat43 *up); } oolstat
-85 NOARGS { int|sys||readlink(const char *name, char *buf, \
+85 NOARGS { ssize_t|sys||readlink(const char *path, char *buf, \
int count); }
86 UNIMPL uselib
;86 STD { int|linux_sys||uselib(const char *path); }
@@ -495,7 +495,7 @@
int fd2, const char *name2, int flags); }
297 NOARGS { int|sys||symlinkat(const char *path1, int fd, \
const char *path2); }
-298 NOARGS { int|sys||readlinkat(int fd, const char *path, \
+298 NOARGS { ssize_t|sys||readlinkat(int fd, const char *path, \
char *buf, size_t bufsize); }
299 STD { int|linux_sys||fchmodat(int fd, const char *path, \
linux_umode_t mode); }
Index: src/sys/compat/linux/arch/powerpc/syscalls.master
diff -u src/sys/compat/linux/arch/powerpc/syscalls.master:1.68 src/sys/compat/linux/arch/powerpc/syscalls.master:1.69
--- src/sys/compat/linux/arch/powerpc/syscalls.master:1.68 Tue Oct 27 06:29:35 2015
+++ src/sys/compat/linux/arch/powerpc/syscalls.master Sun Jul 24 13:22:01 2016
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.68 2015/10/27 06:29:35 njoly Exp $
+ $NetBSD: syscalls.master,v 1.69 2016/07/24 13:22:01 njoly Exp $
; @(#)syscalls.master 8.1 (Berkeley) 7/19/93
@@ -189,7 +189,7 @@
83 NOARGS { int|sys||symlink(const char *path, const char *to); }
84 NOARGS { int|compat_43_sys||lstat(const char *path, \
struct stat43 *up); } oolstat
-85 NOARGS { int|sys||readlink(const char *name, char *buf, \
+85 NOARGS { ssize_t|sys||readlink(const char *path, char *buf, \
int count); }
#ifdef EXEC_AOUT
86 STD { int|linux_sys||uselib(const char *path); }
@@ -505,7 +505,7 @@
int fd2, const char *name2, int flags); }
295 NOARGS { int|sys||symlinkat(const char *path1, int fd, \
const char *path2); }
-296 NOARGS { int|sys||readlinkat(int fd, const char *path, \
+296 NOARGS { ssize_t|sys||readlinkat(int fd, const char *path, \
char *buf, size_t bufsize); }
297 STD { int|linux_sys||fchmodat(int fd, const char *path, \
linux_umode_t mode); }
