Changeset 609 for branches/GNU/src/binutils/intl

Timestamp:

Aug 16, 2003, 6:59:22 PM (22 years ago)

Author:

bird

Message:

binutils v2.14 - offical sources.

Location:

branches/GNU/src/binutils/intl

Files:

• ChangeLog (modified) (1 diff, 1 prop)
• Makefile.in (modified) (1 diff, 1 prop)
• bindtextdom.c (modified) (3 diffs, 1 prop)
• dcgettext.c (modified) (7 diffs, 1 prop)
• dgettext.c (modified) (1 diff, 1 prop)
• explodename.c (modified) (2 diffs, 1 prop)
• finddomain.c (modified) (6 diffs, 1 prop)
• gettext.c (modified) (1 diff, 1 prop)
• gettext.h (modified) (1 diff, 1 prop)
• gettextP.h (modified) (6 diffs, 1 prop)
• hash-string.h (modified) (1 diff, 1 prop)
• intlh.inst.in (modified) (1 diff, 1 prop)
• l10nflist.c (modified) (3 diffs, 1 prop)
• libgettext.h (modified) (4 diffs, 1 prop)
• libintl.glibc (modified) (4 diffs, 1 prop)
• linux-msg.sed (modified) (2 diffs, 1 prop)
• loadinfo.h (modified) (2 diffs, 1 prop)
• loadmsgcat.c (modified) (10 diffs, 1 prop)
• localealias.c (modified) (13 diffs, 1 prop)
• textdomain.c (modified) (2 diffs, 1 prop)
• xopen-msg.sed (modified) (2 diffs, 1 prop)

branches/GNU/src/binutils/intl/ChangeLog

