Updated to fedora-glibc-20060301T0647

5 files changed, 15 insertions, 9 deletions

diff --git a/io/fcntl.h b/io/fcntl.h
index e50afbbfd1..72a944b3d4 100644
--- a/io/fcntl.h
+++ b/io/fcntl.h
@@ -58,11 +58,12 @@ __BEGIN_DECLS
 
 #ifdef __USE_ATFILE
 # define AT_FDCWD		-100	/* Special value used to indicate
-					   openat should use the current
-					   working directory. */
+					   the *at functions should use the
+					   current working directory. */
 # define AT_SYMLINK_NOFOLLOW	0x100	/* Do not follow symbolic links.  */
 # define AT_REMOVEDIR		0x200	/* Remove directory instead of
 					   unlinking file.  */
+# define AT_SYMLINK_FOLLOW	0x400	/* Follow symbolic links.  */
 # define AT_EACCESS		0x200	/* Test access permitted for
 					   effective IDs, not real IDs.  */
 #endif
diff --git a/io/linkat.c b/io/linkat.c
index 6420d50334..9afcf61a3c 100644
--- a/io/linkat.c
+++ b/io/linkat.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2005 Free Software Foundation, Inc.
+/* Copyright (C) 2005, 2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -24,11 +24,12 @@
 
 /* Make a link to FROM relative to FROMFD called TO relative to TOFD.  */
 int
-linkat (fromfd, from, tofd, to)
+linkat (fromfd, from, tofd, to, flags)
      int fromfd;
      const char *from;
      int tofd;
      const char *to;
+     int flags;
 {
   if (from == NULL || to == NULL)
     {
diff --git a/io/openat.c b/io/openat.c
index f3f699ca23..c65ad19c7a 100644
--- a/io/openat.c
+++ b/io/openat.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2005 Free Software Foundation, Inc.
+/* Copyright (C) 2005, 2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -26,7 +26,7 @@
    the directory associated with FD.  If OFLAG includes O_CREAT, a
    third argument is the file protection.  */
 int
-openat (fd, file, oflag)
+__openat (fd, file, oflag)
      int fd;
      const char *file;
      int oflag;
@@ -64,6 +64,8 @@ openat (fd, file, oflag)
   __set_errno (ENOSYS);
   return -1;
 }
+libc_hidden_def (__openat)
+weak_alias (__openat, openat)
 stub_warning (openat)
 
 #include <stub-tag.h>
diff --git a/io/openat64.c b/io/openat64.c
index 87952d38d6..830701a949 100644
--- a/io/openat64.c
+++ b/io/openat64.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2005 Free Software Foundation, Inc.
+/* Copyright (C) 2005, 2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -26,7 +26,7 @@
    the directory associated with FD.  If OFLAG includes O_CREAT, a
    third argument is the file protection.  */
 int
-openat64 (fd, file, oflag)
+__openat64 (fd, file, oflag)
      int fd;
      const char *file;
      int oflag;
@@ -64,6 +64,8 @@ openat64 (fd, file, oflag)
   __set_errno (ENOSYS);
   return -1;
 }
+libc_hidden_def (__openat64)
+weak_alias (__openat64, openat64)
 stub_warning (openat64)
 
 #include <stub-tag.h>
diff --git a/io/tst-linkat.c b/io/tst-linkat.c
index a77ceb1db4..d63c982751 100644
--- a/io/tst-linkat.c
+++ b/io/tst-linkat.c
@@ -105,7 +105,7 @@ do_test (void)
 
   close (fd);
 
-  if (linkat (dir_fd, "some-file", dir_fd, "another-file") != 0)
+  if (linkat (dir_fd, "some-file", dir_fd, "another-file", 0) != 0)
     {
       puts ("symlinkat failed");
       return 1;