glibc/locale/programs/charmap.h
Ulrich Drepper cb2eab1f8a Update.
* locale/programs/charmap.c (charmap_read): If encoding is found
	not ASCII compatible, set enc_not_ascii_compatible.
	* locale/programs/charmap.h: Declare enc_not_ascii_compatible.
	* locale/programs/ld-ctype.c (ctype_startup): If
	enc_not_ascii_compatible is set, initialize to_nonascii to 1.

2003-11-22  Jakub Jelinek  <jakub@redhat.com>

	* elf/rtld.c (process_envvars): Only honor LD_USE_LOAD_BIAS
	if !__libc_enable_secure.

	* sysdeps/generic/ldsodefs.h (_dl_use_load_bias): New _rtld_global
	field.
	* elf/rtld.c (_rtld_global): Initialize _dl_use_load_bias field.
	(dl_main): Set GL(dl_use_load_bias) default.
	(process_envvars): Set GL(dl_use_load_bias) from LD_USE_LOAD_BIAS.
	Add EXTRA_LD_ENVVARS_13.
	* elf/dl-support.c (_dl_use_load_bias): New variable.
	* elf/dl-load.c (_dl_map_object_from_fd): Mask c->mapstart
	with GL(dl_use_load_bias).
	* sysdeps/generic/unsecvars.h (UNSECURE_ENVVARS): Add
	LD_USE_LOAD_BIAS.
	* sysdeps/unix/sysv/linux/dl-librecon.h (EXTRA_LD_ENVVARS): Remove.
	(EXTRA_LD_ENVVARS_LINUX): Renamed to...
	(EXTRA_LD_ENVVARS_13): ... this.  Remove case at the beginning.
	* sysdeps/unix/sysv/linux/i386/dl-librecon.h (EXTRA_LD_ENVVARS):
	Don't undefine first.  Remove EXTRA_LD_ENVVARS_LINUX.

2003-11-21  Ulrich Drepper  <drepper@redhat.com>
2003-11-22 07:29:27 +00:00

85 lines
2.3 KiB
C

/* Copyright (C) 1996-1999, 2001, 2003 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@gnu.org>, 1996.
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. */
#ifndef _CHARMAP_H
#define _CHARMAP_H
#include <obstack.h>
#include <stdbool.h>
#include "repertoire.h"
#include "simple-hash.h"
struct width_rule
{
struct charseq *from;
struct charseq *to;
unsigned int width;
};
struct charmap_t
{
const char *code_set_name;
const char *repertoiremap;
int mb_cur_min;
int mb_cur_max;
struct width_rule *width_rules;
size_t nwidth_rules;
size_t nwidth_rules_max;
unsigned int width_default;
struct obstack mem_pool;
hash_table char_table;
hash_table byte_table;
hash_table ucs4_table;
};
/* This is the structure used for entries in the hash table. It represents
the sequence of bytes used for the coded character. */
struct charseq
{
const char *name;
uint32_t ucs4;
int nbytes;
unsigned char bytes[0];
};
/* True if the encoding is not ASCII compatible. */
extern bool enc_not_ascii_compatible;
/* Prototypes for charmap handling functions. */
extern struct charmap_t *charmap_read (const char *filename, int verbose,
int be_quiet, int use_default);
/* Return the value stored under the given key in the hashing table. */
extern struct charseq *charmap_find_value (const struct charmap_t *charmap,
const char *name, size_t len);
/* Return symbol for given multibyte sequence. */
extern struct charseq *charmap_find_symbol (const struct charmap_t *charmap,
const char *name, size_t len);
#endif /* charmap.h */