``Der Computer hat den Bauernhof erworben'' -- strerror_l implementation for GNU/Hurd

[Thomas Schwinge <tschwinge at gnu dot org>]

Hello!

Since its introduction in glibc 2.6 (IIRC) GNU/Hurd has been lacking a
`strerror_l' implementation.  Here is one, to be put into
`sysdeps/mach/', just as `_strerror.c', akin to which it is modelled, the
framework below being a copy of `string/strerror_l', of course.

My tiny testing program -- single-threaded only, but I don't see what
shouldn't work multi-threaded just as well-- is also attached.

    tschwinge@flubber:~ $ LD_PRELOAD=./libc.so ./ld.so ./a.out 10 1073741928 de_DE.utf8
    1073741928 (0x40000068): Computer bought the farm
    1073741928 (0x40000068): Der Computer hat den Bauernhof erworben
    tschwinge@flubber:~ $ LD_PRELOAD=./libc.so ./ld.so ./a.out 10 1000000000 de_DE.utf8
    1000000000 (0x3b9aca00): Error in unknown error system: 3B9ACA00
    1000000000 (0x3b9aca00): Fehler in unbekanntem Fehler-System: 3B9ACA00
    tschwinge@flubber:~ $ LD_PRELOAD=./libc.so ./ld.so ./a.out 10 100 de_DE.utf8
    100 (0x64): Unknown error (os/kern) 100
    100 (0x64): Unbekannter Fehler (os/kern) 100


ChangeLog snippet:

2008-11-25  Thomas Schwinge  <tschwinge@gnu.org>

	* sysdeps/mach/strerror_l.c: New file.


Regards,
 Thomas

/* Copyright (C) 2007, 2008 Free Software Foundation, Inc.
   This file is part of the GNU C Library.

   The GNU C Library is free software; you can redistribute it and/or
   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
   Lesser General Public License for more details.

   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 <libintl.h>
#include <locale.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <mach/error.h>
#include <errorlib.h>
#include <sys/param.h>


static __thread char *last_value;


static const char *
translate (const char *str, locale_t loc)
{
  locale_t oldloc = __uselocale (loc);
  const char *res = _(str);
  __uselocale (oldloc);
  return res;
}


/* Return a string describing the errno code in ERRNUM.  */
char *
strerror_l (int errnum, locale_t loc)
{
  int system;
  int sub;
  int code;
  const struct error_system *es;
  extern void __mach_error_map_compat (int *);

  __mach_error_map_compat (&errnum);

  system = err_get_system (errnum);
  sub = err_get_sub (errnum);
  code = err_get_code (errnum);

  if (system > err_max_system || ! __mach_error_systems[system].bad_sub)
    {
      free (last_value);
      if (__asprintf (&last_value, "%s%X",
		      translate ("Error in unknown error system: ", loc), errnum) == -1)
	last_value = NULL;

      return last_value;
    }

  es = &__mach_error_systems[system];

  if (sub >= es->max_sub)
    return (char *) translate (es->bad_sub, loc);

  if (code >= es->subsystem[sub].max_code)
    {
      free (last_value);
      if (__asprintf (&last_value, "%s%s %d",
		      translate ("Unknown error ", loc),
		      translate (es->subsystem[sub].subsys_name, loc),
		      errnum) == -1)
	last_value = NULL;

      return last_value;
    }

  return (char *) translate (es->subsystem[sub].codes[code], loc);
}


#ifdef _LIBC
# ifdef _LIBC_REENTRANT
/* This is called when a thread is exiting to free the last_value string.  */
static void __attribute__ ((section ("__libc_thread_freeres_fn")))
strerror_thread_freeres (void)
{
  free (last_value);
}
text_set_element (__libc_thread_subfreeres, strerror_thread_freeres);
text_set_element (__libc_subfreeres, strerror_thread_freeres);
# endif
#endif

#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <locale.h>

/* ./a.out BASE NUMBER LANGUAGE */
int main (int argc, char *argv[])
{
  int e;
  char *e_str;
  locale_t loc;

  setlocale (LC_ALL, "C");

  loc = newlocale (LC_ALL_MASK, argv[3], NULL);

  e = strtoul (argv[2], NULL, strtoul (argv[1], NULL, 10));

  e_str = strerror (e);
  printf ("%d (0x%x): %s\n", e, e, e_str);

  e_str = strerror_l (e, loc);
  printf ("%d (0x%x): %s\n", e, e, e_str);

  return 0;
}

Attachment: signature.asc
Description: Digital signature