aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog28
-rw-r--r--locale/programs/ld-collate.c2
-rw-r--r--locale/programs/ld-ctype.c2
-rw-r--r--posix/PTESTS30
-rw-r--r--posix/TESTS2
-rw-r--r--posix/runptests.c10
-rw-r--r--posix/runtests.c13
-rw-r--r--sysdeps/unix/sysv/linux/mips/sys/procfs.h2
-rw-r--r--sysdeps/unix/sysv/linux/powerpc/sys/procfs.h109
-rw-r--r--sysdeps/unix/sysv/linux/powerpc/sys/user.h40
-rw-r--r--sysdeps/unix/sysv/linux/sys/procfs.h2
11 files changed, 215 insertions, 25 deletions
diff --git a/ChangeLog b/ChangeLog
index 91365ff..76eea45 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,31 @@
+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.
+
1998-12-10 Ulrich Drepper <drepper@cygnus.com>
* inet/getnetgrent_r.c (innetgr): Check host and domain name with
diff --git a/locale/programs/ld-collate.c b/locale/programs/ld-collate.c
index b9734c3..5accaab 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 2fbefd9..3c0c8e8 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 ? : "";
}
diff --git a/posix/PTESTS b/posix/PTESTS
index 198456f..cc626fa 100644
--- a/posix/PTESTS
+++ b/posix/PTESTS
@@ -42,11 +42,11 @@
-1¦-1¦\(^*ab\)¦^*ab¦
-1¦-1¦\(^*b\)¦a*b¦
-1¦-1¦\(^*b\)¦^*b¦
-# GA113(2)
--1¦-1¦\(^*ab\)¦*ab¦
--1¦-1¦\(^*ab\)¦^*ab¦
-1¦1¦\(^*b\)¦b¦
-1¦3¦\(^*b\)¦^^b¦
+### GA113(2) GNU regex implements GA113(1)
+##-1¦-1¦\(^*ab\)¦*ab¦
+##-1¦-1¦\(^*ab\)¦^*ab¦
+##1¦1¦\(^*b\)¦b¦
+##1¦3¦\(^*b\)¦^^b¦
# GA114
1¦3¦a^b¦a^b¦
1¦3¦a\^b¦a^b¦
@@ -275,11 +275,11 @@
1¦1¦\(^^\)¦^^¦
1¦3¦\(^abc\)¦abcdef¦
-1¦-1¦\(^def\)¦abcdef¦
-# GA145(2)
--1¦-1¦\(^a\)\1¦aabc¦
-1¦4¦\(^a\)\1¦^a^abc¦
--1¦-1¦\(^^a\)¦^a¦
-1¦2¦\(^^\)¦^^¦
+### GA145(2) GNU regex implements GA145(1)
+##-1¦-1¦\(^a\)\1¦aabc¦
+##1¦4¦\(^a\)\1¦^a^abc¦
+##-1¦-1¦\(^^a\)¦^a¦
+##1¦2¦\(^^\)¦^^¦
# GA146
3¦3¦a$¦cba¦
-1¦-1¦a$¦abc¦
@@ -295,11 +295,11 @@
1¦2¦\(ab$\)¦ab¦
4¦6¦\(def$\)¦abcdef¦
-1¦-1¦\(abc$\)¦abcdef¦
-# GA147(2)
--1¦-1¦\(a$\)\1¦bcaa¦
-2¦5¦\(a$\)\1¦ba$a$¦
--1¦-1¦\(ab$\)¦ab¦
-1¦3¦\(ab$\)¦ab$¦
+### GA147(2) GNU regex implements GA147(1)
+##-1¦-1¦\(a$\)\1¦bcaa¦
+##2¦5¦\(a$\)\1¦ba$a$¦
+##-1¦-1¦\(ab$\)¦ab¦
+##1¦3¦\(ab$\)¦ab$¦
# GA148
0¦0¦^$¦¦
1¦3¦^abc$¦abc¦
diff --git a/posix/TESTS b/posix/TESTS
index 4f1c49f..858e223 100644
--- a/posix/TESTS
+++ b/posix/TESTS
@@ -39,7 +39,7 @@
0:a[b-d]:aac
0:a[-b]:a-
0:a[b-]:a-
-1:a[b-a]:-
+2:a[b-a]:-
2:a[]b:-
2:a[:-
0:a]:a]
diff --git a/posix/runptests.c b/posix/runptests.c
index b1eabb9..fcea5b3 100644
--- a/posix/runptests.c
+++ b/posix/runptests.c
@@ -63,8 +63,8 @@ main (int argc, char *argv[])
err = regcomp (&re, tests[cnt].reg, tests[cnt].options);
if (err != 0)
{
- if (tests[cnt].start == -1)
- puts ("failed, OK");
+ if (tests[cnt].start == -2)
+ puts ("compiling failed, OK");
else
{
char buf[100];
@@ -75,6 +75,12 @@ main (int argc, char *argv[])
continue;
}
+ else if (tests[cnt].start == -2)
+ {
+ puts ("compiling suceeds, FAIL");
+ errors++;
+ continue;
+ }
/* Run the actual test. */
err = regexec (&re, tests[cnt].str, 20, match, 0);
diff --git a/posix/runtests.c b/posix/runtests.c
index b6a292e..8347286 100644
--- a/posix/runtests.c
+++ b/posix/runtests.c
@@ -65,7 +65,7 @@ run_a_test (int id, const struct a_test * t)
err = regcomp (&r, t->pattern, REG_EXTENDED);
if (err)
{
- if (t->expected)
+ if (t->expected == 2)
{
puts (" OK.");
return 0;
@@ -75,6 +75,13 @@ run_a_test (int id, const struct a_test * t)
puts (errmsg);
return 1;
}
+ else if (t->expected == 2)
+ {
+ printf ("test %d\n", id);
+ printf ("pattern \"%s\" successfull compilation not expected\n",
+ t->pattern);
+ return 1;
+ }
}
err = regexec (&r, t->data, 10, regs, 0);
@@ -124,9 +131,7 @@ main (int argc, char * argv[])
printf ("#%d:", x);
res |= run_a_test (x, &the_tests[x]);
}
- {
- exit (0);
- }
+ exit (res != 0);
}
diff --git a/sysdeps/unix/sysv/linux/mips/sys/procfs.h b/sysdeps/unix/sysv/linux/mips/sys/procfs.h
index d740954..c97836f 100644
--- a/sysdeps/unix/sysv/linux/mips/sys/procfs.h
+++ b/sysdeps/unix/sysv/linux/mips/sys/procfs.h
@@ -28,7 +28,7 @@
#include <signal.h>
#include <sys/time.h>
#include <sys/types.h>
-#include <asm/user.h>
+#include <sys/user.h>
#include <asm/elf.h>
__BEGIN_DECLS
diff --git a/sysdeps/unix/sysv/linux/powerpc/sys/procfs.h b/sysdeps/unix/sysv/linux/powerpc/sys/procfs.h
new file mode 100644
index 0000000..8633e44
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/powerpc/sys/procfs.h
@@ -0,0 +1,109 @@
+/* Copyright (C) 1996, 1997 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
+ 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. */
+
+#ifndef _SYS_PROCFS_H
+
+#define _SYS_PROCFS_H 1
+#include <features.h>
+
+/* This is somehow modelled after the file of the same name on SysVr4
+ systems. It provides a definition of the core file format for ELF
+ used on Linux. */
+
+#include <signal.h>
+#include <sys/time.h>
+#include <sys/types.h>
+#include <sys/user.h>
+#include <asm/elf.h>
+
+__BEGIN_DECLS
+
+struct elf_siginfo
+ {
+ int si_signo; /* Signal number. */
+ int si_code; /* Extra code. */
+ int si_errno; /* Errno. */
+ };
+
+typedef elf_greg_t greg_t;
+typedef elf_gregset_t gregset_t;
+typedef elf_fpregset_t fpregset_t;
+#define NGREG ELF_NGREG
+
+/* Definitions to generate Intel SVR4-like core files. These mostly
+ have the same names as the SVR4 types with "elf_" tacked on the
+ front to prevent clashes with linux definitions, and the typedef
+ forms have been avoided. This is mostly like the SVR4 structure,
+ but more Linuxy, with things that Linux does not support and which
+ gdb doesn't really use excluded. Fields present but not used are
+ marked with "XXX". */
+struct elf_prstatus
+ {
+#if 0
+ long int pr_flags; /* XXX Process flags. */
+ short int pr_why; /* XXX Reason for process halt. */
+ short int pr_what; /* XXX More detailed reason. */
+#endif
+ struct elf_siginfo pr_info; /* Info associated with signal. */
+ short int pr_cursig; /* Current signal. */
+ unsigned long int pr_sigpend; /* Set of pending signals. */
+ unsigned long int pr_sighold; /* Set of held signals. */
+#if 0
+ struct sigaltstack pr_altstack; /* Alternate stack info. */
+ struct sigaction pr_action; /* Signal action for current sig. */
+#endif
+ __pid_t pr_pid;
+ __pid_t pr_ppid;
+ __pid_t pr_pgrp;
+ __pid_t pr_sid;
+ struct timeval pr_utime; /* User time. */
+ struct timeval pr_stime; /* System time. */
+ struct timeval pr_cutime; /* Cumulative user time. */
+ struct timeval pr_cstime; /* Cumulative system time. */
+#if 0
+ long int pr_instr; /* Current instruction. */
+#endif
+ elf_gregset_t pr_reg; /* GP registers. */
+ int pr_fpvalid; /* True if math copro being used. */
+ };
+
+
+#define ELF_PRARGSZ (80) /* Number of chars for args */
+
+struct elf_prpsinfo
+ {
+ char pr_state; /* Numeric process state. */
+ char pr_sname; /* Char for pr_state. */
+ char pr_zomb; /* Zombie. */
+ char pr_nice; /* Nice val. */
+ unsigned long int pr_flag; /* Flags. */
+ __uid_t pr_uid;
+ __gid_t pr_gid;
+ __pid_t pr_pid, pr_ppid, pr_pgrp, pr_sid;
+ /* Lots missing */
+ char pr_fname[16]; /* Filename of executable. */
+ char pr_psargs[ELF_PRARGSZ]; /* Initial part of arg list. */
+ };
+
+
+typedef struct elf_prstatus prstatus_t;
+typedef struct elf_prpsinfo prpsinfo_t;
+
+__END_DECLS
+
+#endif /* sys/procfs.h */
diff --git a/sysdeps/unix/sysv/linux/powerpc/sys/user.h b/sysdeps/unix/sysv/linux/powerpc/sys/user.h
new file mode 100644
index 0000000..b3634ed
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/powerpc/sys/user.h
@@ -0,0 +1,40 @@
+/* Copyright (C) 1998 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
+ 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. */
+
+#ifndef _SYS_USER_H
+
+#define _SYS_USER_H 1
+#include <features.h>
+
+#include <asm/ptrace.h>
+
+struct user {
+ struct pt_regs regs; /* entire machine state */
+ size_t u_tsize; /* text size (pages) */
+ size_t u_dsize; /* data size (pages) */
+ size_t u_ssize; /* stack size (pages) */
+ unsigned long start_code; /* text starting address */
+ unsigned long start_data; /* data starting address */
+ unsigned long start_stack; /* stack starting address */
+ long int signal; /* signal causing core dump */
+ struct regs * u_ar0; /* help gdb find registers */
+ unsigned long magic; /* identifies a core file */
+ char u_comm[32]; /* user command name */
+};
+
+#endif /* sys/user.h */
diff --git a/sysdeps/unix/sysv/linux/sys/procfs.h b/sysdeps/unix/sysv/linux/sys/procfs.h
index a1190a3..1346bbd 100644
--- a/sysdeps/unix/sysv/linux/sys/procfs.h
+++ b/sysdeps/unix/sysv/linux/sys/procfs.h
@@ -28,7 +28,7 @@
#include <signal.h>
#include <sys/time.h>
#include <sys/types.h>
-#include <asm/user.h>
+#include <sys/user.h>
#include <asm/elf.h>
__BEGIN_DECLS