@@ +1 @@
+2002-08-05  Daniel Jacobowitz  <drow@mvista.com>
+
+        * Makefile.in (distclean): Remove config.cache, stamp-h,
+        config.status, and config.h.
+
+2002-01-21  Thomas Klausner <wiz@danbala.ifoer.tuwien.ac.at>
+
+        * linux-msg.sed: Comment typo fix.
+        * xopen-msg.sed: Likewise.
+
+1998-04-29  Ulrich Drepper  <drepper@cygnus.com>
+
+        * intl/localealias.c (read_alias_file): Use unsigned char for
+        local variables.  Remove unused variable tp.
+        * intl/l10nflist.c (_nl_normalize_codeset): Use unsigned char *
+        for type of codeset.  For loosing Solaris systems.
+        * intl/loadinfo.h: Adapt prototype of _nl_normalize_codeset.
+        * intl/bindtextdom.c (BINDTEXTDOMAIN): Don't define local variable
+        len if not needed.
+        Patches by Jim Meyering.
+
+1998-04-28  Ulrich Drepper  <drepper@cygnus.com>
+
+        * loadmsgcat.c (_nl_load_domain): Don't assign the element use_mmap if
+        mmap is not supported.
+
+        * hash-string.h: Don't include <values.h>.
+
+1998-04-27  Ulrich Drepper  <drepper@cygnus.com>
+
+        * textdomain.c: Use strdup is available.
+
+        * localealias.c: Define HAVE_MEMPCPY so that we can use this
+        function.  Define and use semapahores to protect modfication of
+        global objects when compiling for glibc.  Add code to allow
+        freeing alias table.
+
+        * l10nflist.c: Don't assume stpcpy not being a macro.
+
+        * gettextP.h: Define internal_function macri if not already done.
+        Use glibc byte-swap macros instead of defining SWAP when compiled
+        for glibc.
+        (struct loaded_domain): Add elements to allow unloading.
+
+        * Makefile.in (distclean): Don't remove libintl.h here.
+
+        * bindtextdomain.c: Carry over changes from glibc.  Use strdup if
+        available.
+
+        * dcgettext.c: Don't assume stpcpy not being a macro.  Mark internal
+        functions.  Add memory freeing code for glibc.
+
+        * dgettext.c: Update copyright.
+
+        * explodename.c: Include stdlib.h and string.h only if they exist.
+        Use strings.h eventually.
+
+        * finddomain.c: Mark internal functions.  Use strdup if available.
+        Add memory freeing code for glibc.
+
+1997-10-10 20:00  Ulrich Drepper  <drepper@cygnus.com>
+
+        * libgettext.h: Fix dummy textdomain and bindtextdomain macros.
+        They should return reasonable values.
+        Reported by Tom Tromey <tromey@cygnus.com>.
+
+1997-09-16 03:33  Ulrich Drepper  <drepper@cygnus.com>
+
+        * libgettext.h: Define PARAMS also to `args' if __cplusplus is defined.
+        * intlh.inst.in: Likewise.
+        Reported by Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>.
+
+        * libintl.glibc: Update from current glibc version.
+
 1997-09-06 02:10  Ulrich Drepper  <drepper@cygnus.com>
 

branches/GNU/src/binutils/intl/Makefile.in

@@ -174 +174 @@
 distclean: clean
         rm -f Makefile ID TAGS po2msg.sed po2tbl.sed libintl.h config.log
+        rm -f config.cache stamp-h config.status config.h
 
 maintainer-clean: distclean

branches/GNU/src/binutils/intl/bindtextdom.c

@@ -1 +1 @@
 /* Implementation of the bindtextdomain(3) function
-   Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
@@ -62 +62 @@
 #ifdef _LIBC
 # define BINDTEXTDOMAIN __bindtextdomain
-# define strdup(str) __strdup (str)
+# ifndef strdup
+#  define strdup(str) __strdup (str)
+# endif
 #else
 # define BINDTEXTDOMAIN bindtextdomain__
@@ -134 +136 @@
     {
       /* We have to create a new binding.  */
+#if !defined _LIBC && !defined HAVE_STRDUP
       size_t len;
+#endif
       struct binding *new_binding =
         (struct binding *) malloc (sizeof (*new_binding));

branches/GNU/src/binutils/intl/dcgettext.c

@@ -1 @@
-/* Implementation of the dcgettext(3) function
-   Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Implementation of the dcgettext(3) function.
+   Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
@@ -92 +92 @@
    file and the name space must not be polluted.  */
 # define getcwd __getcwd
-# define stpcpy __stpcpy
+# ifndef stpcpy
+#  define stpcpy __stpcpy
+# endif
 #else
 # if !defined HAVE_GETCWD
@@ -163 +165 @@
 /* Prototypes for local functions.  */
 static char *find_msg PARAMS ((struct loaded_l10nfile *domain_file,
-                               const char *msgid));
-static const char *category_to_name PARAMS ((int category));
+                               const char *msgid)) internal_function;
+static const char *category_to_name PARAMS ((int category)) internal_function;
 static const char *guess_category_value PARAMS ((int category,
-                                                 const char *categoryname));
+                                                 const char *categoryname))
+     internal_function;
 
 
@@ -389 +392 @@
 
 static char *
+internal_function
 find_msg (domain_file, msgid)
      struct loaded_l10nfile *domain_file;
@@ -477 +481 @@
 /* Return string representation of locale CATEGORY.  */
 static const char *
+internal_function
 category_to_name (category)
      int category;
@@ -536 +541 @@
 /* Guess value of current locale from value of the environment variables.  */
 static const char *
+internal_function
 guess_category_value (category, categoryname)
      int category;
@@ -592 +598 @@
 }
 #endif
+
+
+#ifdef _LIBC
+/* If we want to free all resources we have to do some work at
+   program's end.  */
+static void __attribute__ ((unused))
+free_mem (void)
+{
+  struct binding *runp;
+
+  for (runp = _nl_domain_bindings; runp != NULL; runp = runp->next)
+    {
+      free (runp->domainname);
+      if (runp->dirname != _nl_default_dirname)
+        /* Yes, this is a pointer comparison.  */
+        free (runp->dirname);
+    }
+
+  if (_nl_current_default_domain != _nl_default_default_domain)
+    /* Yes, again a pointer comparison.  */
+    free ((char *) _nl_current_default_domain);
+}
+
+text_set_element (__libc_subfreeres, free_mem);
+#endif

branches/GNU/src/binutils/intl/dgettext.c

@@ -1 @@
-/* dgettext.c -- implementation of the dgettext(3) function
-   Copyright (C) 1995 Software Foundation, Inc.
+/* Implementation of the dgettext(3) function
+   Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
 
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
 
-This program 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 General Public License for more details.
+   This program 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 General Public License for more details.
 
-You should have received a copy of the GNU General Public License
-along with this program; 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 General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #ifdef HAVE_CONFIG_H

branches/GNU/src/binutils/intl/explodename.c

@@ -1 @@
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
    Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
 
@@ -20 +20 @@
 #endif
 
-#include <stdlib.h>
-#include <string.h>
+#if defined STDC_HEADERS || defined _LIBC
+# include <stdlib.h>
+#endif
+
+#if defined HAVE_STRING_H || defined _LIBC
+# include <string.h>
+#else
+# include <strings.h>
+#endif
 #include <sys/types.h>
 

branches/GNU/src/binutils/intl/finddomain.c

@@ -1 +1 @@
 /* Handle list of needed message catalogs
-   Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
    Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
 
@@ -71 +71 @@
    established bindings.  */
 struct loaded_l10nfile *
+internal_function
 _nl_find_domain (dirname, locale, domainname)
      const char *dirname;
@@ -96 +97 @@
         language[_territory][+audience][+special][,[sponsor][_revision]]
 
-     Beside the first all of them are allowed to be missing.  If the
-     full specified locale is not found, the less specific one are
-     looked for.  The various part will be stripped of according to
+     Beside the first part all of them are allowed to be missing.  If
+     the full specified locale is not found, the less specific one are
+     looked for.  The various parts will be stripped off according to
      the following order:
                 (1) revision
@@ -143 +144 @@
   if (alias_value != NULL)
     {
+#if defined _LIBC || defined HAVE_STRDUP
+      locale = strdup (alias_value);
+      if (locale == NULL)
+        return NULL;
+#else
       size_t len = strlen (alias_value) + 1;
       locale = (char *) malloc (len);
@@ -149 +155 @@
 
       memcpy (locale, alias_value, len);
+#endif
     }
 
@@ -188 +195 @@
   return retval;
 }
+
+
+#ifdef _LIBC
+static void __attribute__ ((unused))
+free_mem (void)
+{
+  struct loaded_l10nfile *runp = _nl_loaded_domains;
+
+  while (runp != NULL)
+    {
+      struct loaded_l10nfile *here = runp;
+      if (runp->data != NULL)
+        _nl_unload_domain ((struct loaded_domain *) runp->data);
+      runp = runp->next;
+      free (here);
+    }
+}
+
+text_set_element (__libc_subfreeres, free_mem);
+#endif

branches/GNU/src/binutils/intl/gettext.c

@@ -1 @@
-/* Implementation of gettext(3) function
+/* Implementation of gettext(3) function.
    Copyright (C) 1995, 1997 Free Software Foundation, Inc.
 

branches/GNU/src/binutils/intl/gettext.h

@@ -1 @@
-/* Internal header for GNU gettext internationalization functions
+/* Internal header for GNU gettext internationalization functions.
    Copyright (C) 1995, 1997 Free Software Foundation, Inc.
 

branches/GNU/src/binutils/intl/gettextP.h

@@ -1 +1 @@
 /* Header describing internals of gettext library
-   Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
+   Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
 
    This program is free software; you can redistribute it and/or modify
@@ -31 +32 @@
 #endif
 
+#ifndef internal_function
+# define internal_function
+#endif
+
 #ifndef W
 # define W(flag, data) ((flag) ? SWAP (data) : (data))
@@ -36 +41 @@
 
 
+#ifdef _LIBC
+# include <byteswap.h>
+# define SWAP(i) bswap_32 (i)
+#else
 static nls_uint32 SWAP PARAMS ((nls_uint32 i));
 
@@ -44 +53 @@
   return (i << 24) | ((i & 0xff00) << 8) | ((i >> 8) & 0xff00) | (i >> 24);
 }
+#endif
 
 
@@ -49 +59 @@
 {
   const char *data;
+  int use_mmap;
+  size_t mmap_size;
   int must_swap;
   nls_uint32 nstrings;
@@ -66 +78 @@
 struct loaded_l10nfile *_nl_find_domain PARAMS ((const char *__dirname,
                                                  char *__locale,
-                                                 const char *__domainname));
-void _nl_load_domain PARAMS ((struct loaded_l10nfile *__domain));
+                                                 const char *__domainname))
+     internal_function;
+void _nl_load_domain PARAMS ((struct loaded_l10nfile *__domain))
+     internal_function;
+void _nl_unload_domain PARAMS ((struct loaded_domain *__domain))
+     internal_function;
 
 /* @@ begin of epilog @@ */

branches/GNU/src/binutils/intl/hash-string.h

@@ -16 +16 @@
    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
-
-#ifdef HAVE_VALUES_H
-# include <values.h>
-#endif
 
 /* @@ end of prolog @@ */

branches/GNU/src/binutils/intl/intlh.inst.in

@@ -27 +27 @@
 
 #ifndef PARAMS
-# if __STDC__
+# if __STDC__ || defined __cplusplus
 #  define PARAMS(args) args
 # else

branches/GNU/src/binutils/intl/l10nflist.c

@@ -1 +1 @@
 /* Handle list of needed message catalogs
    Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
-   Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
+   Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
 
    This program is free software; you can redistribute it and/or modify
@@ -66 +66 @@
    because some ANSI C functions will require linking with this object
    file and the name space must not be polluted.  */
-# define stpcpy(dest, src) __stpcpy(dest, src)
+# ifndef stpcpy
+#  define stpcpy(dest, src) __stpcpy(dest, src)
+# endif
 #else
 # ifndef HAVE_STPCPY
@@ -353 +355 @@
 const char *
 _nl_normalize_codeset (codeset, name_len)
-     const char *codeset;
+     const unsigned char *codeset;
      size_t name_len;
 {

branches/GNU/src/binutils/intl/libgettext.h

@@ -1 +1 @@
 /* Message catalogs for internationalization.
-   Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
@@ -21 +21 @@
    define _LIBINTL_H and therefore we have to protect the definition here.  */
 
-#if !defined (_LIBINTL_H) || !defined (_LIBGETTEXT_H)
-#if !defined (_LIBINTL_H)
+#if !defined _LIBINTL_H || !defined _LIBGETTEXT_H
+#ifndef _LIBINTL_H
 # define _LIBINTL_H     1
 #endif
@@ -45 +45 @@
 
 #ifndef PARAMS
-# if __STDC__
+# if __STDC__ || defined __cplusplus
 #  define PARAMS(args) args
 # else
@@ -169 +169 @@
 # define dgettext(Domainname, Msgid) (Msgid)
 # define dcgettext(Domainname, Msgid, Category) (Msgid)
-# define textdomain(Domainname) while (0) /* nothing */
-# define bindtextdomain(Domainname, Dirname) while (0) /* nothing */
+# define textdomain(Domainname) ((char *) Domainname)
+# define bindtextdomain(Domainname, Dirname) ((char *) Dirname)
 
 #endif

branches/GNU/src/binutils/intl/libintl.glibc

@@ -1 @@
-/* libgettext.h -- Message catalogs for internationalization.
-Copyright (C) 1995 Free Software Foundation, Inc.
-This file is part of the GNU C Library.
-Contributed by Ulrich Drepper.
-This file is derived from the file libgettext.h in the GNU gettext package.
+/* Message catalogs for internationalization.
+   Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+   Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
+   This file is derived from the file libgettext.h in the GNU gettext package.
 
-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.
+   This file is part of the GNU C Library.  Its master source is NOT part of
+   the C library, however.
 
-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.
+   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.
 
-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.  */
+   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.
+
+   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.  */
 
 #ifndef _LIBINTL_H
 #define _LIBINTL_H      1
+
 #include <features.h>
-
-#include <locale.h>
-
-#define __need_NULL
-#include <stddef.h>
 
 /* We define an additional symbol to signal that we use the GNU
@@ -71 +69 @@
 
 /* Optimized version of the function above.  */
-#if defined __OPTIMIZED
-/* These must be a macro.  Inlined functions are useless because the
+#if defined __OPTIMIZE__
+
+/* We need NULL for `gettext'.  */
+# define __need_NULL
+# include <stddef.h>
+
+/* We need LC_MESSAGES for `dgettext'.  */
+# include <locale.h>
+
+/* These must be macros.  Inlined functions are useless because the
    `__builtin_constant_p' predicate in dcgettext would always return
    false.  */
