This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
Re: [PATCH,HURD] mkdirat, readlinkat
Roland McGrath, le Mon 28 Sep 2009 11:38:17 -0700, a écrit :
> Please move the readlink guts into __readlinkat and make __readlink
> call it.
Ah, I had just done like for other *at functions, which could probably
get the same treatment.
Samuel
2009-09-28 Samuel Thibault <samuel.thibault@ens-lyon.org>
* sysdeps/mach/hurd/readlink.c (__readlink): Move code to the new
readlinkat function, and call it with AT_FDCWD instead.
* sysdeps/mach/hurd/readlinkat.c (readlinkat): Import code from the
readlink function, call __file_name_lookup_at with the given fd instead
of __file_name_lookup.
diff --git a/sysdeps/mach/hurd/readlink.c b/sysdeps/mach/hurd/readlink.c
index f95b6c0..12b62ab 100644
--- a/sysdeps/mach/hurd/readlink.c
+++ b/sysdeps/mach/hurd/readlink.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991,92,93,94,95,97,2002 Free Software Foundation, Inc.
+/* Copyright (C) 1991,92,93,94,95,97,2002,2009 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
@@ -31,35 +31,6 @@ __readlink (file_name, buf, len)
char *buf;
size_t len;
{
- error_t err;
- file_t file;
- struct stat64 st;
-
- file = __file_name_lookup (file_name, O_READ | O_NOLINK, 0);
- if (file == MACH_PORT_NULL)
- return -1;
-
- err = __io_stat (file, &st);
- if (! err)
- if (S_ISLNK (st.st_mode))
- {
- char *rbuf = buf;
-
- err = __io_read (file, &rbuf, &len, 0, len);
- if (!err && rbuf != buf)
- {
- memcpy (buf, rbuf, len);
- __vm_deallocate (__mach_task_self (), (vm_address_t)rbuf, len);
- }
- }
- else
- err = EINVAL;
-
- __mach_port_deallocate (__mach_task_self (), file);
-
- if (err)
- return __hurd_fail (err);
- else
- return len;
+ return readlinkat (AT_FDCWD, file_name, buf, len);
}
weak_alias (__readlink, readlink)
diff --git a/sysdeps/mach/hurd/readlinkat.c b/sysdeps/mach/hurd/readlinkat.c
new file mode 100644
index 0000000..59aeede
--- /dev/null
+++ b/sysdeps/mach/hurd/readlinkat.c
@@ -0,0 +1,67 @@
+/* Copyright (C) 1991,92,93,94,95,97,2002,2009 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
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, write to the Free
+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA. */
+
+#include <unistd.h>
+#include <hurd.h>
+#include <hurd/paths.h>
+#include <hurd/fd.h>
+#include <fcntl.h>
+#include <string.h>
+
+/* Read the contents of the symbolic link FILE_NAME relative to FD into no more
+ than LEN bytes of BUF. The contents are not null-terminated.
+ Returns the number of characters read, or -1 for errors. */
+ssize_t
+readlinkat (fd, file_name, buf, len)
+ int fd;
+ const char *file_name;
+ char *buf;
+ size_t len;
+{
+ error_t err;
+ file_t file;
+ struct stat64 st;
+
+ file = __file_name_lookup_at (fd, 0, file_name, O_READ | O_NOLINK, 0);
+ if (file == MACH_PORT_NULL)
+ return -1;
+
+ err = __io_stat (file, &st);
+ if (! err)
+ if (S_ISLNK (st.st_mode))
+ {
+ char *rbuf = buf;
+
+ err = __io_read (file, &rbuf, &len, 0, len);
+ if (!err && rbuf != buf)
+ {
+ memcpy (buf, rbuf, len);
+ __vm_deallocate (__mach_task_self (), (vm_address_t)rbuf, len);
+ }
+ }
+ else
+ err = EINVAL;
+
+ __mach_port_deallocate (__mach_task_self (), file);
+
+ if (err)
+ return __hurd_fail (err);
+ else
+ return len;
+}
+libc_hidden_def (readlinkat);