mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-22 21:10:07 +00:00
7a12c6bba7
* intl/Makefile (CPPFLAGS): Change $(nlsdir) to $(i18ndir) in LOCALE_ALIAS_PATH. Fri May 3 03:14:02 1996 Ulrich Drepper <drepper@cygnus.com> * intl/Makefile (routines): Add l10nflist and explodename. (distribute): Add loadinfo.h and locale.alias. (install-others): New variable to install locale.alias. * intl/dcgettext.c, intl/finddomain.c, intl/gettextP.h, intl/loadmsgcat.c: Adapt for upcoming gettext-0.10.13. Some code is now shared with the locale implementation. * intl/explodename.c, intl/l10nflist.c, intl/loadinfo.h: New file. Extracted from finddomain.c. This is also used in the locale implementation. * intl/locale.alias: New file. Locale alias database compatible with X Window System's locale alias file. Can now be used in locale and gettext code. * libio/stdio.h: Add prototypes for asprint and vasprintf. * locale/C-collate.c, locale/C-ctype.c, locale/C-messages.c, locale/C-monetary.c, locale/C-numeric.c, locale/C-time.c: Add new field in structure with name of locale ("C" in this case). * locale/Makefile (routines): Add findlocale. * locale/findlocale.c: New file. Instead of trying to load the directly described file we now try to be much smarter when this fails. Use the same code as gettext does. * locale/loadlocale.c, locale/setlocale.c: Rewrite to know about new loading scheme. * locale/localeinfo.h: Adapt prototypes and declarations for new setlocale implementation. Remove definition of u32_t type. We now use u_int32_t from <sys/types.h>. * locale/programs/charset.h (ILLEGAL_CHAR_VALUE): Provide type with constant. * locale/programs/config.h, locale/lc-collate.c, locale/localeinfo.h, locale/programs/ld-collate.c, locale/programs/ld-ctype.c, locale/programs/ld-messages.c, locale/programs/ld-monetary.c, locale/programs/ld-numeric.c, locale/programs/ld-time.c, locale/weight.h, string/strcoll.c: Change to use u_int32_t and u_int16_t. * locale/programs/localedef.c (construct_output_path): Change name of output locale to contain normalized form of the character set portion. * string/Makefile (routines): Add agrz-ctsep and argz-next. (tests): Add tst-strlen. * string/argz-ctsep.c: New file. Implement reverse operation from argz-stringify. * string/argz-next.c: Non-inline version of function from argz.h. * string/argz.h, string/envz.h: Make usable as global header file. * string/envz.c: Fix declarations to use size_t where prototypes say so. * string/tst-strlen.c: New file. Another test for critical situation in strlen implementations. * sysdeps/i386/i586/strlen.S: Fix bug with highest byte in word being zero. * wctype/test_wctype.c: Fix controlling comparison after change to 32 bit character class array. Fri May 3 12:53:12 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu> * sysdeps/unix/sysv/linux/sys/socket.h: Remove spurious doubled line. Thu May 2 22:50:52 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/unix/sysv/linux/getpriority.c: New file. * sysdeps/unix/sysv/linux/syscalls.list: Add s_getpriority. Thu May 2 22:41:31 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/unix/sysv/linux/m68k/fpu_control.h (_FPU_DEFAULT): Disable all exceptions. Thu May 2 22:33:14 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/m68k/fpu/e_acos.c, sysdeps/m68k/fpu/e_acosf.c, sysdeps/m68k/fpu/e_fmod.c, sysdeps/m68k/fpu/e_fmodf.c, sysdeps/m68k/fpu/isinfl.c, sysdeps/m68k/fpu/isnanl.c, sysdeps/m68k/fpu/s_atan.c, sysdeps/m68k/fpu/s_atanf.c, sysdeps/m68k/fpu/s_frexp.c, sysdeps/m68k/fpu/s_frexpf.c, sysdeps/m68k/fpu/s_ilogb.c, sysdeps/m68k/fpu/s_ilogbf.c, sysdeps/m68k/fpu/s_isinf.c, sysdeps/m68k/fpu/s_isinff.c, sysdeps/m68k/fpu/s_ldexp.c, sysdeps/m68k/fpu/s_ldexpf.c, sysdeps/m68k/fpu/s_modf.c, sysdeps/m68k/fpu/s_modff.c: Don't define __NO_MATH_INLINES, which is already defined on command line. Thu May 2 22:18:28 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/libm-ieee754/e_j0f.c (__ieee754_j0f, __ieee754_y0f): Replace 0x80000000 by 0x48000000. * sysdeps/libm-ieee754/e_j1f.c (__ieee754_j1f): Likewise. Thu May 2 21:30:33 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sunrpc/svc_simple.c: Make global variable pl local to registerrpc. Thu May 2 00:24:04 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * time/Makefile (tz-cflags): New variable. (CFLAGS-tzfile.c): New variable. (CFLAGS-zic.c): Add $(tz-cflags). (tz-cc): Remove variable. ($(objpfx)tzfile.o, $(objpfx)zic.o): Remove targets. * sysdeps/mach/hurd/getcwd.c: Jump out of both loops when we find a name, instead of checking for reaching end of buffer, which happens when the match is the last entry in the buffer.
159 lines
4.4 KiB
C
159 lines
4.4 KiB
C
/* Copyright (C) 1995, 1996 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 <stddef.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
|
|
#ifndef STRING_TYPE
|
|
# define STRING_TYPE char
|
|
# define USTRING_TYPE unsigned char
|
|
# define STRCOLL strcoll
|
|
# 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. */
|
|
int
|
|
STRCOLL (s1, s2)
|
|
const STRING_TYPE *s1;
|
|
const STRING_TYPE *s2;
|
|
{
|
|
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;
|
|
|
|
do
|
|
{
|
|
int s1ignore = 0;
|
|
int s2ignore = 0;
|
|
u_int32_t w1, w2;
|
|
|
|
/* Here we have to check for IGNORE entries. If these are
|
|
found we count them and go on witht he next value. */
|
|
while ((w1 = s1run->data[pass].value[s1idx]) == 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;
|
|
break;
|
|
}
|
|
s1run = nextp;
|
|
s1idx = forward ? 0 : s1run->data[pass].number - 1;
|
|
}
|
|
}
|
|
|
|
while ((w2 = s2run->data[pass].value[s2idx]) == 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;
|
|
break;
|
|
}
|
|
s2run = nextp;
|
|
s2idx = forward ? 0 : s2run->data[pass].number - 1;
|
|
}
|
|
}
|
|
|
|
/* 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;
|
|
}
|
|
|
|
}
|
|
while (s1run != NULL && s2run != NULL);
|
|
|
|
if (s1run != s2run)
|
|
return s1run != NULL ? 1 : -1;
|
|
}
|
|
|
|
return 0;
|
|
}
|