Module Name: src
Committed By: martin
Date: Tue Feb 24 10:47:17 UTC 2015
Modified Files:
src/include [netbsd-7]: unistd.h
src/sys/kern [netbsd-7]: syscalls.master
Log Message:
Pull up following revision(s) (requested by khorben in ticket #547):
include/unistd.h: revision 1.144
sys/kern/syscalls.master: revision 1.272
PR/49684: Pierre Pronchery: readlinkat(2) return type is wrong.
To generate a diff of this commit:
cvs rdiff -u -r1.142 -r1.142.2.1 src/include/unistd.h
cvs rdiff -u -r1.270 -r1.270.2.1 src/sys/kern/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/include/unistd.h
diff -u src/include/unistd.h:1.142 src/include/unistd.h:1.142.2.1
--- src/include/unistd.h:1.142 Fri Jul 25 08:30:47 2014
+++ src/include/unistd.h Tue Feb 24 10:47:17 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: unistd.h,v 1.142 2014/07/25 08:30:47 dholland Exp $ */
+/* $NetBSD: unistd.h,v 1.142.2.1 2015/02/24 10:47:17 martin Exp $ */
/*-
* Copyright (c) 1998, 1999, 2008 The NetBSD Foundation, Inc.
@@ -308,7 +308,7 @@ int linkat(int, const char *, int, const
int renameat(int, const char *, int, const char *);
int faccessat(int, const char *, int, int);
int fchownat(int, const char *, uid_t, gid_t, int);
-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
Index: src/sys/kern/syscalls.master
diff -u src/sys/kern/syscalls.master:1.270 src/sys/kern/syscalls.master:1.270.2.1
--- src/sys/kern/syscalls.master:1.270 Fri Jul 25 08:25:47 2014
+++ src/sys/kern/syscalls.master Tue Feb 24 10:47:17 2015
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.270 2014/07/25 08:25:47 dholland Exp $
+ $NetBSD: syscalls.master,v 1.270.2.1 2015/02/24 10:47:17 martin Exp $
; @(#)syscalls.master 8.2 (Berkeley) 1/13/94
@@ -919,7 +919,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); }
