aboutsummaryrefslogtreecommitdiff
path: root/string
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>1995-04-01 09:01:49 +0000
committerRoland McGrath <roland@gnu.org>1995-04-01 09:01:49 +0000
commit2f8033d6067fff3e7d77bb2174a9564bd7199cea (patch)
tree338cc27cac49feff7928918f6f78b7bc9e129993 /string
parent5de9ba232c42a03b7c9839f9ed907a24d63d7c78 (diff)
downloadglibc-2f8033d6067fff3e7d77bb2174a9564bd7199cea.tar
glibc-2f8033d6067fff3e7d77bb2174a9564bd7199cea.tar.gz
glibc-2f8033d6067fff3e7d77bb2174a9564bd7199cea.tar.bz2
glibc-2f8033d6067fff3e7d77bb2174a9564bd7199cea.zip
Sat Apr 1 00:08:06 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu>
* locale/loadlocale.c (_nl_load_locale) [MAP_FILE]: Define it zero if undefined. * string/strxfrm.c: Just copy the string (for now). * string/strcoll.c: Just call strcmp (for now). * mach/Makefile (lock): Add mutex-init. * mach/mutex-solid.c (_cthread_mutex_lock_routine, _cthread_mutex_unlock_routine): Variables removed. (__mutex_lock_solid, __mutex_unlock_solid): Don't use them; just stub. (__mutex_init): Function moved to new file mutex-init.c. * mach/mutex-init.c: New file, broken out of mutex-solid.c.
Diffstat (limited to 'string')
-rw-r--r--string/strcoll.c48
-rw-r--r--string/strxfrm.c52
2 files changed, 12 insertions, 88 deletions
diff --git a/string/strcoll.c b/string/strcoll.c
index ed4b35f80d..9dee89fa7a 100644
--- a/string/strcoll.c
+++ b/string/strcoll.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991 Free Software Foundation, Inc.
+/* Copyright (C) 1995 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -16,8 +16,6 @@ License along with the GNU C Library; see the file COPYING.LIB. If
not, write to the Free Software Foundation, Inc., 675 Mass Ave,
Cambridge, MA 02139, USA. */
-#include <ansidecl.h>
-#include <localeinfo.h>
#include <stddef.h>
#include <stdlib.h>
#include <string.h>
@@ -27,44 +25,10 @@ Cambridge, MA 02139, USA. */
greater than zero if the collated form of S1 is lexiographically
less than, equal to or greater than the collated form of S2. */
int
-DEFUN(strcoll, (s1, s2), CONST char *s1 AND CONST char *s2)
+strcoll (s1, s2)
+ const char *s1;
+ const char *s2;
{
- if (_collate_info == NULL || _collate_info->values == NULL)
- return strcmp(s1, s2);
- else
- {
- CONST unsigned char *CONST values = _collate_info->values;
- CONST unsigned char *CONST offsets = _collate_info->offsets;
-
- while (*s1 != '\0' && *s2 != '\0')
- {
- CONST unsigned char c1 = *s1++, c2 = *s2++;
- CONST unsigned char v1 = values[c1], v2 = values[c2];
- CONST unsigned char o1 = offsets[c1], o2 = offsets[c2];
-
- if (v1 == UCHAR_MAX && o1 == 0)
- /* This is a non-collating element. Skip it. */
- --s2;
- else if (v2 == UCHAR_MAX && o2 == 0)
- --s1;
- else if (v1 == UCHAR_MAX && o1 == CHAR_MAX)
- {
- /* This element collates lower than anything else. */
- if (v2 != UCHAR_MAX || o2 != CHAR_MAX)
- return -1;
- }
- else if (v2 == UCHAR_MAX && o2 == CHAR_MAX)
- return 1;
- else if (v1 != v2)
- return v1 - v2;
- else if (o1 != o2)
- return o1 - o2;
- }
-
- if (*s1 == '\0')
- return *s2 == '\0' ? 0 : -1;
- else if (*s2 == '\0')
- return 1;
- return 0;
- }
+ /* XXX LC_COLLATE not implemented yet. */
+ return strcmp (s1, s2);
}
diff --git a/string/strxfrm.c b/string/strxfrm.c
index cdca280e78..513a4b6a1a 100644
--- a/string/strxfrm.c
+++ b/string/strxfrm.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991 Free Software Foundation, Inc.
+/* Copyright (C) 1995 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -16,8 +16,6 @@ License along with the GNU C Library; see the file COPYING.LIB. If
not, write to the Free Software Foundation, Inc., 675 Mass Ave,
Cambridge, MA 02139, USA. */
-#include <ansidecl.h>
-#include <localeinfo.h>
#include <stddef.h>
#include <stdlib.h>
#include <string.h>
@@ -29,48 +27,10 @@ Cambridge, MA 02139, USA. */
their transformation. The transformed string is put in at
most N characters of DEST and its length is returned. */
size_t
-DEFUN(strxfrm, (dest, src, n), char *dest AND CONST char *src AND size_t n)
+strxfrm (dest, src, n)
+ char *dest;
+ const char *src;
+ size_t n;
{
- CONST unsigned char *CONST values
- = _collate_info != NULL ? _collate_info->values : NULL;
- CONST unsigned char *CONST offsets
- = _collate_info != NULL ? _collate_info->offsets : NULL;
- register size_t done = 0;
-
- while (*src != '\0')
- {
- CONST unsigned char c = *src++;
-
- ++done;
- if (offsets != NULL && offsets[c] != 0)
- {
- ++done;
- if (offsets[c] == CHAR_MAX)
- ++done;
- }
- if (done < n && dest != NULL)
- {
- if (values == NULL)
- *dest++ = c;
- else if (values[c] == UCHAR_MAX && offsets[c] == 0)
- /* This is a non-collating element. Skip it. */
- ;
- else if (values[c] == UCHAR_MAX && offsets[c] == CHAR_MAX)
- {
- /* This element collates lower than anything else. */
- *dest++ = '\001';
- *dest++ = '\001';
- *dest++ = '\001';
- }
- else
- {
- *dest++ = values[c];
- *dest++ = offsets[c];
- }
- }
- }
-
- if (dest != NULL)
- *dest = '\0';
- return done;
+ return __stpncpy (dest, src, n) - dest;
}