diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2009-09-29 06:13:11 -0700 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2009-09-29 06:13:11 -0700 |
| commit | f8d7c1eaddec2ab245dd4920107e273114a9b0e8 (patch) | |
| tree | 8bf19868f1d5dab641605b3e7a1a1adab3314355 | |
| parent | 199eb0de8d673fb23aa127721054b4f1803d61f3 (diff) | |
| parent | ff2835318177dd4600d3aa03626f4b5748e3fbeb (diff) | |
| download | glibc-f8d7c1eaddec2ab245dd4920107e273114a9b0e8.tar.gz glibc-f8d7c1eaddec2ab245dd4920107e273114a9b0e8.tar.xz glibc-f8d7c1eaddec2ab245dd4920107e273114a9b0e8.zip | |
Merge branch 'master' of ssh://sources.redhat.com/git/glibc
Conflicts: ChangeLog
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/mkdirat.c | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 6876b83ea7..be2f01a941 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,12 @@ * stdio-common/printf_fp.c: Check for and avoid integer overflows. * stdio-common/vfprintf.c: Likewise. +2009-09-27 Samuel Thibault <samuel.thibault@ens-lyon.org> + + * sysdeps/mach/hurd/mkdirat.c: Include <hurd/fd.h>. + (mkdirat): Call __directory_name_split_at instead of + __directory_name_split. + 2009-09-28 Ulrich Drepper <drepper@redhat.com> * locale/programs/locale-spec.c (locale_special): If nothing matches diff --git a/sysdeps/mach/hurd/mkdirat.c b/sysdeps/mach/hurd/mkdirat.c index 321d59f2fd..a300745690 100644 --- a/sysdeps/mach/hurd/mkdirat.c +++ b/sysdeps/mach/hurd/mkdirat.c @@ -22,6 +22,7 @@ #include <stddef.h> #include <sys/stat.h> #include <hurd.h> +#include <hurd/fd.h> int mkdirat (fd, path, mode) @@ -31,7 +32,7 @@ mkdirat (fd, path, mode) { error_t err; const char *name; - file_t parent = __directory_name_split (path, (char **) &name); + file_t parent = __directory_name_split_at (fd, path, (char **) &name); if (parent == MACH_PORT_NULL) return -1; err = __dir_mkdir (parent, name, mode & ~_hurd_umask); |