mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-26 15:00:06 +00:00
59dd864187
* stdlib/ldiv.c: Deansideclized. Sun May 26 19:39:53 1996 Ulrich Drepper <drepper@cygnus.com> * intl/loadmsgcat.c (_nl_load_domain): Test correct variable after malloc. * string/Makefile (tester-ENV): New variable to suppress message translation in test. * string/tester.c: Add tests for strtok_r and strsep. * sysdeps/i386/i486/strcat.S: Correct some more 8bit operation <-> 32 bit operand conflicts. * sysdeps/i386/strsep.S: Wrapper around <sysdeps/i386/strtok.S> to produce strsep function. * sysdeps/i386/strtok.S: Optimized implementation of strtok function. * sysdeps/i386/strtok_r.S: Wrapper around <sysdeps/i386/strtok.S> to produce strtok_r function. * sysdeps/generic/strtok.c: Moved here from string/strtok.c. Corrected example in comment. * string/Makefile (routines): Add strtok_r. * sysdeps/generic/strtok_r.c: New file. Implement reentrant version of strtok_r. * string/string.h: Add prototype for strtok_r. * wcsmbs/wcstok.c: Handle illegal SAVE_PTR argument the same as in strtok_r. Sun May 26 13:28:23 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu> * time/tzset.c (__tzset): Ignore leading : in $TZ; always try tzfile first and fall back to 1003.1 syntax only if it fails. * time/Makefile (install-others): Also install posix/ZONE and right/ZONE for each ZONE in $(zonenames). (z.% rule): Generate rules for right/ZONE and posix/ZONE targets too, the difference begin leapseconds vs /dev/null as 3rd dep. For original ZONE targets use $(leapseconds), to be set in Makeconfig. (target-zone-flavor): New variable. (tzcompile): Use it to get the right -d for posix/ and right/ flavors. * Makeconfig (leapseconds): New variable. * mach/Machrules (%.udeps rule): Depend on Machrules. Emit deps for .uh and .__h files. (%.uh, %.__h rules): Don't depend on %.defs; use #include <$*.defs> instead. Sun May 26 01:06:47 1996 Ulrich Drepper <drepper@cygnus.com> * stdlib/Makefile (routines): Add llabs, lldiv. * stdlib/llabs.c: New file. Implementation of return absolute value of long long argument. * stdlib/lldiv.c: New file. Implementation of division with remainder of long long argument. * stdlib/stdlib.h [__USE_GNU] (lldiv_t): New type for lldiv function. Define prototypes for lldiv and llabs functions. * locale/C-collate.c: Initialize _NL_COLLATE_NRULES element. * stdlib/strtod.c: Replace wchar_t with wint_t. The later is really the type for a single wide character. * string/strxfrm.c (print_val): Define separate version for use as wcsxfrm. Here we don't need UTF8 encoding. * wcsmbs/wchar.h: gcc-2.7.2-960517 finally introduces wint_t in <stddef.h>. Use this value and only for older gcc version define in place. (uwchar_t): Remove definition. * wcsmbs/wcscmp.c, wcsmbs/wcscoll.c, wcsmbs/wcsncmp.c, wcsmbs/wcsxfrm.c, wcsmbs/wmemcmp.c: : Don't use uwchar_t as unsigned type. wint_t is intended for this. Sat May 25 14:10:19 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu> * sysdeps/unix/bsd/direntry.h: Use [1] instead of [0] for d_name to quiet -ansi -pedantic. * sysdeps/unix/common/direntry.h: Likewise. * login/Makefile (headers): Add lastlog.h. * login/lastlog.h: New file. * login/Makefile (CFLAGS): Don't append -D_THREAD_SAFE. * login/utmp.h [_REENTRANT || _THREAD_SAFE]: Replace this conditional with #ifdef __USE_REENTRANT. * features.h (__GNU_LIBRARY__): Set to 6. [_GNU_SOURCE] (_POSIX_SOURCE, _POSIX_C_SOURCE, _BSD_SOURCE, _SVID_SOURCE): Make sure they are all defined. * sysdeps/unix/sysv/linux/gnu/types.h: Instead of including <linux/posix_types.h>, define _LINUX_TYPES_DONT_EXPORT and then include <linux/types.h>. * resource/sys/resource.h: Remove trailing commas from enums. * sysdeps/generic/netinet/in.h: Remove trailing commas from enums. * sysdeps/unix/sysv/linux/netinet/in.h: Likewise.
237 lines
5.9 KiB
C
237 lines
5.9 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 WIDE_VERSION
|
|
# define STRING_TYPE char
|
|
# define USTRING_TYPE unsigned char
|
|
# define L_(Ch) Ch
|
|
# define STRXFRM strxfrm
|
|
# define STRLEN strlen
|
|
# define STPNCPY __stpncpy
|
|
#endif
|
|
|
|
/* Include the shared helper functions. `strxfrm'/`wcsxfrm' also use
|
|
these functions. */
|
|
#include "../locale/weight.h"
|
|
|
|
|
|
#ifndef WIDE_VERSION
|
|
/* Write 32 bit value UTF-8 encoded but only if enough space is left. */
|
|
static __inline size_t
|
|
print_val (u_int32_t value, char *dest, size_t max, size_t act)
|
|
{
|
|
char tmp[6];
|
|
int idx = 0;
|
|
|
|
if (value < 0x80)
|
|
tmp[idx++] = (char) value;
|
|
else
|
|
{
|
|
tmp[idx++] = '\x80' + (char) (value & 0x3f);
|
|
value >>= 6;
|
|
|
|
if (value < 0x20)
|
|
tmp[idx++] = '\xc0' + (char) value;
|
|
else
|
|
{
|
|
tmp[idx++] = '\x80' + (char) (value & 0x3f);
|
|
value >>= 6;
|
|
|
|
if (value < 0x10)
|
|
tmp[idx++] = '\xe0' + (char) value;
|
|
else
|
|
{
|
|
tmp[idx++] = '\x80' + (char) (value & 0x3f);
|
|
value >>= 6;
|
|
|
|
if (value < 0x08)
|
|
tmp[idx++] = '\xf0' + (char) value;
|
|
else
|
|
{
|
|
tmp[idx++] = '\x80' + (char) (value & 0x3f);
|
|
value >>= 6;
|
|
|
|
if (value < 0x04)
|
|
tmp[idx++] = '\xf8' + (char) value;
|
|
else
|
|
{
|
|
tmp[idx++] = '\x80' + (char) (value & 0x3f);
|
|
tmp[idx++] = '\xfc' + (char) (value >> 6);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
while (idx-- > 0)
|
|
{
|
|
if (act < max)
|
|
dest[act] = tmp[idx];
|
|
++act;
|
|
}
|
|
|
|
return act;
|
|
}
|
|
#else
|
|
static __inline size_t
|
|
print_val (u_int32_t value, wchar_t *dest, size_t max, size_t act)
|
|
{
|
|
/* We cannot really assume wchar_t is 32 bits wide. But it is for
|
|
GCC and so we don't do much optimization for the other case. */
|
|
if (sizeof (wchar_t) == 4)
|
|
{
|
|
if (act < max)
|
|
dest[act] = (wchar_t) value;
|
|
++act;
|
|
}
|
|
else
|
|
{
|
|
wchar_t tmp[3];
|
|
size_t idx = 0;
|
|
|
|
if (value < 0x8000)
|
|
tmp[idx++] = (wchar_t) act;
|
|
else
|
|
{
|
|
tmp[idx++] = (wchar_t) (0x8000 + (value & 0x3fff));
|
|
value >>= 14;
|
|
if (value < 0x2000)
|
|
tmp[idx++] = (wchar_t) (0xc000 + value);
|
|
else
|
|
{
|
|
tmp[idx++] = (wchar_t) (0x8000 + (value & 0x3fff));
|
|
value >>= 14;
|
|
tmp[idx++] = (wchar_t) (0xe000 + value);
|
|
}
|
|
}
|
|
while (idx-- > 0)
|
|
{
|
|
if (act < max)
|
|
dest[act] = tmp[idx];
|
|
++act;
|
|
}
|
|
}
|
|
return act;
|
|
}
|
|
#endif
|
|
|
|
|
|
/* Transform SRC into a form such that the result of strcmp
|
|
on two strings that have been transformed by strxfrm is
|
|
the same as the result of strcoll on the two strings before
|
|
their transformation. The transformed string is put in at
|
|
most N characters of DEST and its length is returned. */
|
|
size_t
|
|
STRXFRM (STRING_TYPE *dest, const STRING_TYPE *src, size_t n)
|
|
{
|
|
weight_t *forw = NULL;
|
|
weight_t *backw = NULL;
|
|
size_t pass;
|
|
size_t written;
|
|
|
|
/* If the current locale does not specify locale data we use normal
|
|
8-bit string comparison. */
|
|
if (collate_nrules == 0)
|
|
{
|
|
if (n != 0)
|
|
STPNCPY (dest, src, n);
|
|
|
|
return STRLEN (src);
|
|
}
|
|
|
|
/* Get full information about the string. This means we get
|
|
information for all passes in a special data structure. */
|
|
get_string (src, forw, backw);
|
|
|
|
/* Now we have all the information. In at most the given number of
|
|
passes we can finally decide about the order. */
|
|
written = 0;
|
|
for (pass = 0; pass < collate_nrules; ++pass)
|
|
{
|
|
int forward = (collate_rules[pass] & sort_forward) != 0;
|
|
const weight_t *run = forward ? forw : backw;
|
|
int idx = forward ? 0 : run->data[pass].number - 1;
|
|
|
|
do
|
|
{
|
|
int ignore = 0;
|
|
u_int32_t w;
|
|
|
|
/* Here we have to check for IGNORE entries. If these are
|
|
found we count them and go on witht he next value. */
|
|
while ((w = run->data[pass].value[idx]) == IGNORE_CHAR)
|
|
{
|
|
++ignore;
|
|
if ((forward && ++idx >= run->data[pass].number)
|
|
|| (!forward && --idx < 0))
|
|
{
|
|
weight_t *nextp = forward ? run->next : run->prev;
|
|
if (nextp == NULL)
|
|
{
|
|
w = 0;
|
|
break;
|
|
}
|
|
run = nextp;
|
|
idx = forward ? 0 : run->data[pass].number - 1;
|
|
}
|
|
}
|
|
|
|
/* Now we have information of the number of ignored weights
|
|
and the value of the next weight. We have to add 2
|
|
because 0 means EOS and 1 is the intermediate string end. */
|
|
if ((collate_rules[pass] & sort_position) != 0)
|
|
written = print_val (ignore + 2, dest, n, written);
|
|
|
|
if (w != 0)
|
|
written = print_val (w, dest, n, written);
|
|
|
|
/* We have to increment the index counters. */
|
|
if ((forward && ++idx >= run->data[pass].number)
|
|
|| (!forward && --idx < 0))
|
|
if (forward)
|
|
{
|
|
run = run->next;
|
|
idx = 0;
|
|
}
|
|
else
|
|
{
|
|
run = run->prev;
|
|
if (run != NULL)
|
|
idx = run->data[pass].number - 1;
|
|
}
|
|
}
|
|
while (run != NULL);
|
|
|
|
/* Write marker for end of word. */
|
|
if (pass + 1 < collate_nrules)
|
|
written = print_val (1, dest, n, written);
|
|
}
|
|
|
|
/* Terminate string. */
|
|
if (written < n)
|
|
dest[written] = L_('\0');
|
|
|
|
/* Return length without counting the terminating '\0'. */
|
|
return written;
|
|
}
|