aboutsummaryrefslogtreecommitdiff
path: root/locale/programs
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1998-12-10 10:00:31 +0000
committerUlrich Drepper <drepper@redhat.com>1998-12-10 10:00:31 +0000
commit648c133790556357a430d83c2c89a2bd01df9e27 (patch)
treebc39460863b155333aeb1a8bafc884e48e3ed1d5 /locale/programs
parentb77e6cd62103be90cd9cdd8e24372cb5324916ad (diff)
downloadglibc-648c133790556357a430d83c2c89a2bd01df9e27.tar
glibc-648c133790556357a430d83c2c89a2bd01df9e27.tar.gz
glibc-648c133790556357a430d83c2c89a2bd01df9e27.tar.bz2
glibc-648c133790556357a430d83c2c89a2bd01df9e27.zip
Update.
1998-12-09 Geoff Keating <geoffk@ozemail.com.au> * sysdeps/unix/sysv/linux/sys/procfs.h: Use sys/user.h not asm/user.h. * sysdeps/unix/sysv/linux/mips/sys/procfs.h: Likewise. * sysdeps/unix/sysv/linux/powerpc/sys/procfs.h: New file, like linux/sys/procfs.h but uses uid_t and gid_t. * sysdeps/unix/sysv/linux/powerpc/sys/user.h: New file, don't include <linux/ptrace.h>. 1998-12-08 Andreas Schwab <schwab@issan.cs.uni-dortmund.de> * posix/runptests.c (main): Check that regcomp did not succeed unexpectedly. * posix/runtests.c (run_a_test): Likewise. Return appropriate exit code. * posix/TESTS: Regexp "a[b-a]" should not compile. * posix/PTESTS: Comment out bogus tests GA113(2), GA145(2) and GA147(2). 1998-12-09 Andreas Schwab <schwab@issan.cs.uni-dortmund.de> * locale/programs/ld-ctype.c (allocate_arrays): Don't crash if there is no codeset name. * locale/programs/ld-collate.c (collate_output): Don't crash if a character has no weight.
Diffstat (limited to 'locale/programs')
-rw-r--r--locale/programs/ld-collate.c2
-rw-r--r--locale/programs/ld-ctype.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/locale/programs/ld-collate.c b/locale/programs/ld-collate.c
index b9734c36dd..5accaabfea 100644
--- a/locale/programs/ld-collate.c
+++ b/locale/programs/ld-collate.c
@@ -812,6 +812,8 @@ Computing table size for collation information might take a while..."),
lastp = firstp;
while (lastp->next != NULL && wcscmp (name, lastp->name))
lastp = lastp->next;
+ if (lastp->ordering == NULL)
+ lastp = &collate->undefined;
}
weights = lastp->ordering;
diff --git a/locale/programs/ld-ctype.c b/locale/programs/ld-ctype.c
index 2fbefd9395..3c0c8e870d 100644
--- a/locale/programs/ld-ctype.c
+++ b/locale/programs/ld-ctype.c
@@ -1458,5 +1458,5 @@ Computing table size for character classes might take a while..."),
/* We need the name of the currently used 8-bit character set to
make correct conversion between this 8-bit representation and the
ISO 10646 character set used internally for wide characters. */
- ctype->codeset_name = charset->code_set_name;
+ ctype->codeset_name = charset->code_set_name ? : "";
}