qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* sysdeps/mach/hurd/readdir_r.c (__readdir_r): Return error number instead of -1 on failure. Don't forget to copy file name into *ENTRY if successful. Set *RESULT to NULL upon reaching the end of the directory. 

* sysdeps/mach/hurd/readdir_r.c (__readdir_r): Return error number
	instead of -1 on failure.  Don't forget to copy file name into
	*ENTRY if successful.  Set *RESULT to NULL upon reaching the end
	of the directory.

2001-01-06  Mark Kettenis  <kettenis@gnu.org>
This commit is contained in:
Mark Kettenis 2001-01-06 12:31:35 +00:00
parent 74ec0232c2
commit 655bfb8bff
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2001-01-06 Mark Kettenis <kettenis@gnu.org>
* sysdeps/mach/hurd/readdir_r.c (__readdir_r): Return error number
instead of -1 on failure. Don't forget to copy file name into
*ENTRY if successful. Set *RESULT to NULL upon reaching the end
of the directory.
2001-01-06 Mark Kettenis <kettenis@gnu.org> 2001-01-06 Mark Kettenis <kettenis@gnu.org>
* sysdeps/mach/hurd/xstatconv.c (xstat64_conv): Don't forget to * sysdeps/mach/hurd/xstatconv.c (xstat64_conv): Don't forget to

12
sysdeps/mach/hurd/readdir_r.c
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1993, 1994, 1995, 1996, 1997 Free Software Foundation, Inc. /* Copyright (C) 1993, 94, 95, 96, 1997, 2001 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@ -33,11 +33,12 @@ int
__readdir_r (DIR *dirp, struct dirent *entry, struct dirent **result) __readdir_r (DIR *dirp, struct dirent *entry, struct dirent **result)
{ {
struct dirent *dp; struct dirent *dp;
error_t err = 0;
if (dirp == NULL) if (dirp == NULL)
{ {
errno = EINVAL; errno = EINVAL;
return -1; return errno;
} }
__libc_lock_lock (dirp->__lock); __libc_lock_lock (dirp->__lock);
@ -50,7 +51,6 @@ __readdir_r (DIR *dirp, struct dirent *entry, struct dirent **result)
char *data = dirp->__data; char *data = dirp->__data;
int nentries; int nentries;
error_t err;
if (err = HURD_FD_PORT_USE (dirp->__fd, if (err = HURD_FD_PORT_USE (dirp->__fd,
__dir_readdir (port, __dir_readdir (port,
@ -102,11 +102,15 @@ __readdir_r (DIR *dirp, struct dirent *entry, struct dirent **result)
if (dp) if (dp)
{ {
*entry = *dp; *entry = *dp;
memcpy (entry->d_name, dp->d_name, dp->d_namlen + 1);
*result = entry; *result = entry;
} }
else
*result = NULL;
__libc_lock_unlock (dirp->__lock); __libc_lock_unlock (dirp->__lock);
return dp ? 0 : -1; return dp ? 0 : err ? errno : 0;
} }
weak_alias (__readdir_r, readdir_r) weak_alias (__readdir_r, readdir_r)