@@ -82 +88 @@
 
 # if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7)
+/* Variable defined in loadmsgcat.c which gets incremented every time a
+   new catalog is loaded.  */
+extern int _nl_msg_cat_cntr;
+
 #  define dcgettext(domainname, msgid, category)                              \
   (__extension__                                                              \
    ({                                                                         \
-     char *result;                                                            \
+     char *__result;                                                          \
      if (__builtin_constant_p (msgid))                                        \
        {                                                                      \
-         extern int _nl_msg_cat_cntr;                                         \
          static char *__translation__;                                        \
          static int __catalog_counter__;                                      \
@@ -97 +106 @@
              __catalog_counter__ = _nl_msg_cat_cntr;                          \
            }                                                                  \
-         result = __translation__;                                            \
+         __result = __translation__;                                          \
        }                                                                      \
      else                                                                     \
-       result = __dcgettext ((domainname), (msgid), (category));              \
-     result;                                                                  \
+       __result = __dcgettext ((domainname), (msgid), (category));            \
+     __result;                                                                \
     }))
 # endif

branches/GNU/src/binutils/intl/linux-msg.sed

@@ -1 +1 @@
 # po2msg.sed - Convert Uniforum style .po file to Linux style .msg file
-# Copyright (C) 1995 Free Software Foundation, Inc.
+# Copyright 1995, 2002 Free Software Foundation, Inc.
 # Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
 #
