From 69d9a57ddcfb6d9b51ce321bd2557881c6784151 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sun, 10 Apr 2011 09:00:46 -0700 Subject: [PATCH] Merge from gnulib. --- lib/careadlinkat.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/lib/careadlinkat.c b/lib/careadlinkat.c index 01883db9ce..e2909c766d 100644 --- a/lib/careadlinkat.c +++ b/lib/careadlinkat.c @@ -22,10 +22,9 @@ #include "careadlinkat.h" -#include "allocator.h" - #include #include +#include #include #include @@ -38,15 +37,20 @@ # define SSIZE_MAX ((ssize_t) (SIZE_MAX / 2)) #endif +#include "allocator.h" + #if ! HAVE_READLINKAT -/* Ignore FD. Get the symbolic link value of FILENAME and put it into - BUFFER, with size BUFFER_SIZE. This function acts like readlink - but has readlinkat's signature. */ +/* Get the symbolic link value of FILENAME and put it into BUFFER, with + size BUFFER_SIZE. This function acts like readlink but has + readlinkat's signature. */ ssize_t careadlinkatcwd (int fd, char const *filename, char *buffer, size_t buffer_size) { - (void) fd; + /* FD must be AT_FDCWD here, otherwise the caller is using this + function in contexts for which it was not meant for. */ + if (fd != AT_FDCWD) + abort (); return readlink (filename, buffer, buffer_size); } #endif -- 2.39.2