mirror of
				https://sourceware.org/git/glibc.git
				synced 2025-11-03 20:53:13 +03:00 
			
		
		
		
	1998-05-19 15:58 Ulrich Drepper <drepper@cygnus.com> * elf/rtld.c (process_envvars): Fix typo. Don't handle LD_PROFILE_OUTPUT in SUID binaries. * intl/dcgettext.c: In SUID binaries don't let language part of locale value contain path elements. * intl/explodename.h: Define new function _nl_find_language. * intl/loadinfo.h: Declare _nl_find_language. * locale/findlocale.c (_nl_find_locale): Use _nl_find_locale to get language part it drop the value is path element is contained. * locale/setlocale.c: Fix typo. 1998-05-18 Philip Blundell <Philip.Blundell@pobox.com> * sysdeps/unix/sysv/linux/arm/socket.S: Correct handling of arguments. * sysdeps/arm/strlen.S: Support both big and little endian processors. * sysdeps/arm/sysdep.h (ALIGNARG): ELF .align directive uses a log, not a byte-count. * sysdeps/unix/arm/sysdep.S (syscall_error): Use C_SYMBOL_NAME for a.out compatibility. 1998-05-19 Andreas Jaeger <aj@arthur.rhein-neckar.de> * sysdeps/unix/bsd/vax/vfork.S: Fix the "the the" problems. * sysdeps/unix/bsd/sun/m68k/vfork.S: Likewise. * sysdeps/unix/bsd/hp/m68k/vfork.S: Likewise. * posix/unistd.h: Likewise. * math/math.h: Likewise. * manual/users.texi (Manipulating the Database): Likewise. * manual/signal.texi (Job Control Signals): Likewise. * manual/message.texi (The gencat program): Likewise. * manual/filesys.texi (Hard Links): Likewise. * manual/math.texi (SVID Random): Likewise. * manual/llio.texi (Waiting for I/O): Likewise. * manual/io.texi (File Name Errors): Likewise. * manual/conf.texi (String Parameters): Likewise. * manual/arith.texi (Infinity): Likewise. * malloc/malloc.c: Likewise. * hurd/hurdsig.c (_hurd_internal_post_signal): Likewise. * csu/Makefile: Likewise.
		
			
				
	
	
		
			202 lines
		
	
	
		
			4.8 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			202 lines
		
	
	
		
			4.8 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
/* Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
 | 
						|
   Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
 | 
						|
 | 
						|
   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 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.
 | 
						|
 | 
						|
   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.  */
 | 
						|
 | 
						|
#ifdef HAVE_CONFIG_H
 | 
						|
# include <config.h>
 | 
						|
#endif
 | 
						|
 | 
						|
#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>
 | 
						|
 | 
						|
#include "loadinfo.h"
 | 
						|
 | 
						|
/* On some strange systems still no definition of NULL is found.  Sigh!  */
 | 
						|
#ifndef NULL
 | 
						|
# if defined __STDC__ && __STDC__
 | 
						|
#  define NULL ((void *) 0)
 | 
						|
# else
 | 
						|
#  define NULL 0
 | 
						|
# endif
 | 
						|
#endif
 | 
						|
 | 
						|
/* @@ end of prolog @@ */
 | 
						|
 | 
						|
char *
 | 
						|
_nl_find_language (const char *name)
 | 
						|
{
 | 
						|
  while (name[0] != '\0' && name[0] != '_' && name[0] != '@'
 | 
						|
	 && name[0] != '+' && name[0] != ',')
 | 
						|
    ++name;
 | 
						|
 | 
						|
  return (char *) name;
 | 
						|
}
 | 
						|
 | 
						|
 | 
						|
int
 | 
						|