@@ -69 +69 @@
 }
 #
-# The .msg file contains, other then the .po file, only the translations
+# The .msg file contains, other than the .po file, only the translations
 # but each given a unique ID.  Starting from 1 and incrementing by 1 for
 # each message we assign them to the messages.

branches/GNU/src/binutils/intl/loadinfo.h

@@ +1 @@
+/* Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program 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 General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
 #ifndef PARAMS
 # if __STDC__
@@ -33 +51 @@
 
 
-extern const char *_nl_normalize_codeset PARAMS ((const char *codeset,
+extern const char *_nl_normalize_codeset PARAMS ((const unsigned char *codeset,
                                                   size_t name_len));
 

branches/GNU/src/binutils/intl/loadmsgcat.c

@@ -1 @@
-/* Load needed message catalogs
-   Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Load needed message catalogs.
+   Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
@@ -45 +45 @@
    because some ISO C functions will require linking with this object
    file and the name space must not be polluted.  */
-# define fstat  __fstat
 # define open   __open
 # define close  __close
@@ -62 +61 @@
    message catalog do nothing.  */
 void
+internal_function
 _nl_load_domain (domain_file)
      struct loaded_l10nfile *domain_file;
 {
   int fd;
+  size_t size;
   struct stat st;
   struct mo_file_header *data = (struct mo_file_header *) -1;
@@ -91 +92 @@
   /* We must know about the size of the file.  */
   if (fstat (fd, &st) != 0
-      && st.st_size < (off_t) sizeof (struct mo_file_header))
+      || (size = (size_t) st.st_size) != st.st_size
+      || size < sizeof (struct mo_file_header))
     {
       /* Something went wrong.  */
@@ -102 +104 @@
   /* Now we are ready to load the file.  If mmap() is available we try
      this first.  If not available or it failed we try to load it.  */
-  data = (struct mo_file_header *) mmap (NULL, st.st_size, PROT_READ,
+  data = (struct mo_file_header *) mmap (NULL, size, PROT_READ,
                                          MAP_PRIVATE, fd, 0);
 
@@ -117 +119 @@
   if (data == (struct mo_file_header *) -1)
     {
-      off_t to_read;
+      size_t to_read;
       char *read_ptr;
 
-      data = (struct mo_file_header *) malloc (st.st_size);
+      data = (struct mo_file_header *) malloc (size);
       if (data == NULL)
         return;
 
-      to_read = st.st_size;
+      to_read = size;
       read_ptr = (char *) data;
       do
@@ -151 +153 @@
     || defined _LIBC
       if (use_mmap)
-        munmap ((caddr_t) data, st.st_size);
+        munmap ((caddr_t) data, size);
       else
 #endif
@@ -165 +167 @@
   domain = (struct loaded_domain *) domain_file->data;
   domain->data = (char *) data;
+#if (defined HAVE_MMAP && defined HAVE_MUNMAP && !defined DISALLOW_MMAP) \
+    || defined _LIBC
+  domain->use_mmap = use_mmap;
+#endif
+  domain->mmap_size = size;
   domain->must_swap = data->magic != _MAGIC;
 
@@ -185 +192 @@
     || defined _LIBC
       if (use_mmap)
-        munmap ((caddr_t) data, st.st_size);
+        munmap ((caddr_t) data, size);
       else
 #endif
@@ -198 +205 @@
   ++_nl_msg_cat_cntr;
 }
+
+
+#ifdef _LIBC
+void
+internal_function
+_nl_unload_domain (domain)
+     struct loaded_domain *domain;
+{
+  if (domain->use_mmap)
+    munmap ((caddr_t) domain->data, domain->mmap_size);
+  else
+    free ((void *) domain->data);
+
+  free (domain);
+}
+#endif

branches/GNU/src/binutils/intl/localealias.c

@@ -1 @@
-/* Handle aliases for locale names
-   Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Handle aliases for locale names.
+   Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
    Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
 
@@ -80 +80 @@
    file and the name space must not be polluted.  */
 # define strcasecmp __strcasecmp
+
+# define mempcpy __mempcpy
+# define HAVE_MEMPCPY   1
+
+/* We need locking here since we can be called from different places.  */
+# include <bits/libc-lock.h>
+
+__libc_lock_define_initialized (static, lock);
 #endif
 
@@ -126 +134 @@
 
 
+static char *string_space = NULL;
+static size_t string_space_act = 0;
+static size_t string_space_max = 0;
 static struct alias_map *map;
 static size_t nmap = 0;
@@ -132 +143 @@
 
 /* Prototypes for local functions.  */
-static size_t read_alias_file PARAMS ((const char *fname, int fname_len));
+static size_t read_alias_file PARAMS ((const char *fname, int fname_len))
+     internal_function;
 static void extend_alias_table PARAMS ((void));
 static int alias_compare PARAMS ((const struct alias_map *map1,
@@ -144 +156 @@
   static const char *locale_alias_path = LOCALE_ALIAS_PATH;
   struct alias_map *retval;
+  const char *result = NULL;
   size_t added;
+
+#ifdef _LIBC
+  __libc_lock_lock (lock);
+#endif
 
   do
@@ -163 +180 @@
       /* We really found an alias.  Return the value.  */
       if (retval != NULL)
-        return retval->value;
+        {
+          result = retval->value;
+          break;
+        }
 
       /* Perhaps we can find another alias file.  */
@@ -184 +204 @@
   while (added != 0);
 
-  return NULL;
+#ifdef _LIBC
+  __libc_lock_unlock (lock);
+#endif
+
+  return result;
 }
 
 
 static size_t
+internal_function
 read_alias_file (fname, fname_len)
      const char *fname;
@@ -203 +228 @@
   full_fname = (char *) alloca (fname_len + sizeof aliasfile);
   ADD_BLOCK (block_list, full_fname);
+#ifdef HAVE_MEMPCPY
+  mempcpy (mempcpy (full_fname, fname, fname_len),
+           aliasfile, sizeof aliasfile);
+#else
   memcpy (full_fname, fname, fname_len);
   memcpy (&full_fname[fname_len], aliasfile, sizeof aliasfile);
+#endif
 
   fp = fopen (full_fname, "r");
@@ -221 +251 @@
             be that long
        */
-      char buf[BUFSIZ];
-      char *alias;
-      char *value;
-      char *cp;
-
-      if (fgets (buf, BUFSIZ, fp) == NULL)
+      unsigned char buf[BUFSIZ];
+      unsigned char *alias;
+      unsigned char *value;
+      unsigned char *cp;
+
+      if (fgets (buf, sizeof buf, fp) == NULL)
         /* EOF reached.  */
         break;
+
+      /* Possibly not the whole line fits into the buffer.  Ignore
+         the rest of the line.  */
+      if (strchr (buf, '\n') == NULL)
+        {
+          char altbuf[BUFSIZ];
+          do
+            if (fgets (altbuf, sizeof altbuf, fp) == NULL)
+              /* Make sure the inner loop will be left.  The outer loop
+                 will exit at the `feof' test.  */
+              break;
+          while (strchr (altbuf, '\n') == NULL);
+        }
 
       cp = buf;
@@ -251 +294 @@
           if (cp[0] != '\0')
             {
-              char *tp;
-              size_t len;
+              size_t alias_len;
+              size_t value_len;
 
               value = cp++;
@@ -272 +315 @@
                 extend_alias_table ();
 
-              /* We cannot depend on strdup available in the libc.  Sigh!  */
-              len = strlen (alias) + 1;
-              tp = (char *) malloc (len);
-              if (tp == NULL)
+              alias_len = strlen (alias) + 1;
+              value_len = strlen (value) + 1;
+
+              if (string_space_act + alias_len + value_len > string_space_max)
                 {
-                  FREE_BLOCKS (block_list);
-                  return added;
+                  /* Increase size of memory pool.  */
+                  size_t new_size = (string_space_max
+                                     + (alias_len + value_len > 1024
+                                        ? alias_len + value_len : 1024));
+                  char *new_pool = (char *) realloc (string_space, new_size);
+                  if (new_pool == NULL)
+                    {
+                      FREE_BLOCKS (block_list);
+                      return added;
+                    }
+                  string_space = new_pool;
+                  string_space_max = new_size;
                 }
-              memcpy (tp, alias, len);
-              map[nmap].alias = tp;
-
-              len = strlen (value) + 1;
-              tp = (char *) malloc (len);
-              if (tp == NULL)
-                {
-                  FREE_BLOCKS (block_list);
-                  return added;
-                }
-              memcpy (tp, value, len);
-              map[nmap].value = tp;
+
+              map[nmap].alias = memcpy (&string_space[string_space_act],
+                                        alias, alias_len);
+              string_space_act += alias_len;
+
+              map[nmap].value = memcpy (&string_space[string_space_act],
+                                        value, value_len);
+              string_space_act += value_len;
 
               ++nmap;
@@ -297 +346 @@
             }
         }
-
-      /* Possibly not the whole line fits into the buffer.  Ignore
-         the rest of the line.  */
-      while (strchr (cp, '\n') == NULL)
-        {
-          cp = buf;
-          if (fgets (buf, BUFSIZ, fp) == NULL)
-            /* Make sure the inner loop will be left.  The outer loop
-               will exit at the `feof' test.  */
-            *cp = '\n';
-        }
     }
 
@@ -330 +368 @@
 
   new_size = maxmap == 0 ? 100 : 2 * maxmap;
-  new_map = (struct alias_map *) malloc (new_size
-                                         * sizeof (struct alias_map));
+  new_map = (struct alias_map *) realloc (map, (new_size
+                                                * sizeof (struct alias_map)));
   if (new_map == NULL)
     /* Simply don't extend: we don't have any more core.  */
     return;
 
-  memcpy (new_map, map, nmap * sizeof (struct alias_map));
-
-  if (maxmap != 0)
-    free (map);
-
   map = new_map;
   maxmap = new_size;
 }
