Double checking my commit I found that comment saying that

POSIX 2008 and XSI 7require strcoll() for opendir() is not true.
I can't find such requirement in POSIX 2008 and XSI 7.

So, back out that part of my commit, returning old strcmp(), and remove
this misleading comment.
This commit is contained in:
Andrey A. Chernov 2010-01-18 13:44:44 +00:00
parent bfd1961beb
commit b9a74f2ad5
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=202572

View File

@ -92,15 +92,11 @@ __opendir2(const char *name, int flags)
return __opendir_common(fd, name, flags);
}
/*
* POSIX 2008 and XSI 7 require alphasort() to call strcoll() for
* directory entries ordering.
*/
static int
opendir_alphasort(const void *p1, const void *p2)
opendir_sort(const void *p1, const void *p2)
{
return (strcoll((*(const struct dirent **)p1)->d_name,
return (strcmp((*(const struct dirent **)p1)->d_name,
(*(const struct dirent **)p2)->d_name));
}
@ -253,7 +249,7 @@ __opendir_common(int fd, const char *name, int flags)
* This sort must be stable.
*/
mergesort(dpv, n, sizeof(*dpv),
opendir_alphasort);
opendir_sort);
dpv[n] = NULL;
xp = NULL;