_nl_explode_name (name, language, modifier, territory, codeset,
 | 
						|
		  normalized_codeset, special, sponsor, revision)
 | 
						|
     char *name;
 | 
						|
     const char **language;
 | 
						|
     const char **modifier;
 | 
						|
     const char **territory;
 | 
						|
     const char **codeset;
 | 
						|
     const char **normalized_codeset;
 | 
						|
     const char **special;
 | 
						|
     const char **sponsor;
 | 
						|
     const char **revision;
 | 
						|
{
 | 
						|
  enum { undecided, xpg, cen } syntax;
 | 
						|
  char *cp;
 | 
						|
  int mask;
 | 
						|
 | 
						|
  *modifier = NULL;
 | 
						|
  *territory = NULL;
 | 
						|
  *codeset = NULL;
 | 
						|
  *normalized_codeset = NULL;
 | 
						|
  *special = NULL;
 | 
						|
  *sponsor = NULL;
 | 
						|
  *revision = NULL;
 | 
						|
 | 
						|
  /* Now we determine the single parts of the locale name.  First
 | 
						|
     look for the language.  Termination symbols are `_' and `@' if
 | 
						|
     we use XPG4 style, and `_', `+', and `,' if we use CEN syntax.  */
 | 
						|
  mask = 0;
 | 
						|
  syntax = undecided;
 | 
						|
  *language = cp = name;
 | 
						|
  cp = _nl_find_language (*language);
 | 
						|
 | 
						|
  if (*language == cp)
 | 
						|
    /* This does not make sense: language has to be specified.  Use
 | 
						|
       this entry as it is without exploding.  Perhaps it is an alias.  */
 | 
						|
    cp = strchr (*language, '\0');
 | 
						|
  else if (cp[0] == '_')
 | 
						|
    {
 | 
						|
      /* Next is the territory.  */
 | 
						|
      cp[0] = '\0';
 | 
						|
      *territory = ++cp;
 | 
						|
 | 
						|
      while (cp[0] != '\0' && cp[0] != '.' && cp[0] != '@'
 | 
						|
	     && cp[0] != '+' && cp[0] != ',' && cp[0] != '_')
 | 
						|
	++cp;
 | 
						|
 | 
						|
      mask |= TERRITORY;
 | 
						|
 | 
						|
      if (cp[0] == '.')
 | 
						|
	{
 | 
						|
	  /* Next is the codeset.  */
 | 
						|
	  syntax = xpg;
 | 
						|
	  cp[0] = '\0';
 | 
						|
	  *codeset = ++cp;
 | 
						|
 | 
						|
	  while (cp[0] != '\0' && cp[0] != '@')
 | 
						|
	    ++cp;
 | 
						|
 | 
						|
	  mask |= XPG_CODESET;
 | 
						|
 | 
						|
	  if (*codeset != cp && (*codeset)[0] != '\0')
 | 
						|
	    {
 | 
						|
	      *normalized_codeset = _nl_normalize_codeset (*codeset,
 | 
						|
							   cp - *codeset);
 | 
						|
	      if (strcmp (*codeset, *normalized_codeset) == 0)
 | 
						|
		free ((char *) *normalized_codeset);
 | 
						|
	      else
 | 
						|
		mask |= XPG_NORM_CODESET;
 | 
						|
	    }
 | 
						|
	}
 | 
						|
    }
 | 
						|
 | 
						|
  if (cp[0] == '@' || (syntax != xpg && cp[0] == '+'))
 | 
						|
    {
 | 
						|
      /* Next is the modifier.  */
 | 
						|
      syntax = cp[0] == '@' ? xpg : cen;
 | 
						|
      cp[0] = '\0';
 | 
						|
      *modifier = ++cp;
 | 
						|
 | 
						|
      while (syntax == cen && cp[0] != '\0' && cp[0] != '+'
 | 
						|
	     && cp[0] != ',' && cp[0] != '_')
 | 
						|
	++cp;
 | 
						|
 | 
						|
      mask |= XPG_MODIFIER | CEN_AUDIENCE;
 | 
						|
    }
 | 
						|
 | 
						|
  if (syntax != xpg && (cp[0] == '+' || cp[0] == ',' || cp[0] == '_'))
 | 
						|
    {
 | 
						|
      syntax = cen;
 | 
						|
 | 
						|
      if (cp[0] == '+')
 | 
						|
	{
 | 
						|
 	  /* Next is special application (CEN syntax).  */
 | 
						|
	  cp[0] = '\0';
 | 
						|
	  *special = ++cp;
 | 
						|
 | 
						|
	  while (cp[0] != '\0' && cp[0] != ',' && cp[0] != '_')
 | 
						|
	    ++cp;
 | 
						|
 | 
						|
	  mask |= CEN_SPECIAL;
 | 
						|
	}
 | 
						|
 | 
						|
      if (cp[0] == ',')
 | 
						|
	{
 | 
						|
 	  /* Next is sponsor (CEN syntax).  */
 | 
						|
	  cp[0] = '\0';
 | 
						|
	  *sponsor = ++cp;
 | 
						|
 | 
						|
	  while (cp[0] != '\0' && cp[0] != '_')
 | 
						|
	    ++cp;
 | 
						|
 | 
						|
	  mask |= CEN_SPONSOR;
 | 
						|
	}
 | 
						|
 | 
						|
      if (cp[0] == '_')
 | 
						|
	{
 | 
						|
 	  /* Next is revision (CEN syntax).  */
 | 
						|
	  cp[0] = '\0';
 | 
						|
	  *revision = ++cp;
 | 
						|
 | 
						|
	  mask |= CEN_REVISION;
 | 
						|
	}
 | 
						|
    }
 | 
						|
 | 
						|
  /* For CEN syntax values it might be important to have the
 | 
						|
     separator character in the file name, not for XPG syntax.  */
 | 
						|
  if (syntax == xpg)
 | 
						|
    {
 | 
						|
      if (*territory != NULL && (*territory)[0] == '\0')
 | 
						|
	mask &= ~TERRITORY;
 | 
						|
 | 
						|
      if (*codeset != NULL && (*codeset)[0] == '\0')
 | 
						|
	mask &= ~XPG_CODESET;
 | 
						|
 | 
						|
      if (*modifier != NULL && (*modifier)[0] == '\0')
 | 
						|
	mask &= ~XPG_MODIFIER;
 | 
						|
    }
 | 
						|
 | 
						|
  return mask;
 | 
						|
}
 |