From 67613cbbd87b5b3c5b10209e6272fc8ec6405b26 Mon Sep 17 00:00:00 2001 From: ache Date: Mon, 18 Jan 2010 10:17:51 +0000 Subject: [PATCH] a) Use strcoll() in opendir() and alphasort() as POSIX 2008 requires. It also matches now how our 'ls' works for years. b) Remove comment expressed 2 fears: 1) One just simple describe how strcoll() works in _any_ context, not for directories only. Are we plan to remove strcoll() from everything just because it is little more complex than strcmp()? I doubt, and directories give nothing different here. Moreover, strcoll() used in 'ls' for years and nobody complaints yet. 2) Plain wrong statement about undefined strcoll() behaviour. strcoll() always gives predictable results, falling back to strcmp() on any trouble, see strcoll(3). No objections from -current list discussion. --- newlib/libc/posix/scandir.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/newlib/libc/posix/scandir.c b/newlib/libc/posix/scandir.c index 56de1b9e1..c39d9a4c4 100644 --- a/newlib/libc/posix/scandir.c +++ b/newlib/libc/posix/scandir.c @@ -142,12 +142,13 @@ fail: /* * Alphabetic order comparison routine for those who want it. + * POSIX 2008 requires that alphasort() uses strcoll(). */ int -alphasort (const struct dirent **d1, - const struct dirent **d2) +alphasort(const struct dirent **d1, const struct dirent **d2) { - return(strcmp((*d1)->d_name, (*d2)->d_name)); + + return (strcoll((*d1)->d_name, (*d2)->d_name)); } #endif /* ! HAVE_OPENDIR */