diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-06-06 12:53:44 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-06-06 12:53:44 -0700 |
| commit | 9afafefb1b8341816a20eac9491f3f9aaf2aea61 (patch) | |
| tree | 0cddbd8afe6099fb0a4bdf3f3628d5b7a70f68d7 /lib | |
| parent | 001903b5498d4898455e1a69bff166a9cc699ec0 (diff) | |
| download | emacs-9afafefb1b8341816a20eac9491f3f9aaf2aea61.tar.gz | |
Merge from gnulib.
* lib/careadlinkat.c, lib/careadlinkat.h, m4/gnulib-common.m4: Merge.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/careadlinkat.c | 2 | ||||
| -rw-r--r-- | lib/careadlinkat.h | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/lib/careadlinkat.c b/lib/careadlinkat.c index 6e4aa1395ff..751578b9a58 100644 --- a/lib/careadlinkat.c +++ b/lib/careadlinkat.c @@ -39,7 +39,6 @@ #include "allocator.h" -#if ! HAVE_READLINKAT /* 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. */ @@ -53,7 +52,6 @@ careadlinkatcwd (int fd, char const *filename, char *buffer, abort (); return readlink (filename, buffer, buffer_size); } -#endif /* Assuming the current directory is FD, get the symbolic link value of FILENAME as a null-terminated string and put it into a buffer. diff --git a/lib/careadlinkat.h b/lib/careadlinkat.h index 4f0184bbc33..6576fb2cecc 100644 --- a/lib/careadlinkat.h +++ b/lib/careadlinkat.h @@ -56,8 +56,7 @@ char *careadlinkat (int fd, char const *filename, when doing a plain readlink: Pass FD = AT_FDCWD and PREADLINKAT = careadlinkatcwd. */ #if HAVE_READLINKAT -/* AT_FDCWD is declared in <fcntl.h>, readlinkat in <unistd.h>. */ -# define careadlinkatcwd readlinkat +/* AT_FDCWD is declared in <fcntl.h>. */ #else /* Define AT_FDCWD independently, so that the careadlinkat module does not depend on the fcntl-h module. The value does not matter, since @@ -66,8 +65,8 @@ char *careadlinkat (int fd, char const *filename, # ifndef AT_FDCWD # define AT_FDCWD (-3041965) # endif +#endif ssize_t careadlinkatcwd (int fd, char const *filename, char *buffer, size_t buffer_size); -#endif #endif /* _GL_CAREADLINKAT_H */ |