summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordoug <doug@openbsd.org>2014-09-01 05:09:52 +0000
committerdoug <doug@openbsd.org>2014-09-01 05:09:52 +0000
commite6ff12da831683ab6d936830516d971cd66f55eb (patch)
treeafcca0e8c0b190cc14457de608850fd577d433e8
parentAdd implementations of atomic_{inc,dec,add,sub}_{int,long}() and (diff)
downloadwireguard-openbsd-e6ff12da831683ab6d936830516d971cd66f55eb.tar.xz
wireguard-openbsd-e6ff12da831683ab6d936830516d971cd66f55eb.zip
Sync readlink(2) with IEEE Std 1003.1-2008.
discussion, help and ok guenther@
Diffstat
-rw-r--r--include/unistd.h4
-rw-r--r--lib/libc/sys/readlink.28
-rw-r--r--libexec/ld.so/alpha/syscall.h4
-rw-r--r--libexec/ld.so/amd64/syscall.h4
-rw-r--r--libexec/ld.so/arm/syscall.h4
-rw-r--r--libexec/ld.so/hppa/syscall.h4
-rw-r--r--libexec/ld.so/i386/syscall.h4
-rw-r--r--libexec/ld.so/m88k/syscall.h4
-rw-r--r--libexec/ld.so/mips64/syscall.h4
-rw-r--r--libexec/ld.so/powerpc/syscall.h4
-rw-r--r--libexec/ld.so/sh/syscall.h4
-rw-r--r--libexec/ld.so/sparc/syscall.h4
-rw-r--r--libexec/ld.so/sparc64/syscall.h4
-rw-r--r--sys/compat/linux/syscalls.master6
-rw-r--r--sys/kern/syscalls.master6
15 files changed, 34 insertions, 34 deletions
diff --git a/include/unistd.h b/include/unistd.h
index 0d7fd3abb7e..1121fee4594 100644
--- a/include/unistd.h
+++ b/include/unistd.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: unistd.h,v 1.91 2014/08/31 04:02:08 guenther Exp $ */
+/* $OpenBSD: unistd.h,v 1.92 2014/09/01 05:09:52 doug Exp $ */
/* $NetBSD: unistd.h,v 1.26.4.1 1996/05/28 02:31:51 mrg Exp $ */
/*-
@@ -424,7 +424,7 @@ int lchown(const char *, uid_t, gid_t);
int mkstemp(char *);
char *mktemp(char *);
int nice(int);
-int readlink(const char *, char *, size_t)
+ssize_t readlink(const char * __restrict, char * __restrict, size_t)
__attribute__ ((__bounded__(__string__,2,3)));
int setkey(const char *);
int setpgrp(pid_t pid, pid_t pgrp); /* obsoleted by setpgid() */
diff --git a/lib/libc/sys/readlink.2 b/lib/libc/sys/readlink.2
index b5e2abad447..9f12e977472 100644
--- a/lib/libc/sys/readlink.2
+++ b/lib/libc/sys/readlink.2
@@ -1,4 +1,4 @@
-.\" $OpenBSD: readlink.2,v 1.16 2013/07/17 05:42:11 schwarze Exp $
+.\" $OpenBSD: readlink.2,v 1.17 2014/09/01 05:09:52 doug Exp $
.\" $NetBSD: readlink.2,v 1.7 1995/02/27 12:35:54 cgd Exp $
.\"
.\" Copyright (c) 1983, 1991, 1993
@@ -30,7 +30,7 @@
.\"
.\" @(#)readlink.2 8.1 (Berkeley) 6/4/93
.\"
-.Dd $Mdocdate: July 17 2013 $
+.Dd $Mdocdate: September 1 2014 $
.Dt READLINK 2
.Os
.Sh NAME
@@ -39,8 +39,8 @@
.Nd read value of a symbolic link
.Sh SYNOPSIS
.Fd #include <unistd.h>
-.Ft int
-.Fn readlink "const char *path" "char *buf" "size_t bufsiz"
+.Ft ssize_t
+.Fn readlink "const char *restrict path" "char *restrict buf" "size_t bufsiz"
.Fd #include <fcntl.h>
.Fd #include <unistd.h>
.Ft ssize_t
diff --git a/libexec/ld.so/alpha/syscall.h b/libexec/ld.so/alpha/syscall.h
index b9c8927701e..a4624a47130 100644
--- a/libexec/ld.so/alpha/syscall.h
+++ b/libexec/ld.so/alpha/syscall.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: syscall.h,v 1.27 2014/07/14 03:54:50 deraadt Exp $ */
+/* $OpenBSD: syscall.h,v 1.28 2014/09/01 05:09:52 doug Exp $ */
/*
* Copyright (c) 2001 Niklas Hallqvist
@@ -53,7 +53,7 @@ long _dl__syscall(quad_t, ...);
int _dl_sigprocmask(int, const sigset_t *, sigset_t *);
int _dl_sysctl(const int *, u_int, void *, size_t *, void *, size_t);
int _dl_gettimeofday(struct timeval *, struct timezone *);
-int _dl_readlink(const char *, char *, size_t);
+ssize_t _dl_readlink(const char *, char *, size_t);
int _dl_lstat(const char *, struct stat *);
int _dl_getcwd(char *, size_t);
int _dl_utrace(const char *, const void *, size_t);
diff --git a/libexec/ld.so/amd64/syscall.h b/libexec/ld.so/amd64/syscall.h
index 91aa7ce285b..153013c6631 100644
--- a/libexec/ld.so/amd64/syscall.h
+++ b/libexec/ld.so/amd64/syscall.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: syscall.h,v 1.15 2014/07/14 03:54:50 deraadt Exp $ */
+/* $OpenBSD: syscall.h,v 1.16 2014/09/01 05:09:52 doug Exp $ */
/*
* Copyright (c) 2001 Niklas Hallqvist
@@ -53,7 +53,7 @@ ssize_t _dl_getdents(int, char *, size_t);
int _dl_sigprocmask(int, const sigset_t *, sigset_t *);
int _dl_sysctl(const int *, u_int, void *, size_t *, void *, size_t);
int _dl_gettimeofday(struct timeval *, struct timezone *);
-int _dl_readlink(const char *, char *, size_t);
+ssize_t _dl_readlink(const char *, char *, size_t);
int _dl_lstat(const char *, struct stat *);
int _dl_getcwd(char *, size_t);
int _dl_utrace(const char *, const void *, size_t);
diff --git a/libexec/ld.so/arm/syscall.h b/libexec/ld.so/arm/syscall.h
index 2b56307b61b..5784fc7d661 100644
--- a/libexec/ld.so/arm/syscall.h
+++ b/libexec/ld.so/arm/syscall.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: syscall.h,v 1.15 2014/07/14 03:54:51 deraadt Exp $ */
+/* $OpenBSD: syscall.h,v 1.16 2014/09/01 05:09:53 doug Exp $ */
/*
* Copyright (c) 2001 Niklas Hallqvist
@@ -53,7 +53,7 @@ ssize_t _dl_getdents(int, char *, size_t);
int _dl_sigprocmask(int, const sigset_t *, sigset_t *);
int _dl_sysctl(const int *, u_int, void *, size_t *, void *, size_t);
int _dl_gettimeofday(struct timeval *, struct timezone *);
-int _dl_readlink(const char *, char *, size_t);
+ssize_t _dl_readlink(const char *, char *, size_t);
int _dl_lstat(const char *, struct stat *);
int _dl_getcwd(char *, size_t);
int _dl_utrace(const char *, const void *, size_t);
diff --git a/libexec/ld.so/hppa/syscall.h b/libexec/ld.so/hppa/syscall.h
index da985444cac..60e9934a91b 100644
--- a/libexec/ld.so/hppa/syscall.h
+++ b/libexec/ld.so/hppa/syscall.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: syscall.h,v 1.15 2014/07/14 03:54:51 deraadt Exp $ */
+/* $OpenBSD: syscall.h,v 1.16 2014/09/01 05:09:53 doug Exp $ */
/*
* Copyright (c) 2001 Niklas Hallqvist
@@ -53,7 +53,7 @@ ssize_t _dl_getdents(int, char *, size_t);
int _dl_sigprocmask(int, const sigset_t *, sigset_t *);
int _dl_sysctl(const int *, u_int, void *, size_t *, void *, size_t);
int _dl_gettimeofday(struct timeval *, struct timezone *);
-int _dl_readlink(const char *, char *, size_t);
+ssize_t _dl_readlink(const char *, char *, size_t);
int _dl_lstat(const char *, struct stat *);
int _dl_getcwd(char *, size_t);
int _dl_utrace(const char *, const void *, size_t);
diff --git a/libexec/ld.so/i386/syscall.h b/libexec/ld.so/i386/syscall.h
index 4653e472b27..4ceceded286 100644
--- a/libexec/ld.so/i386/syscall.h
+++ b/libexec/ld.so/i386/syscall.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: syscall.h,v 1.19 2014/07/14 03:54:51 deraadt Exp $ */
+/* $OpenBSD: syscall.h,v 1.20 2014/09/01 05:09:53 doug Exp $ */
/*
* Copyright (c) 2001 Niklas Hallqvist
@@ -53,7 +53,7 @@ ssize_t _dl_getdents(int, char *, size_t);
int _dl_sigprocmask(int, const sigset_t *, sigset_t *);
int _dl_sysctl(const int *, u_int, void *, size_t *, void *, size_t);
int _dl_gettimeofday(struct timeval *, struct timezone *);
-int _dl_readlink(const char *, char *, size_t);
+ssize_t _dl_readlink(const char *, char *, size_t);
int _dl_lstat(const char *, struct stat *);
int _dl_getcwd(char *, size_t);
int _dl_utrace(const char *, const void *, size_t);
diff --git a/libexec/ld.so/m88k/syscall.h b/libexec/ld.so/m88k/syscall.h
index 08263dab696..3acc85938b4 100644
--- a/libexec/ld.so/m88k/syscall.h
+++ b/libexec/ld.so/m88k/syscall.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: syscall.h,v 1.11 2014/07/14 03:54:51 deraadt Exp $ */
+/* $OpenBSD: syscall.h,v 1.12 2014/09/01 05:09:53 doug Exp $ */
/*
* Copyright (c) 2001 Niklas Hallqvist
@@ -53,7 +53,7 @@ ssize_t _dl_getdents(int, char *, size_t);
int _dl_sigprocmask(int, const sigset_t *, sigset_t *);
int _dl_sysctl(const int *, u_int, void *, size_t *, void *, size_t);
int _dl_gettimeofday(struct timeval *, struct timezone *);
-int _dl_readlink(const char *, char *, size_t);
+ssize_t _dl_readlink(const char *, char *, size_t);
int _dl_lstat(const char *, struct stat *);
int _dl_getcwd(char *, size_t);
int _dl_utrace(const char *, const void *, size_t);
diff --git a/libexec/ld.so/mips64/syscall.h b/libexec/ld.so/mips64/syscall.h
index ed866886b26..65c97232abc 100644
--- a/libexec/ld.so/mips64/syscall.h
+++ b/libexec/ld.so/mips64/syscall.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: syscall.h,v 1.17 2014/07/14 03:54:51 deraadt Exp $ */
+/* $OpenBSD: syscall.h,v 1.18 2014/09/01 05:09:53 doug Exp $ */
/*
* Copyright (c) 1998-2002 Opsycon AB, Sweden.
@@ -51,7 +51,7 @@ int _dl_mprotect(const void *, size_t, int);
int _dl_munmap(const void *, size_t);
int _dl_open(const char *, int);
ssize_t _dl_read(int, const char *, size_t);
-int _dl_readlink(const char *, char *, size_t);
+ssize_t _dl_readlink(const char *, char *, size_t);
int _dl_sigprocmask(int, const sigset_t *, sigset_t *);
long _dl__syscall(quad_t, ...);
int _dl_sysctl(const int *, u_int, void *, size_t *, void *, size_t);
diff --git a/libexec/ld.so/powerpc/syscall.h b/libexec/ld.so/powerpc/syscall.h
index 15c4239b0c1..17e9054a907 100644
--- a/libexec/ld.so/powerpc/syscall.h
+++ b/libexec/ld.so/powerpc/syscall.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: syscall.h,v 1.35 2014/07/14 03:54:51 deraadt Exp $ */
+/* $OpenBSD: syscall.h,v 1.36 2014/09/01 05:09:53 doug Exp $ */
/*
* Copyright (c) 1998 Per Fogelstrom, Opsycon AB
@@ -54,7 +54,7 @@ int _dl_mprotect(const void *, size_t, int);
int _dl_munmap(const void *, size_t);
int _dl_open(const char *, int);
ssize_t _dl_read(int, const char *, size_t);
-int _dl_readlink(const char *, char *, size_t);
+ssize_t _dl_readlink(const char *, char *, size_t);
int _dl_sigprocmask(int, const sigset_t *, sigset_t *);
long _dl__syscall(quad_t, ...);
int _dl_sysctl(const int *, u_int, void *, size_t *, void *, size_t);
diff --git a/libexec/ld.so/sh/syscall.h b/libexec/ld.so/sh/syscall.h
index 2cc9fa1028b..dd3a7f3b558 100644
--- a/libexec/ld.so/sh/syscall.h
+++ b/libexec/ld.so/sh/syscall.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: syscall.h,v 1.13 2014/07/14 03:54:51 deraadt Exp $ */
+/* $OpenBSD: syscall.h,v 1.14 2014/09/01 05:09:53 doug Exp $ */
/*
* Copyright (c) 2001 Niklas Hallqvist
@@ -53,7 +53,7 @@ ssize_t _dl_getdents(int, char *, size_t);
int _dl_sigprocmask(int, const sigset_t *, sigset_t *);
int _dl_sysctl(const int *, u_int, void *, size_t *, void *, size_t);
int _dl_gettimeofday(struct timeval *, struct timezone *);
-int _dl_readlink(const char *, char *, size_t);
+ssize_t _dl_readlink(const char *, char *, size_t);
int _dl_lstat(const char *, struct stat *);
int _dl_getcwd(char *, size_t);
int _dl_utrace(const char *, const void *, size_t);
diff --git a/libexec/ld.so/sparc/syscall.h b/libexec/ld.so/sparc/syscall.h
index fefe02114a7..6b59b396c4c 100644
--- a/libexec/ld.so/sparc/syscall.h
+++ b/libexec/ld.so/sparc/syscall.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: syscall.h,v 1.20 2014/07/14 03:54:51 deraadt Exp $ */
+/* $OpenBSD: syscall.h,v 1.21 2014/09/01 05:09:53 doug Exp $ */
/*
* Copyright (c) 2001 Niklas Hallqvist
@@ -53,7 +53,7 @@ ssize_t _dl_getdents(int, char *, size_t);
int _dl_sigprocmask(int, const sigset_t *, sigset_t *);
int _dl_sysctl(const int *, u_int, void *, size_t *, void *, size_t);
int _dl_gettimeofday(struct timeval *, struct timezone *);
-int _dl_readlink(const char *, char *, size_t);
+ssize_t _dl_readlink(const char *, char *, size_t);
int _dl_lstat(const char *, struct stat *);
int _dl_getcwd(char *, size_t);
int _dl_utrace(const char *, const void *, size_t);
diff --git a/libexec/ld.so/sparc64/syscall.h b/libexec/ld.so/sparc64/syscall.h
index d13d4bbf88c..6a441075001 100644
--- a/libexec/ld.so/sparc64/syscall.h
+++ b/libexec/ld.so/sparc64/syscall.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: syscall.h,v 1.27 2014/07/14 03:54:51 deraadt Exp $ */
+/* $OpenBSD: syscall.h,v 1.28 2014/09/01 05:09:53 doug Exp $ */
/*
* Copyright (c) 2001 Niklas Hallqvist
@@ -53,7 +53,7 @@ ssize_t _dl_getdents(int, char *, size_t);
int _dl_sigprocmask(int, const sigset_t *, sigset_t *);
int _dl_sysctl(const int *, u_int, void *, size_t *, void *, size_t);
int _dl_gettimeofday(struct timeval *, struct timezone *);
-int _dl_readlink(const char *, char *, size_t);
+ssize_t _dl_readlink(const char *, char *, size_t);
int _dl_lstat(const char *, struct stat *);
int _dl_getcwd(char *, size_t);
int _dl_utrace(const char *, const void *, size_t);
diff --git a/sys/compat/linux/syscalls.master b/sys/compat/linux/syscalls.master
index c46067207f1..a93e2493146 100644
--- a/sys/compat/linux/syscalls.master
+++ b/sys/compat/linux/syscalls.master
@@ -1,4 +1,4 @@
- $OpenBSD: syscalls.master,v 1.75 2013/11/03 13:52:44 pirofti Exp $
+ $OpenBSD: syscalls.master,v 1.76 2014/09/01 05:09:53 doug Exp $
; $NetBSD: syscalls.master,v 1.15 1995/12/18 14:35:10 fvdl Exp $
; @(#)syscalls.master 8.1 (Berkeley) 7/19/93
@@ -156,8 +156,8 @@
83 STD { int linux_sys_symlink(char *path, char *to); }
84 NOARGS { int linux_sys_lstat(char *path, \
struct linux_stat *up); } olstat
-85 STD { int linux_sys_readlink(char *name, char *buf, \
- int count); }
+85 STD { ssize_t linux_sys_readlink(char *name, \
+ char *buf, int count); }
86 UNIMPL linux_sys_uselib
87 STD { int linux_sys_swapon(char *name); }
88 NOARGS { int sys_reboot(int opt); }
diff --git a/sys/kern/syscalls.master b/sys/kern/syscalls.master
index 512d2032a96..82d49776caa 100644
--- a/sys/kern/syscalls.master
+++ b/sys/kern/syscalls.master
@@ -1,4 +1,4 @@
-; $OpenBSD: syscalls.master,v 1.144 2014/08/31 01:42:36 guenther Exp $
+; $OpenBSD: syscalls.master,v 1.145 2014/09/01 05:09:53 doug Exp $
; $NetBSD: syscalls.master,v 1.32 1996/04/23 10:24:21 mycroft Exp $
; @(#)syscalls.master 8.2 (Berkeley) 1/13/94
@@ -141,8 +141,8 @@
56 STD { int sys_revoke(const char *path); }
57 STD { int sys_symlink(const char *path, \
const char *link); }
-58 STD { int sys_readlink(const char *path, char *buf, \
- size_t count); }
+58 STD { ssize_t sys_readlink(const char *path, \
+ char *buf, size_t count); }
59 STD { int sys_execve(const char *path, \
char * const *argp, char * const *envp); }
60 STD { mode_t sys_umask(mode_t newmask); }
Copyright © 1996 – 2023 Jason A. Donenfeld. All Rights Reverse Engineered.