fdwalk should return 0 on an empty directory

[kopensolaris-gnu/glibc.git] / locale / duplocale.c

diff --git a/locale/duplocale.c b/locale/duplocale.c
index 4b3bc89..0cec09f 100644 (file)
--- a/locale/duplocale.c
+++ b/locale/duplocale.c
@@ -1,58 +1,86 @@
 /* Duplicate handle for selection of locales.
-   Copyright (C) 1997, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1997, 2000, 2001, 2002, 2005 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
 
    The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
+   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
-   Library General Public License for more details.
+   Lesser General Public License for more details.
 
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   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 <locale.h>
 #include <bits/libc-lock.h>
 #include <stdlib.h>
+#include <string.h>
 
 #include <localeinfo.h>
 
 
 /* Lock for protecting global data.  */
-__libc_lock_define (extern , __libc_setlocale_lock)
+__libc_lock_define (extern , __libc_setlocale_lock attribute_hidden)
 
 
 __locale_t
 __duplocale (__locale_t dataset)
 {
+  /* This static object is returned for newlocale (LC_ALL_MASK, "C").  */
+  if (dataset == _nl_C_locobj_ptr)
+    return dataset;
+
   __locale_t result;
+  int cnt;
+  size_t names_len = 0;
 
-  /* We modify global data.  */
-  __libc_lock_lock (__libc_setlocale_lock);
+  /* Calculate the total space we need to store all the names.  */
+  for (cnt = 0; cnt < __LC_LAST; ++cnt)
+    if (cnt != LC_ALL && dataset->__names[cnt] != _nl_C_name)
+      names_len += strlen (dataset->__names[cnt]) + 1;
 
   /* Get memory.  */
-  result = (__locale_t) malloc (sizeof (struct __locale_struct));
+  result = malloc (sizeof (struct __locale_struct) + names_len);
+
   if (result != NULL)
     {
-      int cnt;
+      char *namep = (char *) (result + 1);
+
+      /* We modify global data (the usage counts).  */
+      __libc_lock_lock (__libc_setlocale_lock);
+
       for (cnt = 0; cnt < __LC_LAST; ++cnt)
        if (cnt != LC_ALL)
          {
            result->__locales[cnt] = dataset->__locales[cnt];
            if (result->__locales[cnt]->usage_count < MAX_USAGE_COUNT)
              ++result->__locales[cnt]->usage_count;
+
+           if (dataset->__names[cnt] == _nl_C_name)
+             result->__names[cnt] = _nl_C_name;
+           else
+             {
+               result->__names[cnt] = namep;
+               namep = __stpcpy (namep, dataset->__names[cnt]) + 1;
+             }
          }
-    }
 
-  /* It's done.  */
-  __libc_lock_unlock (__libc_setlocale_lock);
+      /* Update the special members.  */
+      result->__ctype_b = dataset->__ctype_b;
+      result->__ctype_tolower = dataset->__ctype_tolower;
+      result->__ctype_toupper = dataset->__ctype_toupper;
+
+      /* It's done.  */
+      __libc_lock_unlock (__libc_setlocale_lock);
+    }
 
   return result;
 }
+weak_alias (__duplocale, duplocale)