mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-21 18:30:05 +00:00
5a97622d5e
1997-02-22 00:17 Ulrich Drepper <drepper@cygnus.com> * catgets/gencat.c: Change to use argp. * db/makedb: Likewise. * locale/programs/localedef.c: Likewise. * locale/programs/locale.c: Little adjustment for better usage of argp. 1997-02-20 20:07 Greg McGary <gkm@eng.ascend.com> * Makeconfig: Add rules for libc with bounded pointers. * Makerules: Likewise. * config.make.in: Likewise. * configure.in: Likewise. 1997-02-21 10:41 Miles Bader <miles@gnu.ai.mit.edu> * argp.h (OPTION_NO_USAGE): New macro. * argp-help.c (usage_long_opt, usage_argful_short_opt, add_argless_short_opt): Implement OPTION_NO_USAGE. 1997-02-20 16:41 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * malloc/obstack.h: Fix typo. 1997-02-20 15:56 Miles Bader <miles@gnu.ai.mit.edu> * argp-fmtstream.c (__argp_fmtstream_update): Account for case where NEXTLINE points one past the end of the active buffer. * argp-help.c <stddef.h>: New include. (__argp_failure): Only exit if STATE says it's ok. (print_header, hol_entry_help): Use UPARAMS fields rather than constants. (_help): Call fill_in_uparams if necessary. (struct hol_help_state): New type. (struct pentry_state): Add hhstate field. Remove prev_entry & sep_groups fields. (hol_entry_help): Add HHSTATE parameter. Remove prev_entry & sep_groups parameters. Suppress duplicate arguments if requested, and note the fact. (print_header, comma): Use PEST->hhstate fields. (hol_help): Add HHSTATE variable & pass to hol_entry_help. Remove LAST_ENTRY & SEP_GROUPS variables. If any suplicate arguments were suppressed, print explanatory note. (filter_doc): Replace PEST parameter with STATE. (struct uparams): New type. (uparams): New variable. (struct uparam_name): New type. (uparam_names): New variable. (fill_in_uparams): New function. (__argp_failure, __argp_error, __argp_state_help): Make STATE parameter const. * argp.h (argp_state_help, __argp_state_help, argp_usage, __argp_usage, argp_error, __argp_error, argp_failure, __argp_failure): Make STATE parameter const. (ARGP_KEY_HELP_DUP_ARGS_NOTE): New macro. * argp.h (argp_program_bug_address): Make const. 1997-02-20 19:20 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/mman/syscalls.list: Explain msync interface. 1997-02-19 01:37 Erik Troan <ewt@redhat.com> * shadow/sgetspent_r.c: Accept empty third, fourth and fifth fields. 1997-02-20 14:44 Andreas Jaeger <aj@arthur.pfalz.de> * stdio-common/test-fseek.c: Remove temporary file, add copyright. 1997-02-20 17:51 Ulrich Drepper <drepper@cygnus.com> * sysdeps/generic/netinet/in.h: Protect contents using __BEGIN/END_DECLS. Reported by a sun <asun@zoology.washington.edu>. * inet/net/ethernet.h: Move to sysdeps/unix/sysv/linux/net. * inet/Makefile (headers): Remove net/ethernet.h. * sysdeps/unix/sysv/linux/Makefile: Install net/ethernet.h. * sysdeps/unix/sysv/linux/Dist: Distribute net/ethernet.h. 1997-02-20 15:23 Thorsten Kukuk <kukuk@weber.uni-paderborn.de> * nss/nsswitch.c (__nss_configure_lookup): Use correct test when searching in sorted array. 1997-02-20 01:24 Philip Blundell <pjb27@cam.ac.uk> * inet/getnameinfo.c: Change to use reentrant getXXbyYY functions and protect modification of global data. 1997-02-19 18:48 Miles Bader <miles@gnu.ai.mit.edu> * argp-parse.c (argp_default_parser): Set STATE->name for OPT_PROGNAME. (parser_init): Use the basename for PARSER->state.name. * argp-help.c (__argp_error, __argp_failure, __argp_state_help): Use PROGRAM_INVOCATION_SHORT_NAME instead of PROGRAM_INVOCATION_NAME. * argp-parse.c (parser_init): Set PARSER->state.flags. Make check whether PARSER has the prog name in argv[0] at the proper place. 1997-02-19 23:34 Ulrich Drepper <drepper@cygnus.com> * locale/programs/ld-time.c (time_finish): t_fmt_ampm is optional. Use default value instead of printing a warning. * nss/XXX-lookup.c: Add misssing explanation. 1997-02-19 19:14 Andreas Jaeger <aj@arthur.pfalz.de> * inet/in6_addr.c: Add missing braces. * inet/getnameinfo.c: Include <arpa/inet.h>. * sysdeps/posix/getaddrinfo.c: Include <arpa/inet.h>. 1997-02-19 11:46 Ulrich Drepper <drepper@cygnus.com> * string/strxfrm.c (STRCOLL): Correct handling of `position' levels with no non-IGNOREd element and handling of NUL byte. * string/strcoll.c (STRXFRM): Likewise. * locale/weight.h: Likewise. * shadow/sgetspent_r.c (LINE_PARSER): Add missing ')'.
204 lines
6.3 KiB
C
204 lines
6.3 KiB
C
/* Copyright (C) 1996, 1997 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Written by Ulrich Drepper, <drepper@gnu.ai.mit.edu>.
|
|
|
|
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. */
|
|
|
|
#include <alloca.h>
|
|
#include <langinfo.h>
|
|
#include "localeinfo.h"
|
|
|
|
#ifndef STRING_TYPE
|
|
# error STRING_TYPE not defined
|
|
#endif
|
|
|
|
#ifndef USTRING_TYPE
|
|
# error USTRING_TYPE not defined
|
|
#endif
|
|
|
|
typedef struct weight_t
|
|
{
|
|
struct weight_t *prev;
|
|
struct weight_t *next;
|
|
struct data_pair
|
|
{
|
|
int number;
|
|
const u_int32_t *value;
|
|
} data[0];
|
|
} weight_t;
|
|
|
|
|
|
/* The following five macros grant access to the values in the
|
|
collate locale file that do not depend on byte order. */
|
|
#ifndef USE_IN_EXTENDED_LOCALE_MODEL
|
|
# define collate_nrules \
|
|
(_NL_CURRENT_WORD (LC_COLLATE, _NL_COLLATE_NRULES))
|
|
# define collate_hash_size \
|
|
(_NL_CURRENT_WORD (LC_COLLATE, _NL_COLLATE_HASH_SIZE))
|
|
# define collate_hash_layers \
|
|
(_NL_CURRENT_WORD (LC_COLLATE, _NL_COLLATE_HASH_LAYERS))
|
|
# define collate_undefined \
|
|
(_NL_CURRENT_WORD (LC_COLLATE, _NL_COLLATE_UNDEFINED))
|
|
# define collate_rules \
|
|
((u_int32_t *) _NL_CURRENT (LC_COLLATE, _NL_COLLATE_RULES))
|
|
|
|
static __inline void get_weight (const STRING_TYPE **str, weight_t *result);
|
|
static __inline void
|
|
get_weight (const STRING_TYPE **str, weight_t *result)
|
|
#else
|
|
# define collate_nrules \
|
|
current->values[_NL_ITEM_INDEX (_NL_COLLATE_NRULES)].word
|
|
# define collate_hash_size \
|
|
current->values[_NL_ITEM_INDEX (_NL_COLLATE_HASH_SIZE)].word
|
|
# define collate_hash_layers \
|
|
current->values[_NL_ITEM_INDEX (_NL_COLLATE_HASH_LAYERS)].word
|
|
# define collate_undefined \
|
|
current->values[_NL_ITEM_INDEX (_NL_COLLATE_UNDEFINED)].word
|
|
# define collate_rules \
|
|
((u_int32_t *) current->values[_NL_ITEM_INDEX (_NL_COLLATE_RULES)].string)
|
|
|
|
static __inline void get_weight (const STRING_TYPE **str, weight_t *result,
|
|
struct locale_data *current,
|
|
const u_int32_t *__collate_table,
|
|
const u_int32_t *__collate_extra);
|
|
static __inline void
|
|
get_weight (const STRING_TYPE **str, weight_t *result,
|
|
struct locale_data *current, const u_int32_t *__collate_table,
|
|
const u_int32_t *__collate_extra)
|
|
#endif
|
|
{
|
|
unsigned int ch = *((USTRING_TYPE *) (*str))++;
|
|
size_t slot;
|
|
|
|
if (sizeof (STRING_TYPE) == 1)
|
|
slot = ch * (collate_nrules + 1);
|
|
else
|
|
{
|
|
const size_t level_size = collate_hash_size * (collate_nrules + 1);
|
|
size_t level;
|
|
|
|
slot = (ch % collate_hash_size) * (collate_nrules + 1);
|
|
|
|
level = 0;
|
|
while (__collate_table[slot] != (u_int32_t) ch)
|
|
{
|
|
if (__collate_table[slot + 1] == 0
|
|
|| ++level >= collate_hash_layers)
|
|
{
|
|
size_t idx = collate_undefined;
|
|
size_t cnt;
|
|
|
|
for (cnt = 0; cnt < collate_nrules; ++cnt)
|
|
{
|
|
result->data[cnt].number = __collate_extra[idx++];
|
|
result->data[cnt].value = &__collate_extra[idx];
|
|
idx += result->data[cnt].number;
|
|
}
|
|
return;
|
|
}
|
|
slot += level_size;
|
|
}
|
|
}
|
|
|
|
if (__collate_table[slot + 1] != (u_int32_t) FORWARD_CHAR)
|
|
{
|
|
/* We have a simple form. One one value for each weight. */
|
|
size_t cnt;
|
|
|
|
for (cnt = 0; cnt < collate_nrules; ++cnt)
|
|
{
|
|
result->data[cnt].number = 1;
|
|
result->data[cnt].value = &__collate_table[slot + 1 + cnt];
|
|
}
|
|
return;
|
|
}
|
|
|
|
/* We now look for any collation element which starts with CH.
|
|
There might none, but the last list member is a catch-all case
|
|
because it is simple the character CH. The value of this entry
|
|
might be the same as UNDEFINED. */
|
|
slot = __collate_table[slot + 2];
|
|
|
|
while (1)
|
|
{
|
|
size_t idx;
|
|
|
|
/* This is a comparison between a u_int32_t array (aka wchar_t) and
|
|
an 8-bit string. */
|
|
for (idx = 0; __collate_extra[slot + 2 + idx] != 0; ++idx)
|
|
if (__collate_extra[slot + 2 + idx] != (u_int32_t) (*str)[idx])
|
|
break;
|
|
|
|
/* When the loop finished with all character of the collation
|
|
element used, we found the longest prefix. */
|
|
if (__collate_extra[slot + 2 + idx] == 0)
|
|
{
|
|
size_t cnt;
|
|
|
|
*str += idx;
|
|
idx += slot + 3;
|
|
for (cnt = 0; cnt < collate_nrules; ++cnt)
|
|
{
|
|
result->data[cnt].number = __collate_extra[idx++];
|
|
result->data[cnt].value = &__collate_extra[idx];
|
|
idx += result->data[cnt].number;
|
|
}
|
|
return;
|
|
}
|
|
|
|
/* To next entry in list. */
|
|
slot += __collate_extra[slot];
|
|
}
|
|
}
|
|
|
|
|
|
/* To process a string efficiently we retrieve all information about
|
|
the string at once. The following macro constructs a double linked
|
|
list of this information. It is a macro because we use `alloca'
|
|
and we use a double linked list because of the backward collation
|
|
order.
|
|
|
|
We have this strange extra macro since the functions which use the
|
|
given locale (not the global one) cannot use the global tables. */
|
|
#ifndef USE_IN_EXTENDED_LOCALE_MODEL
|
|
# define call_get_weight(strp, newp) get_weight ((strp), (newp))
|
|
#else
|
|
# define call_get_weight(strp, newp) \
|
|
get_weight ((strp), (newp), current, collate_table, collate_extra)
|
|
#endif
|
|
|
|
#define get_string(str, forw, backw) \
|
|
do \
|
|
{ \
|
|
weight_t *newp; \
|
|
while (*str != '\0') \
|
|
{ \
|
|
newp = (weight_t *) alloca (sizeof (weight_t) \
|
|
+ (collate_nrules \
|
|
* sizeof (struct data_pair))); \
|
|
\
|
|
newp->prev = backw; \
|
|
if (backw == NULL) \
|
|
forw = newp; \
|
|
else \
|
|
backw->next = newp; \
|
|
newp->next = NULL; \
|
|
backw = newp; \
|
|
call_get_weight (&str, newp); \
|
|
} \
|
|
} \
|
|
while (0)
|