svn commit: trunk/uClibc: include libc/sysdeps/linux/common

[vapier at uclibc.org]

Author: vapier
Date: 2007-01-28 15:02:24 -0800 (Sun, 28 Jan 2007)
New Revision: 17605

Log:
sync with glibc as pointed out by Bernhard Fischer

Modified:
   trunk/uClibc/include/unistd.h
   trunk/uClibc/libc/sysdeps/linux/common/readlink.c


Changeset:
Modified: trunk/uClibc/include/unistd.h
===================================================================
--- trunk/uClibc/include/unistd.h	2007-01-28 17:35:11 UTC (rev 17604)
+++ trunk/uClibc/include/unistd.h	2007-01-28 23:02:24 UTC (rev 17605)
@@ -559,7 +559,7 @@
 extern long int fpathconf (int __fd, int __name) __THROW;
 
 /* Get the value of the system variable NAME.  */
-extern long int sysconf (int __name) __THROW __attribute__ ((__const__));
+extern long int sysconf (int __name) __THROW;
 
 #ifdef	__USE_POSIX2
 /* Get the value of the string-valued system variable NAME.  */
@@ -760,7 +760,8 @@
 /* Like link but relative paths in TO and FROM are interpreted relative
    to FROMFD and TOFD respectively.  */
 extern int linkat (int __fromfd, __const char *__from, int __tofd,
-		   __const char *__to) __THROW __nonnull ((2, 4)) __wur;
+		   __const char *__to, int __flags)
+     __THROW __nonnull ((2, 4)) __wur;
 #endif
 
 #if defined __USE_BSD || defined __USE_XOPEN_EXTENDED || defined __USE_XOPEN2K
@@ -771,8 +772,9 @@
 /* Read the contents of the symbolic link PATH into no more than
    LEN bytes of BUF.  The contents are not null-terminated.
    Returns the number of characters read, or -1 for errors.  */
-extern int readlink (__const char *__restrict __path, char *__restrict __buf,
-		     size_t __len) __THROW __nonnull ((1, 2)) __wur;
+extern ssize_t readlink (__const char *__restrict __path,
+			 char *__restrict __buf, size_t __len)
+     __THROW __nonnull ((1, 2)) __wur;
 #endif /* Use BSD.  */
 
 #ifdef __USE_ATFILE
@@ -781,8 +783,8 @@
 		      __const char *__to) __THROW __nonnull ((1, 3)) __wur;
 
 /* Like readlink but a relative PATH is interpreted relative to FD.  */
-extern int readlinkat (int __fd, __const char *__restrict __path,
-		       char *__restrict __buf, size_t __len)
+extern ssize_t readlinkat (int __fd, __const char *__restrict __path,
+			   char *__restrict __buf, size_t __len)
      __THROW __nonnull ((2, 3)) __wur;
 #endif
 
@@ -811,7 +813,7 @@
    This function is a possible cancellation points and therefore not
    marked with __THROW.  */
 extern char *getlogin (void);
-#if defined __USE_REENTRANT || defined __USE_UNIX98
+#if defined __USE_REENTRANT || defined __USE_POSIX199506
 /* Return at most NAME_LEN characters of the login name of the user in NAME.
    If it cannot be determined or some other error occurred, return the error
    code.  Otherwise return 0.

Modified: trunk/uClibc/libc/sysdeps/linux/common/readlink.c
===================================================================
--- trunk/uClibc/libc/sysdeps/linux/common/readlink.c	2007-01-28 17:35:11 UTC (rev 17604)
+++ trunk/uClibc/libc/sysdeps/linux/common/readlink.c	2007-01-28 23:02:24 UTC (rev 17605)
@@ -2,7 +2,7 @@
 /*
  * readlink() for uClibc
  *
- * Copyright (C) 2000-2006 Erik Andersen <andersen at uclibc.org>
+ * Copyright (C) 2000-2007 Erik Andersen <andersen at uclibc.org>
  *
  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
  */
@@ -11,6 +11,5 @@
 #include <unistd.h>
 
 libc_hidden_proto(readlink)
-
-_syscall3(int, readlink, const char *, path, char *, buf, size_t, bufsiz);
+_syscall3(ssize_t, readlink, const char *, path, char *, buf, size_t, bufsiz);
 libc_hidden_def(readlink)