+
+
+#ifdef _LIBC
+static void __attribute__ ((unused))
+free_mem (void)
+{
+  if (string_space != NULL)
+    free (string_space);
+  if (map != NULL)
+    free (map);
+}
+text_set_element (__libc_subfreeres, free_mem);
+#endif
 
 

branches/GNU/src/binutils/intl/textdomain.c

@@ -1 @@
-/* Implementation of the textdomain(3) function
-   Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Implementation of the textdomain(3) function.
+   Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
    Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
 
@@ -55 +55 @@
 #ifdef _LIBC
 # define TEXTDOMAIN __textdomain
-# define strdup(str) __strdup (str)
+# ifndef strdup
+#  define strdup(str) __strdup (str)
+# endif
 #else
 # define TEXTDOMAIN textdomain__

branches/GNU/src/binutils/intl/xopen-msg.sed

@@ -1 +1 @@
 # po2msg.sed - Convert Uniforum style .po file to X/Open style .msg file
-# Copyright (C) 1995 Free Software Foundation, Inc.
+# Copyright 1995, 2002 Free Software Foundation, Inc.
 # Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
 #
@@ -45 +45 @@
 }
 #
-# The .msg file contains, other then the .po file, only the translations
+# The .msg file contains, other than the .po file, only the translations
 # but each given a unique ID.  Starting from 1 and incrementing by 1 for
 # each message we assign them to the messages.