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 ')'.
202 lines
5.7 KiB
C
202 lines
5.7 KiB
C
/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
|
|
|
|
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 <endian.h>
|
|
#include <stddef.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
|
|
#ifndef STRING_TYPE
|
|
# define STRING_TYPE char
|
|
# define USTRING_TYPE unsigned char
|
|
# ifdef USE_IN_EXTENDED_LOCALE_MODEL
|
|
# define STRCOLL __strcoll_l
|
|
# else
|
|
# define STRCOLL strcoll
|
|
# endif
|
|
# define STRCMP strcmp
|
|
#endif
|
|
|
|
/* Include the shared helper functions. `strxfrm'/`wcsxfrm' also use
|
|
these functions. */
|
|
#include "../locale/weight.h"
|
|
|
|
|
|
/* Compare S1 and S2, returning less than, equal to or
|
|
greater than zero if the collated form of S1 is lexicographically
|
|
less than, equal to or greater than the collated form of S2. */
|
|
#ifndef USE_IN_EXTENDED_LOCALE_MODEL
|
|
int
|
|
STRCOLL (s1, s2)
|
|
const STRING_TYPE *s1;
|
|
const STRING_TYPE *s2;
|
|
#else
|
|
int
|
|
STRCOLL (s1, s2, l)
|
|
const STRING_TYPE *s1;
|
|
const STRING_TYPE *s2;
|
|
__locale_t l;
|
|
#endif
|
|
{
|
|
#ifdef USE_IN_EXTENDED_LOCALE_MODEL
|
|
struct locale_data *current = l->__locales[LC_COLLATE];
|
|
# if BYTE_ORDER == BIG_ENDIAN
|
|
const u_int32_t *collate_table = (const u_int32_t *)
|
|
current->values[_NL_ITEM_INDEX (_NL_COLLATE_TABLE_EB)].string;
|
|
const u_int32_t *collate_extra = (const u_int32_t *)
|
|
current->values[_NL_ITEM_INDEX (_NL_COLLATE_EXTRA_EB)].string;
|
|
# elif BYTE_ORDER == LITTLE_ENDIAN
|
|
const u_int32_t *collate_table = (const u_int32_t *)
|
|
current->values[_NL_ITEM_INDEX (_NL_COLLATE_TABLE_EL)].string;
|
|
const u_int32_t *collate_extra = (const u_int32_t *)
|
|
current->values[_NL_ITEM_INDEX (_NL_COLLATE_EXTRA_EL)].string;
|
|
# else
|
|
# error bizarre byte order
|
|
# endif
|
|
#endif
|
|
weight_t *s1forw = NULL;
|
|
weight_t *s1backw = NULL;
|
|
weight_t *s2forw = NULL;
|
|
weight_t *s2backw = NULL;
|
|
size_t pass;
|
|
|
|
/* If the current locale does not specify locale data we use normal
|
|
8-bit string comparison. */
|
|
if (collate_nrules == 0)
|
|
return STRCMP (s1, s2);
|
|
|
|
/* Get full information about the strings. This means we get
|
|
information for all passes in a special data structure. */
|
|
get_string (s1, s1forw, s1backw);
|
|
get_string (s2, s2forw, s2backw);
|
|
|
|
/* Now we have all the information. In at most the given number of
|
|
passes we can finally decide about the order. */
|
|
for (pass = 0; pass < collate_nrules; ++pass)
|
|
{
|
|
int forward = (collate_rules[pass] & sort_forward) != 0;
|
|
const weight_t *s1run = forward ? s1forw : s1backw;
|
|
const weight_t *s2run = forward ? s2forw : s2backw;
|
|
int s1idx = forward ? 0 : s1run->data[pass].number - 1;
|
|
int s2idx = forward ? 0 : s2run->data[pass].number - 1;
|
|
|
|
while (1)
|
|
{
|
|
int s1ignore = 0;
|
|
int s2ignore = 0;
|
|
u_int32_t w1 = 0;
|
|
u_int32_t w2 = 0;
|
|
|
|
/* Here we have to check for IGNORE entries. If these are
|
|
found we count them and go on with the next value. */
|
|
while (s1run != NULL
|
|
&& ((w1 = s1run->data[pass].value[s1idx])
|
|
== (u_int32_t) IGNORE_CHAR))
|
|
{
|
|
++s1ignore;
|
|
if ((forward && ++s1idx >= s1run->data[pass].number)
|
|
|| (!forward && --s1idx < 0))
|
|
{
|
|
weight_t *nextp = forward ? s1run->next : s1run->prev;
|
|
if (nextp == NULL)
|
|
{
|
|
w1 = 0;
|
|
/* No more non-INGOREd elements means lowest
|
|
possible value. */
|
|
s1ignore = -1;
|
|
}
|
|
else
|
|
s1idx = forward ? 0 : nextp->data[pass].number - 1;
|
|
s1run = nextp;
|
|
}
|
|
}
|
|
|
|
while (s2run != NULL
|
|
&& ((w2 = s2run->data[pass].value[s2idx])
|
|
== (u_int32_t) IGNORE_CHAR))
|
|
{
|
|
++s2ignore;
|
|
if ((forward && ++s2idx >= s2run->data[pass].number)
|
|
|| (!forward && --s2idx < 0))
|
|
{
|
|
weight_t *nextp = forward ? s2run->next : s2run->prev;
|
|
if (nextp == NULL)
|
|
{
|
|
w2 = 0;
|
|
/* No more non-INGOREd elements means lowest
|
|
possible value. */
|
|
s2ignore = -1;
|
|
}
|
|
else
|
|
s2idx = forward ? 0 : nextp->data[pass].number - 1;
|
|
s2run = nextp;
|
|
}
|
|
}
|
|
|
|
/* If one string is completely processed stop. */
|
|
if (s1run == NULL || s2run == NULL)
|
|
break;
|
|
|
|
/* Now we have information of the number of ignored
|
|
weights and the value of the next weight. */
|
|
if ((collate_rules[pass] & sort_position) != 0
|
|
&& s1ignore != s2ignore && (w1 != 0 || w2 != 0))
|
|
return s1ignore < s2ignore ? -1 : 1;
|
|
|
|
if (w1 != w2)
|
|
return w1 < w2 ? -1 : 1;
|
|
|
|
/* We have to increment the index counters. */
|
|
if ((forward && ++s1idx >= s1run->data[pass].number)
|
|
|| (!forward && --s1idx < 0))
|
|
if (forward)
|
|
{
|
|
s1run = s1run->next;
|
|
s1idx = 0;
|
|
}
|
|
else
|
|
{
|
|
s1run = s1run->prev;
|
|
if (s1run != NULL)
|
|
s1idx = s1run->data[pass].number - 1;
|
|
}
|
|
|
|
if ((forward && ++s2idx >= s2run->data[pass].number)
|
|
|| (!forward && --s2idx < 0))
|
|
if (forward)
|
|
{
|
|
s2run = s2run->next;
|
|
s2idx = 0;
|
|
}
|
|
else
|
|
{
|
|
s2run = s2run->prev;
|
|
if (s2run != NULL)
|
|
s2idx = s2run->data[pass].number - 1;
|
|
}
|
|
|
|
}
|
|
|
|
if (s1run != s2run)
|
|
return s1run != NULL ? 1 : -1;
|
|
}
|
|
|
|
return 0;
|
|
}
|