2021-01-02 19:32:25 +00:00
|
|
|
/* Copyright (C) 1997-2021 Free Software Foundation, Inc.
|
1998-03-05 16:42:56 +00:00
|
|
|
This file is part of the GNU C Library.
|
|
|
|
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
2001-07-06 04:58:11 +00:00
|
|
|
modify it under the terms of the GNU Lesser General Public
|
|
|
|
License as published by the Free Software Foundation; either
|
|
|
|
version 2.1 of the License, or (at your option) any later version.
|
1998-03-05 16:42:56 +00:00
|
|
|
|
|
|
|
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
|
2001-07-06 04:58:11 +00:00
|
|
|
Lesser General Public License for more details.
|
1998-03-05 16:42:56 +00:00
|
|
|
|
2001-07-06 04:58:11 +00:00
|
|
|
You should have received a copy of the GNU Lesser General Public
|
2012-02-09 23:18:22 +00:00
|
|
|
License along with the GNU C Library; if not, see
|
Prefer https to http for gnu.org and fsf.org URLs
Also, change sources.redhat.com to sourceware.org.
This patch was automatically generated by running the following shell
script, which uses GNU sed, and which avoids modifying files imported
from upstream:
sed -ri '
s,(http|ftp)(://(.*\.)?(gnu|fsf|sourceware)\.org($|[^.]|\.[^a-z])),https\2,g
s,(http|ftp)(://(.*\.)?)sources\.redhat\.com($|[^.]|\.[^a-z]),https\2sourceware.org\4,g
' \
$(find $(git ls-files) -prune -type f \
! -name '*.po' \
! -name 'ChangeLog*' \
! -path COPYING ! -path COPYING.LIB \
! -path manual/fdl-1.3.texi ! -path manual/lgpl-2.1.texi \
! -path manual/texinfo.tex ! -path scripts/config.guess \
! -path scripts/config.sub ! -path scripts/install-sh \
! -path scripts/mkinstalldirs ! -path scripts/move-if-change \
! -path INSTALL ! -path locale/programs/charmap-kw.h \
! -path po/libc.pot ! -path sysdeps/gnu/errlist.c \
! '(' -name configure \
-execdir test -f configure.ac -o -f configure.in ';' ')' \
! '(' -name preconfigure \
-execdir test -f preconfigure.ac ';' ')' \
-print)
and then by running 'make dist-prepare' to regenerate files built
from the altered files, and then executing the following to cleanup:
chmod a+x sysdeps/unix/sysv/linux/riscv/configure
# Omit irrelevant whitespace and comment-only changes,
# perhaps from a slightly-different Autoconf version.
git checkout -f \
sysdeps/csky/configure \
sysdeps/hppa/configure \
sysdeps/riscv/configure \
sysdeps/unix/sysv/linux/csky/configure
# Omit changes that caused a pre-commit check to fail like this:
# remote: *** error: sysdeps/powerpc/powerpc64/ppc-mcount.S: trailing lines
git checkout -f \
sysdeps/powerpc/powerpc64/ppc-mcount.S \
sysdeps/unix/sysv/linux/s390/s390-64/syscall.S
# Omit change that caused a pre-commit check to fail like this:
# remote: *** error: sysdeps/sparc/sparc64/multiarch/memcpy-ultra3.S: last line does not end in newline
git checkout -f sysdeps/sparc/sparc64/multiarch/memcpy-ultra3.S
2019-09-07 05:40:42 +00:00
|
|
|
<https://www.gnu.org/licenses/>. */
|
1998-03-05 16:42:56 +00:00
|
|
|
|
2019-04-25 17:54:03 +00:00
|
|
|
#include <wordexp.h>
|
|
|
|
#include <stdio.h>
|
1998-03-12 17:26:19 +00:00
|
|
|
#include <fcntl.h>
|
1998-03-06 11:39:36 +00:00
|
|
|
#include <pwd.h>
|
1998-03-05 16:42:56 +00:00
|
|
|
#include <stdlib.h>
|
2000-06-21 12:39:22 +00:00
|
|
|
#include <string.h>
|
2019-04-25 17:54:03 +00:00
|
|
|
#include <sys/mman.h>
|
|
|
|
|
Narrowing the visibility of libc-internal.h even further.
posix/wordexp-test.c used libc-internal.h for PTR_ALIGN_DOWN; similar
to what was done with libc-diag.h, I have split the definitions of
cast_to_integer, ALIGN_UP, ALIGN_DOWN, PTR_ALIGN_UP, and PTR_ALIGN_DOWN
to a new header, libc-pointer-arith.h.
It then occurred to me that the remaining declarations in libc-internal.h
are mostly to do with early initialization, and probably most of the
files including it, even in the core code, don't need it anymore. Indeed,
only 19 files actually need what remains of libc-internal.h. 23 others
need libc-diag.h instead, and 12 need libc-pointer-arith.h instead.
No file needs more than one of them, and 16 don't need any of them!
So, with this patch, libc-internal.h stops including libc-diag.h as
well as losing the pointer arithmetic macros, and all including files
are adjusted.
* include/libc-pointer-arith.h: New file. Define
cast_to_integer, ALIGN_UP, ALIGN_DOWN, PTR_ALIGN_UP, and
PTR_ALIGN_DOWN here.
* include/libc-internal.h: Definitions of above macros
moved from here. Don't include libc-diag.h anymore either.
* posix/wordexp-test.c: Include stdint.h and libc-pointer-arith.h.
Don't include libc-internal.h.
* debug/pcprofile.c, elf/dl-tunables.c, elf/soinit.c, io/openat.c
* io/openat64.c, misc/ptrace.c, nptl/pthread_clock_gettime.c
* nptl/pthread_clock_settime.c, nptl/pthread_cond_common.c
* string/strcoll_l.c, sysdeps/nacl/brk.c
* sysdeps/unix/clock_settime.c
* sysdeps/unix/sysv/linux/i386/get_clockfreq.c
* sysdeps/unix/sysv/linux/ia64/get_clockfreq.c
* sysdeps/unix/sysv/linux/powerpc/get_clockfreq.c
* sysdeps/unix/sysv/linux/sparc/sparc64/get_clockfreq.c:
Don't include libc-internal.h.
* elf/get-dynamic-info.h, iconv/loop.c
* iconvdata/iso-2022-cn-ext.c, locale/weight.h, locale/weightwc.h
* misc/reboot.c, nis/nis_table.c, nptl_db/thread_dbP.h
* nscd/connections.c, resolv/res_send.c, soft-fp/fmadf4.c
* soft-fp/fmasf4.c, soft-fp/fmatf4.c, stdio-common/vfscanf.c
* sysdeps/ieee754/dbl-64/e_lgamma_r.c
* sysdeps/ieee754/dbl-64/k_rem_pio2.c
* sysdeps/ieee754/flt-32/e_lgammaf_r.c
* sysdeps/ieee754/flt-32/k_rem_pio2f.c
* sysdeps/ieee754/ldbl-128/k_tanl.c
* sysdeps/ieee754/ldbl-128ibm/k_tanl.c
* sysdeps/ieee754/ldbl-96/e_lgammal_r.c
* sysdeps/ieee754/ldbl-96/k_tanl.c, sysdeps/nptl/futex-internal.h:
Include libc-diag.h instead of libc-internal.h.
* elf/dl-load.c, elf/dl-reloc.c, locale/programs/locarchive.c
* nptl/nptl-init.c, string/strcspn.c, string/strspn.c
* malloc/malloc.c, sysdeps/i386/nptl/tls.h
* sysdeps/nacl/dl-map-segments.h, sysdeps/x86_64/atomic-machine.h
* sysdeps/unix/sysv/linux/spawni.c
* sysdeps/x86_64/nptl/tls.h:
Include libc-pointer-arith.h instead of libc-internal.h.
* elf/get-dynamic-info.h, sysdeps/nacl/dl-map-segments.h
* sysdeps/x86_64/atomic-machine.h:
Add multiple include guard.
2017-02-27 01:17:52 +00:00
|
|
|
#include <libc-pointer-arith.h>
|
2019-04-25 17:54:03 +00:00
|
|
|
#include <array_length.h>
|
|
|
|
#include <support/xunistd.h>
|
|
|
|
#include <support/check.h>
|
|
|
|
#include <support/next_to_fault.h>
|
1998-03-05 16:42:56 +00:00
|
|
|
|
1998-04-07 16:19:36 +00:00
|
|
|
#define IFS " \n\t"
|
1998-03-08 15:26:29 +00:00
|
|
|
|
1998-03-05 16:42:56 +00:00
|
|
|
struct test_case_struct
|
|
|
|
{
|
|
|
|
int retval;
|
|
|
|
const char *env;
|
|
|
|
const char *words;
|
|
|
|
int flags;
|
2001-02-26 19:32:00 +00:00
|
|
|
size_t wordc;
|
1998-03-05 16:42:56 +00:00
|
|
|
const char *wordv[10];
|
1998-04-07 16:19:36 +00:00
|
|
|
const char *ifs;
|
2019-04-25 17:54:03 +00:00
|
|
|
} static test_case[] =
|
1998-03-05 16:42:56 +00:00
|
|
|
{
|
1998-09-12 08:42:05 +00:00
|
|
|
/* Simple word- and field-splitting */
|
1998-04-07 16:19:36 +00:00
|
|
|
{ 0, NULL, "one", 0, 1, { "one", }, IFS },
|
|
|
|
{ 0, NULL, "one two", 0, 2, { "one", "two", }, IFS },
|
|
|
|
{ 0, NULL, "one two three", 0, 3, { "one", "two", "three", }, IFS },
|
|
|
|
{ 0, NULL, " \tfoo\t\tbar ", 0, 2, { "foo", "bar", }, IFS },
|
1998-09-15 21:24:37 +00:00
|
|
|
{ 0, NULL, "red , white blue", 0, 4, { "red", ",", "white", "blue", }, " ," },
|
1998-09-12 08:42:05 +00:00
|
|
|
{ 0, NULL, "one two three", 0, 3, { "one", "two", "three", }, "" },
|
|
|
|
{ 0, NULL, "one \"two three\"", 0, 2, { "one", "two three", }, IFS },
|
|
|
|
{ 0, NULL, "one \"two three\"", 0, 2, { "one", "two three", }, "" },
|
|
|
|
{ 0, "two three", "one \"$var\"", 0, 2, { "one", "two three", }, IFS },
|
|
|
|
{ 0, "two three", "one $var", 0, 3, { "one", "two", "three", }, IFS },
|
|
|
|
{ 0, "two three", "one \"$var\"", 0, 2, { "one", "two three", }, "" },
|
|
|
|
{ 0, "two three", "one $var", 0, 2, { "one", "two three", }, "" },
|
1998-09-14 15:22:40 +00:00
|
|
|
|
|
|
|
/* The non-whitespace IFS char at the end delimits the second field
|
|
|
|
* but does NOT start a new field. */
|
|
|
|
{ 0, ":abc:", "$var", 0, 2, { "", "abc", }, ":" },
|
|
|
|
|
1999-07-02 11:50:55 +00:00
|
|
|
{ 0, NULL, "$(echo :abc:)", 0, 2, { "", "abc", }, ":" },
|
|
|
|
{ 0, NULL, "$(echo :abc:\\ )", 0, 2, { "", "abc", }, ": " },
|
|
|
|
{ 0, NULL, "$(echo :abc\\ )", 0, 2, { "", "abc", }, ": " },
|
|
|
|
{ 0, ":abc:", "$(echo $var)", 0, 2, { "", "abc", }, ":" },
|
1998-09-15 21:24:37 +00:00
|
|
|
{ 0, NULL, ":abc:", 0, 1, { ":abc:", }, ":" },
|
1999-07-02 11:50:55 +00:00
|
|
|
{ 0, NULL, "$(echo :abc:)def", 0, 3, { "", "abc", "def", },
|
1999-04-12 23:45:52 +00:00
|
|
|
":" },
|
1999-07-02 11:50:55 +00:00
|
|
|
{ 0, NULL, "$(echo abc:de)f", 0, 2, { "abc", "def", }, ":" },
|
|
|
|
{ 0, NULL, "$(echo abc:de)f:ghi", 0, 2, { "abc", "def:ghi", },
|
1999-04-12 23:45:52 +00:00
|
|
|
":" },
|
1999-07-02 11:50:55 +00:00
|
|
|
{ 0, NULL, "abc:d$(echo ef:ghi)", 0, 2, { "abc:def", "ghi", },
|
1999-04-12 23:45:52 +00:00
|
|
|
":" },
|
1999-07-02 11:50:55 +00:00
|
|
|
{ 0, "abc:", "$var$(echo def:ghi)", 0, 3, { "abc", "def",
|
1999-04-12 23:45:52 +00:00
|
|
|
"ghi", }, ":" },
|
1999-07-02 11:50:55 +00:00
|
|
|
{ 0, "abc:d", "$var$(echo ef:ghi)", 0, 3, { "abc", "def",
|
1999-04-12 23:45:52 +00:00
|
|
|
"ghi", }, ":" },
|
1999-07-02 11:50:55 +00:00
|
|
|
{ 0, "def:ghi", "$(echo abc:)$var", 0, 3, { "abc", "def",
|
1999-04-12 23:45:52 +00:00
|
|
|
"ghi", }, ":" },
|
1999-07-02 11:50:55 +00:00
|
|
|
{ 0, "ef:ghi", "$(echo abc:d)$var", 0, 3, { "abc", "def",
|
1999-04-12 23:45:52 +00:00
|
|
|
"ghi", }, ":" },
|
1998-03-08 15:26:29 +00:00
|
|
|
|
|
|
|
/* Simple parameter expansion */
|
1998-04-07 16:19:36 +00:00
|
|
|
{ 0, "foo", "${var}", 0, 1, { "foo", }, IFS },
|
|
|
|
{ 0, "foo", "$var", 0, 1, { "foo", }, IFS },
|
|
|
|
{ 0, "foo", "\\\"$var\\\"", 0, 1, { "\"foo\"", }, IFS },
|
|
|
|
{ 0, "foo", "%$var%", 0, 1, { "%foo%", }, IFS },
|
|
|
|
{ 0, "foo", "-$var-", 0, 1, { "-foo-", }, IFS },
|
1998-03-08 15:26:29 +00:00
|
|
|
|
|
|
|
/* Simple quote removal */
|
1998-04-07 16:19:36 +00:00
|
|
|
{ 0, NULL, "\"quoted\"", 0, 1, { "quoted", }, IFS },
|
|
|
|
{ 0, "foo", "\"$var\"\"$var\"", 0, 1, { "foofoo", }, IFS },
|
|
|
|
{ 0, NULL, "'singly-quoted'", 0, 1, { "singly-quoted", }, IFS },
|
1999-04-12 09:07:36 +00:00
|
|
|
{ 0, NULL, "contin\\\nuation", 0, 1, { "continuation", }, IFS },
|
1999-11-05 22:33:33 +00:00
|
|
|
{ 0, NULL, "explicit ''", 0, 2, { "explicit", "", }, IFS },
|
|
|
|
{ 0, NULL, "explicit \"\"", 0, 2, { "explicit", "", }, IFS },
|
|
|
|
{ 0, NULL, "explicit ``", 0, 1, { "explicit", }, IFS },
|
1998-03-08 15:26:29 +00:00
|
|
|
|
|
|
|
/* Simple command substitution */
|
1998-04-07 16:19:36 +00:00
|
|
|
{ 0, NULL, "$(echo hello)", 0, 1, { "hello", }, IFS },
|
|
|
|
{ 0, NULL, "$( (echo hello) )", 0, 1, { "hello", }, IFS },
|
|
|
|
{ 0, NULL, "$((echo hello);(echo there))", 0, 2, { "hello", "there", }, IFS },
|
|
|
|
{ 0, NULL, "`echo one two`", 0, 2, { "one", "two", }, IFS },
|
|
|
|
{ 0, NULL, "$(echo ')')", 0, 1, { ")" }, IFS },
|
|
|
|
{ 0, NULL, "$(echo hello; echo)", 0, 1, { "hello", }, IFS },
|
2000-02-24 23:07:31 +00:00
|
|
|
{ 0, NULL, "a$(echo b)c", 0, 1, { "abc", }, IFS },
|
1998-03-08 15:26:29 +00:00
|
|
|
|
|
|
|
/* Simple arithmetic expansion */
|
1998-04-07 16:19:36 +00:00
|
|
|
{ 0, NULL, "$((1 + 1))", 0, 1, { "2", }, IFS },
|
|
|
|
{ 0, NULL, "$((2-3))", 0, 1, { "-1", }, IFS },
|
|
|
|
{ 0, NULL, "$((-1))", 0, 1, { "-1", }, IFS },
|
|
|
|
{ 0, NULL, "$[50+20]", 0, 1, { "70", }, IFS },
|
|
|
|
{ 0, NULL, "$(((2+3)*(4+5)))", 0, 1, { "45", }, IFS },
|
2003-09-18 02:54:32 +00:00
|
|
|
{ 0, NULL, "$((010))", 0, 1, { "8" }, IFS },
|
|
|
|
{ 0, NULL, "$((0x10))", 0, 1, { "16" }, IFS },
|
|
|
|
{ 0, NULL, "$((010+0x10))", 0, 1, { "24" }, IFS },
|
|
|
|
{ 0, NULL, "$((-010+0x10))", 0, 1, { "8" }, IFS },
|
|
|
|
{ 0, NULL, "$((-0x10+010))", 0, 1, { "-8" }, IFS },
|
1998-03-08 15:26:29 +00:00
|
|
|
|
|
|
|
/* Advanced parameter expansion */
|
1998-04-07 16:19:36 +00:00
|
|
|
{ 0, NULL, "${var:-bar}", 0, 1, { "bar", }, IFS },
|
|
|
|
{ 0, NULL, "${var-bar}", 0, 1, { "bar", }, IFS },
|
|
|
|
{ 0, "", "${var:-bar}", 0, 1, { "bar", }, IFS },
|
|
|
|
{ 0, "foo", "${var:-bar}", 0, 1, { "foo", }, IFS },
|
|
|
|
{ 0, "", "${var-bar}", 0, 0, { NULL, }, IFS },
|
|
|
|
{ 0, NULL, "${var:=bar}", 0, 1, { "bar", }, IFS },
|
|
|
|
{ 0, NULL, "${var=bar}", 0, 1, { "bar", }, IFS },
|
|
|
|
{ 0, "", "${var:=bar}", 0, 1, { "bar", }, IFS },
|
|
|
|
{ 0, "foo", "${var:=bar}", 0, 1, { "foo", }, IFS },
|
|
|
|
{ 0, "", "${var=bar}", 0, 0, { NULL, }, IFS },
|
|
|
|
{ 0, "foo", "${var:?bar}", 0, 1, { "foo", }, IFS },
|
|
|
|
{ 0, NULL, "${var:+bar}", 0, 0, { NULL, }, IFS },
|
|
|
|
{ 0, NULL, "${var+bar}", 0, 0, { NULL, }, IFS },
|
|
|
|
{ 0, "", "${var:+bar}", 0, 0, { NULL, }, IFS },
|
|
|
|
{ 0, "foo", "${var:+bar}", 0, 1, { "bar", }, IFS },
|
|
|
|
{ 0, "", "${var+bar}", 0, 1, { "bar", }, IFS },
|
|
|
|
{ 0, "12345", "${#var}", 0, 1, { "5", }, IFS },
|
|
|
|
{ 0, NULL, "${var:-'}'}", 0, 1, { "}", }, IFS },
|
|
|
|
{ 0, NULL, "${var-}", 0, 0, { NULL }, IFS },
|
|
|
|
|
1999-04-12 09:07:36 +00:00
|
|
|
{ 0, "pizza", "${var#${var}}", 0, 0, { NULL }, IFS },
|
|
|
|
{ 0, "pepperoni", "${var%$(echo oni)}", 0, 1, { "pepper" }, IFS },
|
|
|
|
{ 0, "6pack", "${var#$((6))}", 0, 1, { "pack" }, IFS },
|
|
|
|
{ 0, "b*witched", "${var##b*}", 0, 0, { NULL }, IFS },
|
|
|
|
{ 0, "b*witched", "${var##\"b*\"}", 0, 1, { "witched" }, IFS },
|
1998-04-07 16:19:36 +00:00
|
|
|
{ 0, "banana", "${var%na*}", 0, 1, { "bana", }, IFS },
|
|
|
|
{ 0, "banana", "${var%%na*}", 0, 1, { "ba", }, IFS },
|
|
|
|
{ 0, "borabora-island", "${var#*bora}", 0, 1, { "bora-island", }, IFS },
|
1999-04-12 09:07:36 +00:00
|
|
|
{ 0, "borabora-island", "${var##*bora}", 0, 1, { "-island", }, IFS },
|
|
|
|
{ 0, "coconut", "${var##\\*co}", 0, 1, { "coconut", }, IFS },
|
1998-04-07 16:19:36 +00:00
|
|
|
{ 0, "100%", "${var%0%}", 0, 1, { "10" }, IFS },
|
1998-03-08 15:26:29 +00:00
|
|
|
|
1998-03-12 17:26:19 +00:00
|
|
|
/* Pathname expansion */
|
1998-04-07 16:19:36 +00:00
|
|
|
{ 0, NULL, "???", 0, 2, { "one", "two", }, IFS },
|
|
|
|
{ 0, NULL, "[ot]??", 0, 2, { "one", "two", }, IFS },
|
|
|
|
{ 0, NULL, "t*", 0, 2, { "three", "two", }, IFS },
|
|
|
|
{ 0, NULL, "\"t\"*", 0, 2, { "three", "two", }, IFS },
|
1998-03-12 17:26:19 +00:00
|
|
|
|
|
|
|
/* Nested constructs */
|
1998-04-07 16:19:36 +00:00
|
|
|
{ 0, "one two", "$var", 0, 2, { "one", "two", }, IFS },
|
|
|
|
{ 0, "one two three", "$var", 0, 3, { "one", "two", "three", }, IFS },
|
|
|
|
{ 0, " \tfoo\t\tbar ", "$var", 0, 2, { "foo", "bar", }, IFS },
|
|
|
|
{ 0, " red , white blue", "$var", 0, 3, { "red", "white", "blue", }, ", \n\t" },
|
|
|
|
{ 0, " red , white blue", "\"$var\"", 0, 1, { " red , white blue", }, ", \n\t" },
|
|
|
|
{ 0, NULL, "\"$(echo hello there)\"", 0, 1, { "hello there", }, IFS },
|
|
|
|
{ 0, NULL, "\"$(echo \"hello there\")\"", 0, 1, { "hello there", }, IFS },
|
|
|
|
{ 0, NULL, "${var=one two} \"$var\"", 0, 3, { "one", "two", "one two", }, IFS },
|
|
|
|
{ 0, "1", "$(( $(echo 3)+$var ))", 0, 1, { "4", }, IFS },
|
|
|
|
{ 0, NULL, "\"$(echo \"*\")\"", 0, 1, { "*", }, IFS },
|
2000-02-24 23:07:31 +00:00
|
|
|
{ 0, NULL, "\"a\n\n$(echo)b\"", 0, 1, { "a\n\nb", }, IFS },
|
1998-04-07 16:19:36 +00:00
|
|
|
{ 0, "foo", "*$var*", 0, 1, { "*foo*", }, IFS },
|
|
|
|
{ 0, "o thr", "*$var*", 0, 2, { "two", "three" }, IFS },
|
1998-03-12 17:26:19 +00:00
|
|
|
|
1998-09-06 23:45:24 +00:00
|
|
|
/* Different IFS values */
|
1998-09-12 08:42:05 +00:00
|
|
|
{ 0, "a b\tc\nd ", "$var", 0, 4, { "a", "b", "c", "d" }, NULL /* unset */ },
|
|
|
|
{ 0, "a b\tc d ", "$var", 0, 1, { "a b\tc d " }, "" /* `null' */ },
|
|
|
|
{ 0, "a,b c\n, d", "$var", 0, 3, { "a", "b c", " d" }, "\t\n," },
|
1998-09-06 23:45:24 +00:00
|
|
|
|
1998-03-12 17:26:19 +00:00
|
|
|
/* Other things that should succeed */
|
1998-04-07 16:19:36 +00:00
|
|
|
{ 0, NULL, "\\*\"|&;<>\"\\(\\)\\{\\}", 0, 1, { "*|&;<>(){}", }, IFS },
|
|
|
|
{ 0, "???", "$var", 0, 1, { "???", }, IFS },
|
|
|
|
{ 0, NULL, "$var", 0, 0, { NULL, }, IFS },
|
|
|
|
{ 0, NULL, "\"\\n\"", 0, 1, { "\\n", }, IFS },
|
|
|
|
{ 0, NULL, "", 0, 0, { NULL, }, IFS },
|
1998-03-12 17:26:19 +00:00
|
|
|
|
2000-02-24 23:07:31 +00:00
|
|
|
/* Flags not already covered (testit() has special handling for these) */
|
|
|
|
{ 0, NULL, "one two", WRDE_DOOFFS, 2, { "one", "two", }, IFS },
|
|
|
|
{ 0, NULL, "appended", WRDE_APPEND, 3, { "pre1", "pre2", "appended", }, IFS },
|
|
|
|
{ 0, NULL, "appended", WRDE_DOOFFS|WRDE_APPEND, 3, { "pre1", "pre2", "appended", }, IFS },
|
|
|
|
|
1998-03-12 17:26:19 +00:00
|
|
|
/* Things that should fail */
|
1998-09-06 23:45:24 +00:00
|
|
|
{ WRDE_BADCHAR, NULL, "new\nline", 0, 0, { NULL, }, "" /* \n not IFS */ },
|
1998-04-07 16:19:36 +00:00
|
|
|
{ WRDE_BADCHAR, NULL, "pipe|symbol", 0, 0, { NULL, }, IFS },
|
|
|
|
{ WRDE_BADCHAR, NULL, "&ersand", 0, 0, { NULL, }, IFS },
|
|
|
|
{ WRDE_BADCHAR, NULL, "semi;colon", 0, 0, { NULL, }, IFS },
|
|
|
|
{ WRDE_BADCHAR, NULL, "<greater", 0, 0, { NULL, }, IFS },
|
|
|
|
{ WRDE_BADCHAR, NULL, "less>", 0, 0, { NULL, }, IFS },
|
|
|
|
{ WRDE_BADCHAR, NULL, "(open-paren", 0, 0, { NULL, }, IFS },
|
|
|
|
{ WRDE_BADCHAR, NULL, "close-paren)", 0, 0, { NULL, }, IFS },
|
|
|
|
{ WRDE_BADCHAR, NULL, "{open-brace", 0, 0, { NULL, }, IFS },
|
|
|
|
{ WRDE_BADCHAR, NULL, "close-brace}", 0, 0, { NULL, }, IFS },
|
|
|
|
{ WRDE_BADVAL, NULL, "$var", WRDE_UNDEF, 0, { NULL, }, IFS },
|
|
|
|
{ WRDE_BADVAL, NULL, "$9", WRDE_UNDEF, 0, { NULL, }, IFS },
|
|
|
|
{ WRDE_SYNTAX, NULL, "$[50+20))", 0, 0, { NULL, }, IFS },
|
|
|
|
{ WRDE_SYNTAX, NULL, "${%%noparam}", 0, 0, { NULL, }, IFS },
|
|
|
|
{ WRDE_SYNTAX, NULL, "${missing-brace", 0, 0, { NULL, }, IFS },
|
2000-02-24 23:07:31 +00:00
|
|
|
{ WRDE_SYNTAX, NULL, "$(for i in)", 0, 0, { NULL, }, IFS },
|
1998-04-07 16:19:36 +00:00
|
|
|
{ WRDE_SYNTAX, NULL, "$((2+))", 0, 0, { NULL, }, IFS },
|
|
|
|
{ WRDE_SYNTAX, NULL, "`", 0, 0, { NULL, }, IFS },
|
2003-09-18 02:54:32 +00:00
|
|
|
{ WRDE_SYNTAX, NULL, "$((010+4+))", 0, 0, { NULL }, IFS },
|
1998-04-07 16:19:36 +00:00
|
|
|
|
2015-03-09 14:22:36 +00:00
|
|
|
{ WRDE_SYNTAX, NULL, "`\\", 0, 0, { NULL, }, IFS }, /* BZ 18042 */
|
|
|
|
{ WRDE_SYNTAX, NULL, "${", 0, 0, { NULL, }, IFS }, /* BZ 18043 */
|
|
|
|
{ WRDE_SYNTAX, NULL, "L${a:", 0, 0, { NULL, }, IFS }, /* BZ 18043#c4 */
|
1998-03-05 16:42:56 +00:00
|
|
|
};
|
|
|
|
|
1998-03-06 11:39:36 +00:00
|
|
|
static int testit (struct test_case_struct *tc);
|
Update.
1998-04-20 18:00 Ulrich Drepper <drepper@cygnus.com>
* libc.map: Add __dgettext to GLIBC_2.0 and __libc_longjmp, and
__libc_siglongjmp to GLIBC_2.1.
* elf/dl-minimal.c (__assert_perror_fail): Don't use strerror, use
__strerror_r.
* iconv/Makefile: Don't run tests now.
* iconv/iconv_prog.c (process_block): If loop is repeated, call iconv
with correct output buffer.
Major rewrite of the low-level gconv functionality.
* iconv/gconv.c: Rewritten.
* iconv/gconv.h: Likewise.
* iconv/gconv_builtin.c: Likewise.
* iconv/gconv_builtin.h: Likewise.
* iconv/gconv_conf.c: Likewise.
* iconv/gconv_int.h: Likewise.
* iconv/gconv_open.c: Likewise.
* iconv/gconv_simple.c: Likewise.
* iconv/iconv.c: Likewise.
* iconvdata/8bit-gap.c: Likewise.
* iconvdata/8bit-generic.c: Likewise.
* iconvdata/Makefile: Likewise.
* iconvdata/big5.c: Likewise.
* iconvdata/cns11643.c: Likewise.
* iconvdata/cns11643.h: Likewise.
* iconvdata/cns11643l1.c: Likewise.
* iconvdata/cns11643l1.h: Likewise.
* iconvdata/ebcdic-at-de-a.c: Likewise.
* iconvdata/ebcdic-at-de.c: Likewise.
* iconvdata/ebcdic-ca-fr.c: Likewise.
* iconvdata/euccn.c: Likewise.
* iconvdata/eucjp.c: Likewise.
* iconvdata/euckr.c: Likewise.
* iconvdata/euctw.c: Likewise.
* iconvdata/gb2312.c: Likewise.
* iconvdata/gb2312.h: Likewise.
* iconvdata/hp-roman8.c: Likewise.
* iconvdata/iso646.c: Likewise.
* iconvdata/iso6937.c: Likewise.
* iconvdata/iso8859-1.c: Likewise.
* iconvdata/iso8859-10.c: Likewise.
* iconvdata/iso8859-2.c: Likewise.
* iconvdata/iso8859-3.c: Likewise.
* iconvdata/iso8859-4.c: Likewise.
* iconvdata/iso8859-5.c: Likewise.
* iconvdata/iso8859-6.c: Likewise.
* iconvdata/iso8859-7.c: Likewise.
* iconvdata/iso8859-8.c: Likewise.
* iconvdata/iso8859-9.c: Likewise.
* iconvdata/jis0201.c: Likewise.
* iconvdata/jis0201.h: Likewise.
* iconvdata/jis0208.c: Likewise.
* iconvdata/jis0208.h: Likewise.
* iconvdata/jis0212.c: Likewise.
* iconvdata/jis0212.h: Likewise.
* iconvdata/johab.c: Likewise.
* iconvdata/koi-8.c: Likewise.
* iconvdata/koi8-r.c: Likewise.
* iconvdata/ksc5601.c: Likewise.
* iconvdata/ksc5601.h: Likewise.
* iconvdata/latin-greek-1.c: Likewise.
* iconvdata/latin-greek.c: Likewise.
* iconvdata/run-iconv-test.sh: Likewise.
* iconvdata/sjis.c: Likewise.
* iconvdata/t61.c: Likewise.
* iconvdata/uhc.c: Likewise.
* wcsmbs/btowc.c: Likewise.
* wcsmbs/mbrtowc.c: Likewise.
* wcsmbs/mbsnrtowcs.c: Likewise.
* wcsmbs/mbsrtowcs.c: Likewise.
* wcsmbs/wcrtomb.c: Likewise.
* wcsmbs/wcsmbsload.c: Likewise.
* wcsmbs/wcsnrtombs.c: Likewise.
* wcsmbs/wcsrtombs.c: Likewise.
* wcsmbs/wctob.c: Likewise.
* iconv/loop.c: New file.
* iconv/skeleton.c: New file.
* stdlib/mblen.c: Handle empty input string correctly.
* stdlib/mbtowc.c: Likewise.
* posix/getopt.c: Various cleanups.
* sysdeps/arm/bits/setjmp.h: Add copyright text.
* sysdeps/i386/bits/setjmp.h: Likewise.
* sysdeps/m68k/bits/setjmp.h: Likewise.
* sysdeps/powerpc/bits/setjmp.h: Likewise.
* sysdeps/sparc/sparc32/bits/setjmp.h: Likewise.
* sysdeps/generic/longjmp.c: Rename function to __libc_siglongjmp
and make longjmp weak alias.
1998-04-18 20:29 Philip Blundell <Philip.Blundell@pobox.com>
* iconv/Makefile (routines): Only include gconv_dl if building for
an ELF system - dynamic linking is not available on a.out.
(CFLAGS-gconv_conf.c): Define STATIC_GCONV if omitting gconv_dl
due to above check.
* iconv/gconv_db.c: If STATIC_GCONV defined, don't try to call
routines from gconv_dl.
1998-04-17 Gordon Matzigkeit <gord@profitpress.com>
* csu/init.c (_IO_stdin_used): Protect with USE_IN_LIBIO so that
we can compile without libio.
1998-04-20 16:28 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/mach/hurd/Subdirs: Remove login.
1998-04-11 Gordon Matzigkeit <gord@profitpress.com>
* db2/compat.h: Include <errno.h>, to make sure we get the
definition of EFTYPE before we define it ourselves.
1998-04-10 Gordon Matzigkeit <gord@profitpress.com>
* sysdeps/generic/bits/socket.h: Protect against multiple inclusion.
* sysdeps/mach/hurd/bits/ioctls.h: Likewise.
Fix typo to allow inclusion from sys/ioctl.h again.
1998-04-16 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* iconvdata/*.[ch]: Clean up namespace. Optimize character lookup.
1998-04-16 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* libc.map: Export __strerror_r. Remove _strerror_internal.
1998-04-16 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* sysdeps/generic/strcasestr.c: Undefine strcasestr, not strstr.
Also undefine __strcasestr.
1998-04-16 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* posix/regex.c: Rename __re_max_failures back to re_max_failures,
aliases do not work with global variables due to copy relocations.
1998-04-20 15:12 Ulrich Drepper <drepper@cygnus.com>
* manual/creature.texi: Fix type. Patch by Andreas Schwab.
1998-04-20 13:47 Ulrich Drepper <drepper@cygnus.com>
* signal/sighold.c: Include stddef.h for NULL definition.
* signal/sigrelse.c: Likewise.
* sysdeps/posix/sigignore.c: Likewise.
* sysdeps/posix/sigset.c: Likewise.
* sysdeps/posix/waitid.c: Likewise.
* sysdeps/unix/sysv/linux/rt_sigsuspend.c: Likewise.
* sysdeps/unix/sysv/linux/rt_sigtimedwait.c: Likewise.
* sysdeps/unix/sysv/linux/sigwaitinfo.c: Likewise.
* wcsmbs/mbsrtowcs.c: Include stdlib.h for MB_CUR_MAX.
Patch by Franz Sirl <Franz.Sirl-kernel@lauterbach.com>.
1998-04-13 Mark Kettenis <kettenis@phys.uva.nl>
* login/Makefile (headers): Remove utmpx.h and bits/utmpx.h.
* login/getutent.c (getutxent): Remove alias.
* login/getutent_r.c (setutxent, pututxline, endutxent):
Remove aliases.
* login/getutid.c (getutxid): Remove alias.
* login/getutline.c (getutxline): Remove alias.
* login/utmp.h: Add prototypes for __updwtmp, __getutent,
__getutid, __getutline and __pututline.
* login/utmpx.h: Moved to ...
* sysdeps/gnu/utmpx.h: ... here. [__USE_GNU]: Define UTMPX_FILE,
UTMPX_FILENAME, WTMPX_FILE and WTMPX_FILENAME, declare utmpxname
and updwtmpx.
* login/updwtmp.c: Moved to ...
* sysdeps/generic/updwtmp.c: ... here. (updwtmp): Generalized by
allowing file name transformation.
* sysdeps/gnu/updwtmp.c: New file. Use generic implementation with
additional file name transformation.
* sysdeps/unix/sysv/linux/updwtmp.c: Likewise.
* login/utmp_file.c: Moved to ...
* sysdeps/generic/utmp_file.c: ... here. (setutent_file):
Generalized by allowing file name transformation. Do not
print error message. Library functions should not print them.
Reported by Jim Meyering.
* sysdeps/gnu/utmp_file.c: New file. Use generic implementation
with additional file name transformation.
* sysdeps/unix/sysv/linux/utmp_file.c: Likewise.
* sysdeps/gnu/Makefile [$(subdir)=login] (sysdep_routines): Add
setutxent, getutxent, endutxent, getutxid, getutxid, getutxline,
pututxline, utmpxname and updwtmpx. (sysdep_headers): Add utmpx.h
and bits/utmpx.h.
* sysdeps/gnu/bits/utmpx.h [__USE_GNU] Include paths.h.
(_PATH_UTMPX): Define to _PATH_UTMP. (_PATH_WTMPX): Define to
_PATH_WTMPX. (RUN_LVL): Define only if __USE_GNU. (ACCOUNTING):
Define if __USE_GNU.
* sysdeps/gnu/setutxent.c: New file.
* sysdeps/gnu/getutxent.c: New file.
* sysdeps/gnu/endutxent.c: New file.
* sysdeps/gnu/getutxid.c: New file.
* sysdeps/gnu/getutxline.c: New file.
* sysdeps/gnu/pututxline.c: New file.
* sysdeps/gnu/utmpxname.c: New file.
* sysdeps/gnu/updwtmpx.c: New file.
* sysdeps/unix/sysv/linux/paths.h (_PATH_UTMP_DB): Remove.
* sysdeps/generic/bits/utmpx.h: Remove.
1998-04-20 Ulrich Drepper <drepper@cygnus.com>
* posix/wordexp-test.c (main): Initialize ifs element of ts for
~root test.
1998-04-17 07:53 H.J. Lu <hjl@gnu.org>
* sysdeps/unix/sysv/linux/i386/s_pread64.S: Fix a typo.
1998-04-17 11:32 Ulrich Drepper <drepper@cygnus.com>
* libio/oldfileops.c (_IO_old_file_seekoff): Define temporary st
variable using _G_stat64.
* libio/fileops.c: Remove macro definition of fstat, it is in the
global header.
Reported by Thorsten Kukuk <kukuk@weber.uni-paderborn.de>.
1998-04-17 Philip Blundell <pb@nexus.co.uk>
* sysdeps/arm/strlen.S: New file, based on code by Matthew Wilcox
<willy@odie.barnet.ac.uk>.
1998-04-16 Philip Blundell <Philip.Blundell@pobox.com>
* inet/netinet/in.h (IN6_IS_ADDR_MC_NODELOCAL): New macro,
required by IPv6 Basic API.
(IN6_IS_ADDR_MC_LINKLOCAL): Likewise.
(IN6_IS_ADDR_MC_SITELOCAL): Likewise.
(IN6_IS_ADDR_MC_ORGLOCAL): Likewise.
(IN6_IS_ADDR_MC_GLOBAL): Likewise.
1998-04-20 18:41:05 +00:00
|
|
|
static int tests;
|
1998-03-06 11:39:36 +00:00
|
|
|
|
2000-12-27 20:26:07 +00:00
|
|
|
static void
|
1998-03-10 18:04:16 +00:00
|
|
|
command_line_test (const char *words)
|
|
|
|
{
|
|
|
|
wordexp_t we;
|
|
|
|
int i;
|
|
|
|
int retval = wordexp (words, &we, 0);
|
2019-04-25 17:54:03 +00:00
|
|
|
printf ("info: wordexp returned %d\n", retval);
|
1998-03-10 18:04:16 +00:00
|
|
|
for (i = 0; i < we.we_wordc; i++)
|
2019-04-25 17:54:03 +00:00
|
|
|
printf ("info: we_wordv[%d] = \"%s\"\n", i, we.we_wordv[i]);
|
1998-03-10 18:04:16 +00:00
|
|
|
}
|
|
|
|
|
2019-04-25 17:54:03 +00:00
|
|
|
static int
|
|
|
|
do_test (int argc, char *argv[])
|
1998-03-05 16:42:56 +00:00
|
|
|
{
|
2019-04-25 17:54:03 +00:00
|
|
|
const char *globfile[] = { "one", "two", "three" };
|
1998-03-12 17:26:19 +00:00
|
|
|
char tmpdir[32];
|
1998-03-06 11:39:36 +00:00
|
|
|
struct passwd *pw;
|
1998-03-18 14:42:25 +00:00
|
|
|
const char *cwd;
|
1998-03-05 16:42:56 +00:00
|
|
|
int test;
|
2000-02-24 23:07:31 +00:00
|
|
|
struct test_case_struct ts;
|
1998-03-05 16:42:56 +00:00
|
|
|
|
1998-03-10 18:04:16 +00:00
|
|
|
if (argc > 1)
|
|
|
|
{
|
|
|
|
command_line_test (argv[1]);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
1998-03-16 13:39:33 +00:00
|
|
|
cwd = getcwd (NULL, 0);
|
1998-03-12 17:26:19 +00:00
|
|
|
|
|
|
|
/* Set up arena for pathname expansion */
|
|
|
|
tmpnam (tmpdir);
|
2019-04-25 17:54:03 +00:00
|
|
|
xmkdir (tmpdir, S_IRWXU);
|
|
|
|
TEST_VERIFY_EXIT (chdir (tmpdir) == 0);
|
1998-03-16 13:39:33 +00:00
|
|
|
|
2019-04-25 17:54:03 +00:00
|
|
|
for (int i = 0; i < array_length (globfile); ++i)
|
|
|
|
{
|
|
|
|
int fd = xopen (globfile[i], O_WRONLY|O_CREAT|O_TRUNC,
|
|
|
|
S_IRUSR | S_IWUSR);
|
|
|
|
xclose (fd);
|
1998-03-16 13:39:33 +00:00
|
|
|
}
|
1998-03-12 17:26:19 +00:00
|
|
|
|
2019-04-25 17:54:03 +00:00
|
|
|
for (test = 0; test < array_length (test_case); test++)
|
|
|
|
TEST_COMPARE (testit (&test_case[test]), 0);
|
1998-03-11 15:33:24 +00:00
|
|
|
|
1999-11-05 22:33:33 +00:00
|
|
|
/* Tilde-expansion tests. */
|
1998-03-06 11:39:36 +00:00
|
|
|
pw = getpwnam ("root");
|
|
|
|
if (pw != NULL)
|
1998-03-05 16:42:56 +00:00
|
|
|
{
|
2000-02-24 23:07:31 +00:00
|
|
|
ts.retval = 0;
|
|
|
|
ts.env = NULL;
|
|
|
|
ts.words = "~root ";
|
|
|
|
ts.flags = 0;
|
|
|
|
ts.wordc = 1;
|
|
|
|
ts.wordv[0] = pw->pw_dir;
|
|
|
|
ts.ifs = IFS;
|
|
|
|
|
2019-04-25 17:54:03 +00:00
|
|
|
TEST_COMPARE (testit (&ts), 0);
|
2000-03-14 09:09:43 +00:00
|
|
|
|
|
|
|
ts.retval = 0;
|
|
|
|
ts.env = pw->pw_dir;
|
|
|
|
ts.words = "${var#~root}x";
|
|
|
|
ts.flags = 0;
|
|
|
|
ts.wordc = 1;
|
|
|
|
ts.wordv[0] = "x";
|
|
|
|
ts.ifs = IFS;
|
|
|
|
|
2019-04-25 17:54:03 +00:00
|
|
|
TEST_COMPARE (testit (&ts), 0);
|
2000-02-24 23:07:31 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* "~" expands to value of $HOME when HOME is set */
|
|
|
|
|
|
|
|
setenv ("HOME", "/dummy/home", 1);
|
|
|
|
ts.retval = 0;
|
|
|
|
ts.env = NULL;
|
|
|
|
ts.words = "~ ~/foo";
|
|
|
|
ts.flags = 0;
|
|
|
|
ts.wordc = 2;
|
|
|
|
ts.wordv[0] = "/dummy/home";
|
|
|
|
ts.wordv[1] = "/dummy/home/foo";
|
|
|
|
ts.ifs = IFS;
|
|
|
|
|
2019-04-25 17:54:03 +00:00
|
|
|
TEST_COMPARE (testit (&ts), 0);
|
1998-03-06 11:39:36 +00:00
|
|
|
|
2000-02-24 23:07:31 +00:00
|
|
|
/* "~" expands to home dir from passwd file if HOME is not set */
|
|
|
|
|
|
|
|
pw = getpwuid (getuid ());
|
|
|
|
if (pw != NULL)
|
|
|
|
{
|
|
|
|
unsetenv ("HOME");
|
1998-03-06 11:39:36 +00:00
|
|
|
ts.retval = 0;
|
|
|
|
ts.env = NULL;
|
2000-02-24 23:07:31 +00:00
|
|
|
ts.words = "~";
|
1998-03-06 11:39:36 +00:00
|
|
|
ts.flags = 0;
|
|
|
|
ts.wordc = 1;
|
|
|
|
ts.wordv[0] = pw->pw_dir;
|
Update.
1998-04-20 18:00 Ulrich Drepper <drepper@cygnus.com>
* libc.map: Add __dgettext to GLIBC_2.0 and __libc_longjmp, and
__libc_siglongjmp to GLIBC_2.1.
* elf/dl-minimal.c (__assert_perror_fail): Don't use strerror, use
__strerror_r.
* iconv/Makefile: Don't run tests now.
* iconv/iconv_prog.c (process_block): If loop is repeated, call iconv
with correct output buffer.
Major rewrite of the low-level gconv functionality.
* iconv/gconv.c: Rewritten.
* iconv/gconv.h: Likewise.
* iconv/gconv_builtin.c: Likewise.
* iconv/gconv_builtin.h: Likewise.
* iconv/gconv_conf.c: Likewise.
* iconv/gconv_int.h: Likewise.
* iconv/gconv_open.c: Likewise.
* iconv/gconv_simple.c: Likewise.
* iconv/iconv.c: Likewise.
* iconvdata/8bit-gap.c: Likewise.
* iconvdata/8bit-generic.c: Likewise.
* iconvdata/Makefile: Likewise.
* iconvdata/big5.c: Likewise.
* iconvdata/cns11643.c: Likewise.
* iconvdata/cns11643.h: Likewise.
* iconvdata/cns11643l1.c: Likewise.
* iconvdata/cns11643l1.h: Likewise.
* iconvdata/ebcdic-at-de-a.c: Likewise.
* iconvdata/ebcdic-at-de.c: Likewise.
* iconvdata/ebcdic-ca-fr.c: Likewise.
* iconvdata/euccn.c: Likewise.
* iconvdata/eucjp.c: Likewise.
* iconvdata/euckr.c: Likewise.
* iconvdata/euctw.c: Likewise.
* iconvdata/gb2312.c: Likewise.
* iconvdata/gb2312.h: Likewise.
* iconvdata/hp-roman8.c: Likewise.
* iconvdata/iso646.c: Likewise.
* iconvdata/iso6937.c: Likewise.
* iconvdata/iso8859-1.c: Likewise.
* iconvdata/iso8859-10.c: Likewise.
* iconvdata/iso8859-2.c: Likewise.
* iconvdata/iso8859-3.c: Likewise.
* iconvdata/iso8859-4.c: Likewise.
* iconvdata/iso8859-5.c: Likewise.
* iconvdata/iso8859-6.c: Likewise.
* iconvdata/iso8859-7.c: Likewise.
* iconvdata/iso8859-8.c: Likewise.
* iconvdata/iso8859-9.c: Likewise.
* iconvdata/jis0201.c: Likewise.
* iconvdata/jis0201.h: Likewise.
* iconvdata/jis0208.c: Likewise.
* iconvdata/jis0208.h: Likewise.
* iconvdata/jis0212.c: Likewise.
* iconvdata/jis0212.h: Likewise.
* iconvdata/johab.c: Likewise.
* iconvdata/koi-8.c: Likewise.
* iconvdata/koi8-r.c: Likewise.
* iconvdata/ksc5601.c: Likewise.
* iconvdata/ksc5601.h: Likewise.
* iconvdata/latin-greek-1.c: Likewise.
* iconvdata/latin-greek.c: Likewise.
* iconvdata/run-iconv-test.sh: Likewise.
* iconvdata/sjis.c: Likewise.
* iconvdata/t61.c: Likewise.
* iconvdata/uhc.c: Likewise.
* wcsmbs/btowc.c: Likewise.
* wcsmbs/mbrtowc.c: Likewise.
* wcsmbs/mbsnrtowcs.c: Likewise.
* wcsmbs/mbsrtowcs.c: Likewise.
* wcsmbs/wcrtomb.c: Likewise.
* wcsmbs/wcsmbsload.c: Likewise.
* wcsmbs/wcsnrtombs.c: Likewise.
* wcsmbs/wcsrtombs.c: Likewise.
* wcsmbs/wctob.c: Likewise.
* iconv/loop.c: New file.
* iconv/skeleton.c: New file.
* stdlib/mblen.c: Handle empty input string correctly.
* stdlib/mbtowc.c: Likewise.
* posix/getopt.c: Various cleanups.
* sysdeps/arm/bits/setjmp.h: Add copyright text.
* sysdeps/i386/bits/setjmp.h: Likewise.
* sysdeps/m68k/bits/setjmp.h: Likewise.
* sysdeps/powerpc/bits/setjmp.h: Likewise.
* sysdeps/sparc/sparc32/bits/setjmp.h: Likewise.
* sysdeps/generic/longjmp.c: Rename function to __libc_siglongjmp
and make longjmp weak alias.
1998-04-18 20:29 Philip Blundell <Philip.Blundell@pobox.com>
* iconv/Makefile (routines): Only include gconv_dl if building for
an ELF system - dynamic linking is not available on a.out.
(CFLAGS-gconv_conf.c): Define STATIC_GCONV if omitting gconv_dl
due to above check.
* iconv/gconv_db.c: If STATIC_GCONV defined, don't try to call
routines from gconv_dl.
1998-04-17 Gordon Matzigkeit <gord@profitpress.com>
* csu/init.c (_IO_stdin_used): Protect with USE_IN_LIBIO so that
we can compile without libio.
1998-04-20 16:28 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/mach/hurd/Subdirs: Remove login.
1998-04-11 Gordon Matzigkeit <gord@profitpress.com>
* db2/compat.h: Include <errno.h>, to make sure we get the
definition of EFTYPE before we define it ourselves.
1998-04-10 Gordon Matzigkeit <gord@profitpress.com>
* sysdeps/generic/bits/socket.h: Protect against multiple inclusion.
* sysdeps/mach/hurd/bits/ioctls.h: Likewise.
Fix typo to allow inclusion from sys/ioctl.h again.
1998-04-16 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* iconvdata/*.[ch]: Clean up namespace. Optimize character lookup.
1998-04-16 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* libc.map: Export __strerror_r. Remove _strerror_internal.
1998-04-16 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* sysdeps/generic/strcasestr.c: Undefine strcasestr, not strstr.
Also undefine __strcasestr.
1998-04-16 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* posix/regex.c: Rename __re_max_failures back to re_max_failures,
aliases do not work with global variables due to copy relocations.
1998-04-20 15:12 Ulrich Drepper <drepper@cygnus.com>
* manual/creature.texi: Fix type. Patch by Andreas Schwab.
1998-04-20 13:47 Ulrich Drepper <drepper@cygnus.com>
* signal/sighold.c: Include stddef.h for NULL definition.
* signal/sigrelse.c: Likewise.
* sysdeps/posix/sigignore.c: Likewise.
* sysdeps/posix/sigset.c: Likewise.
* sysdeps/posix/waitid.c: Likewise.
* sysdeps/unix/sysv/linux/rt_sigsuspend.c: Likewise.
* sysdeps/unix/sysv/linux/rt_sigtimedwait.c: Likewise.
* sysdeps/unix/sysv/linux/sigwaitinfo.c: Likewise.
* wcsmbs/mbsrtowcs.c: Include stdlib.h for MB_CUR_MAX.
Patch by Franz Sirl <Franz.Sirl-kernel@lauterbach.com>.
1998-04-13 Mark Kettenis <kettenis@phys.uva.nl>
* login/Makefile (headers): Remove utmpx.h and bits/utmpx.h.
* login/getutent.c (getutxent): Remove alias.
* login/getutent_r.c (setutxent, pututxline, endutxent):
Remove aliases.
* login/getutid.c (getutxid): Remove alias.
* login/getutline.c (getutxline): Remove alias.
* login/utmp.h: Add prototypes for __updwtmp, __getutent,
__getutid, __getutline and __pututline.
* login/utmpx.h: Moved to ...
* sysdeps/gnu/utmpx.h: ... here. [__USE_GNU]: Define UTMPX_FILE,
UTMPX_FILENAME, WTMPX_FILE and WTMPX_FILENAME, declare utmpxname
and updwtmpx.
* login/updwtmp.c: Moved to ...
* sysdeps/generic/updwtmp.c: ... here. (updwtmp): Generalized by
allowing file name transformation.
* sysdeps/gnu/updwtmp.c: New file. Use generic implementation with
additional file name transformation.
* sysdeps/unix/sysv/linux/updwtmp.c: Likewise.
* login/utmp_file.c: Moved to ...
* sysdeps/generic/utmp_file.c: ... here. (setutent_file):
Generalized by allowing file name transformation. Do not
print error message. Library functions should not print them.
Reported by Jim Meyering.
* sysdeps/gnu/utmp_file.c: New file. Use generic implementation
with additional file name transformation.
* sysdeps/unix/sysv/linux/utmp_file.c: Likewise.
* sysdeps/gnu/Makefile [$(subdir)=login] (sysdep_routines): Add
setutxent, getutxent, endutxent, getutxid, getutxid, getutxline,
pututxline, utmpxname and updwtmpx. (sysdep_headers): Add utmpx.h
and bits/utmpx.h.
* sysdeps/gnu/bits/utmpx.h [__USE_GNU] Include paths.h.
(_PATH_UTMPX): Define to _PATH_UTMP. (_PATH_WTMPX): Define to
_PATH_WTMPX. (RUN_LVL): Define only if __USE_GNU. (ACCOUNTING):
Define if __USE_GNU.
* sysdeps/gnu/setutxent.c: New file.
* sysdeps/gnu/getutxent.c: New file.
* sysdeps/gnu/endutxent.c: New file.
* sysdeps/gnu/getutxid.c: New file.
* sysdeps/gnu/getutxline.c: New file.
* sysdeps/gnu/pututxline.c: New file.
* sysdeps/gnu/utmpxname.c: New file.
* sysdeps/gnu/updwtmpx.c: New file.
* sysdeps/unix/sysv/linux/paths.h (_PATH_UTMP_DB): Remove.
* sysdeps/generic/bits/utmpx.h: Remove.
1998-04-20 Ulrich Drepper <drepper@cygnus.com>
* posix/wordexp-test.c (main): Initialize ifs element of ts for
~root test.
1998-04-17 07:53 H.J. Lu <hjl@gnu.org>
* sysdeps/unix/sysv/linux/i386/s_pread64.S: Fix a typo.
1998-04-17 11:32 Ulrich Drepper <drepper@cygnus.com>
* libio/oldfileops.c (_IO_old_file_seekoff): Define temporary st
variable using _G_stat64.
* libio/fileops.c: Remove macro definition of fstat, it is in the
global header.
Reported by Thorsten Kukuk <kukuk@weber.uni-paderborn.de>.
1998-04-17 Philip Blundell <pb@nexus.co.uk>
* sysdeps/arm/strlen.S: New file, based on code by Matthew Wilcox
<willy@odie.barnet.ac.uk>.
1998-04-16 Philip Blundell <Philip.Blundell@pobox.com>
* inet/netinet/in.h (IN6_IS_ADDR_MC_NODELOCAL): New macro,
required by IPv6 Basic API.
(IN6_IS_ADDR_MC_LINKLOCAL): Likewise.
(IN6_IS_ADDR_MC_SITELOCAL): Likewise.
(IN6_IS_ADDR_MC_ORGLOCAL): Likewise.
(IN6_IS_ADDR_MC_GLOBAL): Likewise.
1998-04-20 18:41:05 +00:00
|
|
|
ts.ifs = IFS;
|
1998-03-06 11:39:36 +00:00
|
|
|
|
2019-04-25 17:54:03 +00:00
|
|
|
TEST_COMPARE (testit (&ts), 0);
|
1998-03-06 11:39:36 +00:00
|
|
|
}
|
|
|
|
|
Update.
1998-04-20 18:00 Ulrich Drepper <drepper@cygnus.com>
* libc.map: Add __dgettext to GLIBC_2.0 and __libc_longjmp, and
__libc_siglongjmp to GLIBC_2.1.
* elf/dl-minimal.c (__assert_perror_fail): Don't use strerror, use
__strerror_r.
* iconv/Makefile: Don't run tests now.
* iconv/iconv_prog.c (process_block): If loop is repeated, call iconv
with correct output buffer.
Major rewrite of the low-level gconv functionality.
* iconv/gconv.c: Rewritten.
* iconv/gconv.h: Likewise.
* iconv/gconv_builtin.c: Likewise.
* iconv/gconv_builtin.h: Likewise.
* iconv/gconv_conf.c: Likewise.
* iconv/gconv_int.h: Likewise.
* iconv/gconv_open.c: Likewise.
* iconv/gconv_simple.c: Likewise.
* iconv/iconv.c: Likewise.
* iconvdata/8bit-gap.c: Likewise.
* iconvdata/8bit-generic.c: Likewise.
* iconvdata/Makefile: Likewise.
* iconvdata/big5.c: Likewise.
* iconvdata/cns11643.c: Likewise.
* iconvdata/cns11643.h: Likewise.
* iconvdata/cns11643l1.c: Likewise.
* iconvdata/cns11643l1.h: Likewise.
* iconvdata/ebcdic-at-de-a.c: Likewise.
* iconvdata/ebcdic-at-de.c: Likewise.
* iconvdata/ebcdic-ca-fr.c: Likewise.
* iconvdata/euccn.c: Likewise.
* iconvdata/eucjp.c: Likewise.
* iconvdata/euckr.c: Likewise.
* iconvdata/euctw.c: Likewise.
* iconvdata/gb2312.c: Likewise.
* iconvdata/gb2312.h: Likewise.
* iconvdata/hp-roman8.c: Likewise.
* iconvdata/iso646.c: Likewise.
* iconvdata/iso6937.c: Likewise.
* iconvdata/iso8859-1.c: Likewise.
* iconvdata/iso8859-10.c: Likewise.
* iconvdata/iso8859-2.c: Likewise.
* iconvdata/iso8859-3.c: Likewise.
* iconvdata/iso8859-4.c: Likewise.
* iconvdata/iso8859-5.c: Likewise.
* iconvdata/iso8859-6.c: Likewise.
* iconvdata/iso8859-7.c: Likewise.
* iconvdata/iso8859-8.c: Likewise.
* iconvdata/iso8859-9.c: Likewise.
* iconvdata/jis0201.c: Likewise.
* iconvdata/jis0201.h: Likewise.
* iconvdata/jis0208.c: Likewise.
* iconvdata/jis0208.h: Likewise.
* iconvdata/jis0212.c: Likewise.
* iconvdata/jis0212.h: Likewise.
* iconvdata/johab.c: Likewise.
* iconvdata/koi-8.c: Likewise.
* iconvdata/koi8-r.c: Likewise.
* iconvdata/ksc5601.c: Likewise.
* iconvdata/ksc5601.h: Likewise.
* iconvdata/latin-greek-1.c: Likewise.
* iconvdata/latin-greek.c: Likewise.
* iconvdata/run-iconv-test.sh: Likewise.
* iconvdata/sjis.c: Likewise.
* iconvdata/t61.c: Likewise.
* iconvdata/uhc.c: Likewise.
* wcsmbs/btowc.c: Likewise.
* wcsmbs/mbrtowc.c: Likewise.
* wcsmbs/mbsnrtowcs.c: Likewise.
* wcsmbs/mbsrtowcs.c: Likewise.
* wcsmbs/wcrtomb.c: Likewise.
* wcsmbs/wcsmbsload.c: Likewise.
* wcsmbs/wcsnrtombs.c: Likewise.
* wcsmbs/wcsrtombs.c: Likewise.
* wcsmbs/wctob.c: Likewise.
* iconv/loop.c: New file.
* iconv/skeleton.c: New file.
* stdlib/mblen.c: Handle empty input string correctly.
* stdlib/mbtowc.c: Likewise.
* posix/getopt.c: Various cleanups.
* sysdeps/arm/bits/setjmp.h: Add copyright text.
* sysdeps/i386/bits/setjmp.h: Likewise.
* sysdeps/m68k/bits/setjmp.h: Likewise.
* sysdeps/powerpc/bits/setjmp.h: Likewise.
* sysdeps/sparc/sparc32/bits/setjmp.h: Likewise.
* sysdeps/generic/longjmp.c: Rename function to __libc_siglongjmp
and make longjmp weak alias.
1998-04-18 20:29 Philip Blundell <Philip.Blundell@pobox.com>
* iconv/Makefile (routines): Only include gconv_dl if building for
an ELF system - dynamic linking is not available on a.out.
(CFLAGS-gconv_conf.c): Define STATIC_GCONV if omitting gconv_dl
due to above check.
* iconv/gconv_db.c: If STATIC_GCONV defined, don't try to call
routines from gconv_dl.
1998-04-17 Gordon Matzigkeit <gord@profitpress.com>
* csu/init.c (_IO_stdin_used): Protect with USE_IN_LIBIO so that
we can compile without libio.
1998-04-20 16:28 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/mach/hurd/Subdirs: Remove login.
1998-04-11 Gordon Matzigkeit <gord@profitpress.com>
* db2/compat.h: Include <errno.h>, to make sure we get the
definition of EFTYPE before we define it ourselves.
1998-04-10 Gordon Matzigkeit <gord@profitpress.com>
* sysdeps/generic/bits/socket.h: Protect against multiple inclusion.
* sysdeps/mach/hurd/bits/ioctls.h: Likewise.
Fix typo to allow inclusion from sys/ioctl.h again.
1998-04-16 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* iconvdata/*.[ch]: Clean up namespace. Optimize character lookup.
1998-04-16 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* libc.map: Export __strerror_r. Remove _strerror_internal.
1998-04-16 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* sysdeps/generic/strcasestr.c: Undefine strcasestr, not strstr.
Also undefine __strcasestr.
1998-04-16 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* posix/regex.c: Rename __re_max_failures back to re_max_failures,
aliases do not work with global variables due to copy relocations.
1998-04-20 15:12 Ulrich Drepper <drepper@cygnus.com>
* manual/creature.texi: Fix type. Patch by Andreas Schwab.
1998-04-20 13:47 Ulrich Drepper <drepper@cygnus.com>
* signal/sighold.c: Include stddef.h for NULL definition.
* signal/sigrelse.c: Likewise.
* sysdeps/posix/sigignore.c: Likewise.
* sysdeps/posix/sigset.c: Likewise.
* sysdeps/posix/waitid.c: Likewise.
* sysdeps/unix/sysv/linux/rt_sigsuspend.c: Likewise.
* sysdeps/unix/sysv/linux/rt_sigtimedwait.c: Likewise.
* sysdeps/unix/sysv/linux/sigwaitinfo.c: Likewise.
* wcsmbs/mbsrtowcs.c: Include stdlib.h for MB_CUR_MAX.
Patch by Franz Sirl <Franz.Sirl-kernel@lauterbach.com>.
1998-04-13 Mark Kettenis <kettenis@phys.uva.nl>
* login/Makefile (headers): Remove utmpx.h and bits/utmpx.h.
* login/getutent.c (getutxent): Remove alias.
* login/getutent_r.c (setutxent, pututxline, endutxent):
Remove aliases.
* login/getutid.c (getutxid): Remove alias.
* login/getutline.c (getutxline): Remove alias.
* login/utmp.h: Add prototypes for __updwtmp, __getutent,
__getutid, __getutline and __pututline.
* login/utmpx.h: Moved to ...
* sysdeps/gnu/utmpx.h: ... here. [__USE_GNU]: Define UTMPX_FILE,
UTMPX_FILENAME, WTMPX_FILE and WTMPX_FILENAME, declare utmpxname
and updwtmpx.
* login/updwtmp.c: Moved to ...
* sysdeps/generic/updwtmp.c: ... here. (updwtmp): Generalized by
allowing file name transformation.
* sysdeps/gnu/updwtmp.c: New file. Use generic implementation with
additional file name transformation.
* sysdeps/unix/sysv/linux/updwtmp.c: Likewise.
* login/utmp_file.c: Moved to ...
* sysdeps/generic/utmp_file.c: ... here. (setutent_file):
Generalized by allowing file name transformation. Do not
print error message. Library functions should not print them.
Reported by Jim Meyering.
* sysdeps/gnu/utmp_file.c: New file. Use generic implementation
with additional file name transformation.
* sysdeps/unix/sysv/linux/utmp_file.c: Likewise.
* sysdeps/gnu/Makefile [$(subdir)=login] (sysdep_routines): Add
setutxent, getutxent, endutxent, getutxid, getutxid, getutxline,
pututxline, utmpxname and updwtmpx. (sysdep_headers): Add utmpx.h
and bits/utmpx.h.
* sysdeps/gnu/bits/utmpx.h [__USE_GNU] Include paths.h.
(_PATH_UTMPX): Define to _PATH_UTMP. (_PATH_WTMPX): Define to
_PATH_WTMPX. (RUN_LVL): Define only if __USE_GNU. (ACCOUNTING):
Define if __USE_GNU.
* sysdeps/gnu/setutxent.c: New file.
* sysdeps/gnu/getutxent.c: New file.
* sysdeps/gnu/endutxent.c: New file.
* sysdeps/gnu/getutxid.c: New file.
* sysdeps/gnu/getutxline.c: New file.
* sysdeps/gnu/pututxline.c: New file.
* sysdeps/gnu/utmpxname.c: New file.
* sysdeps/gnu/updwtmpx.c: New file.
* sysdeps/unix/sysv/linux/paths.h (_PATH_UTMP_DB): Remove.
* sysdeps/generic/bits/utmpx.h: Remove.
1998-04-20 Ulrich Drepper <drepper@cygnus.com>
* posix/wordexp-test.c (main): Initialize ifs element of ts for
~root test.
1998-04-17 07:53 H.J. Lu <hjl@gnu.org>
* sysdeps/unix/sysv/linux/i386/s_pread64.S: Fix a typo.
1998-04-17 11:32 Ulrich Drepper <drepper@cygnus.com>
* libio/oldfileops.c (_IO_old_file_seekoff): Define temporary st
variable using _G_stat64.
* libio/fileops.c: Remove macro definition of fstat, it is in the
global header.
Reported by Thorsten Kukuk <kukuk@weber.uni-paderborn.de>.
1998-04-17 Philip Blundell <pb@nexus.co.uk>
* sysdeps/arm/strlen.S: New file, based on code by Matthew Wilcox
<willy@odie.barnet.ac.uk>.
1998-04-16 Philip Blundell <Philip.Blundell@pobox.com>
* inet/netinet/in.h (IN6_IS_ADDR_MC_NODELOCAL): New macro,
required by IPv6 Basic API.
(IN6_IS_ADDR_MC_LINKLOCAL): Likewise.
(IN6_IS_ADDR_MC_SITELOCAL): Likewise.
(IN6_IS_ADDR_MC_ORGLOCAL): Likewise.
(IN6_IS_ADDR_MC_GLOBAL): Likewise.
1998-04-20 18:41:05 +00:00
|
|
|
puts ("tests completed, now cleaning up");
|
|
|
|
|
1998-03-16 13:39:33 +00:00
|
|
|
/* Clean up */
|
2019-04-25 17:54:03 +00:00
|
|
|
for (int i = 0; i < array_length (globfile); ++i)
|
1998-03-16 13:39:33 +00:00
|
|
|
remove (globfile[i]);
|
|
|
|
|
1998-03-16 18:30:44 +00:00
|
|
|
if (cwd == NULL)
|
|
|
|
cwd = "..";
|
1998-03-16 13:39:33 +00:00
|
|
|
|
|
|
|
chdir (cwd);
|
|
|
|
rmdir (tmpdir);
|
|
|
|
|
2019-04-25 17:54:03 +00:00
|
|
|
return 0;
|
1998-03-06 11:39:36 +00:00
|
|
|
}
|
|
|
|
|
2019-04-25 17:54:03 +00:00
|
|
|
struct support_next_to_fault
|
2015-03-09 04:37:31 +00:00
|
|
|
at_page_end (const char *words)
|
|
|
|
{
|
2019-04-25 17:54:03 +00:00
|
|
|
const size_t words_size = strlen (words) + 1;
|
|
|
|
struct support_next_to_fault ntf
|
|
|
|
= support_next_to_fault_allocate (words_size);
|
2015-03-09 04:37:31 +00:00
|
|
|
|
|
|
|
/* Includes terminating NUL. */
|
2019-04-25 17:54:03 +00:00
|
|
|
memcpy (ntf.buffer, words, words_size);
|
2015-03-09 04:37:31 +00:00
|
|
|
|
2019-04-25 17:54:03 +00:00
|
|
|
return ntf;
|
2015-03-09 04:37:31 +00:00
|
|
|
}
|
1998-03-06 11:39:36 +00:00
|
|
|
|
|
|
|
static int
|
|
|
|
testit (struct test_case_struct *tc)
|
|
|
|
{
|
|
|
|
int retval;
|
2000-02-24 23:07:31 +00:00
|
|
|
wordexp_t we, sav_we;
|
|
|
|
char *dummy;
|
1998-03-06 11:39:36 +00:00
|
|
|
int bzzzt = 0;
|
2000-02-24 23:07:31 +00:00
|
|
|
int start_offs = 0;
|
1998-03-06 11:39:36 +00:00
|
|
|
int i;
|
|
|
|
|
|
|
|
if (tc->env)
|
|
|
|
setenv ("var", tc->env, 1);
|
|
|
|
else
|
|
|
|
unsetenv ("var");
|
|
|
|
|
1998-04-07 16:19:36 +00:00
|
|
|
if (tc->ifs)
|
|
|
|
setenv ("IFS", tc->ifs, 1);
|
|
|
|
else
|
|
|
|
unsetenv ("IFS");
|
|
|
|
|
2000-02-24 23:07:31 +00:00
|
|
|
sav_we.we_wordc = 99;
|
|
|
|
sav_we.we_wordv = &dummy;
|
|
|
|
sav_we.we_offs = 3;
|
|
|
|
we = sav_we;
|
|
|
|
|
2019-04-25 17:54:03 +00:00
|
|
|
printf ("info: test %d (%s): ", ++tests, tc->words);
|
2015-03-09 04:37:31 +00:00
|
|
|
fflush (NULL);
|
2019-04-25 17:54:03 +00:00
|
|
|
struct support_next_to_fault words = at_page_end (tc->words);
|
2000-02-24 23:07:31 +00:00
|
|
|
|
|
|
|
if (tc->flags & WRDE_APPEND)
|
|
|
|
{
|
|
|
|
/* initial wordexp() call, to be appended to */
|
|
|
|
if (wordexp ("pre1 pre2", &we, tc->flags & ~WRDE_APPEND) != 0)
|
|
|
|
{
|
2019-04-25 17:54:03 +00:00
|
|
|
printf ("info: FAILED setup\n");
|
2000-02-24 23:07:31 +00:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
}
|
2019-04-25 17:54:03 +00:00
|
|
|
retval = wordexp (words.buffer, &we, tc->flags);
|
1998-03-06 11:39:36 +00:00
|
|
|
|
2000-02-24 23:07:31 +00:00
|
|
|
if (tc->flags & WRDE_DOOFFS)
|
|
|
|
start_offs = sav_we.we_offs;
|
|
|
|
|
1998-03-16 18:30:44 +00:00
|
|
|
if (retval != tc->retval || (retval == 0 && we.we_wordc != tc->wordc))
|
1998-03-06 11:39:36 +00:00
|
|
|
bzzzt = 1;
|
2000-02-24 23:07:31 +00:00
|
|
|
else if (retval == 0)
|
|
|
|
{
|
|
|
|
for (i = 0; i < start_offs; ++i)
|
|
|
|
if (we.we_wordv[i] != NULL)
|
|
|
|
{
|
|
|
|
bzzzt = 1;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (i = 0; i < we.we_wordc; ++i)
|
Break some lines before not after operators.
The GNU Coding Standards specify that line breaks in expressions
should go before an operator, not after one. This patch fixes various
code to do this. It only changes code that appears to be mostly
following GNU style anyway, not files and directories with
substantially different formatting. It is not exhaustive even for
files using GNU style (for example, changes to sysdeps files are
deferred for subsequent cleanups). Some files changed are shared with
gnulib, but most are specific to glibc. Changes were made manually,
with places to change found by grep (so some cases, e.g. where the
operator was followed by a comment at end of line, are particularly
liable to have been missed by grep, but I did include cases where the
operator was followed by backslash-newline).
This patch generally does not attempt to address other coding style
issues in the expressions changed (for example, missing spaces before
'(', or lack of parentheses to ensure indentation of continuation
lines properly reflects operator precedence).
Tested for x86_64, and with build-many-glibcs.py.
* benchtests/bench-memmem.c (simple_memmem): Break lines before
rather than after operators.
* benchtests/bench-skeleton.c (TIMESPEC_AFTER): Likewise.
* crypt/md5.c (md5_finish_ctx): Likewise.
* crypt/sha256.c (__sha256_finish_ctx): Likewise.
* crypt/sha512.c (__sha512_finish_ctx): Likewise.
* elf/cache.c (load_aux_cache): Likewise.
* elf/dl-load.c (open_verify): Likewise.
* elf/get-dynamic-info.h (elf_get_dynamic_info): Likewise.
* elf/readelflib.c (process_elf_file): Likewise.
* elf/rtld.c (dl_main): Likewise.
* elf/sprof.c (generate_call_graph): Likewise.
* hurd/ctty-input.c (_hurd_ctty_input): Likewise.
* hurd/ctty-output.c (_hurd_ctty_output): Likewise.
* hurd/dtable.c (reauth_dtable): Likewise.
* hurd/getdport.c (__getdport): Likewise.
* hurd/hurd/signal.h (_hurd_interrupted_rpc_timeout): Likewise.
* hurd/hurd/sigpreempt.h (HURD_PREEMPT_SIGNAL_P): Likewise.
* hurd/hurdfault.c (_hurdsig_fault_catch_exception_raise):
Likewise.
* hurd/hurdioctl.c (fioctl): Likewise.
* hurd/hurdselect.c (_hurd_select): Likewise.
* hurd/hurdsig.c (_hurdsig_abort_rpcs): Likewise.
(STOPSIGS): Likewise.
* hurd/hurdstartup.c (_hurd_startup): Likewise.
* hurd/intr-msg.c (_hurd_intr_rpc_mach_msg): Likewise.
* hurd/lookup-retry.c (__hurd_file_name_lookup_retry): Likewise.
* hurd/msgportdemux.c (msgport_server): Likewise.
* hurd/setauth.c (_hurd_setauth): Likewise.
* include/features.h (__GLIBC_USE_DEPRECATED_SCANF): Likewise.
* libio/libioP.h [IO_DEBUG] (CHECK_FILE): Likewise.
* locale/programs/ld-ctype.c (set_class_defaults): Likewise.
* localedata/tests-mbwc/tst_swscanf.c (tst_swscanf): Likewise.
* login/tst-utmp.c (do_check): Likewise.
(simulate_login): Likewise.
* mach/lowlevellock.h (lll_lock): Likewise.
(lll_trylock): Likewise.
* math/test-fenv.c (ALL_EXC): Likewise.
* math/test-fenvinline.c (ALL_EXC): Likewise.
* misc/sys/cdefs.h (__attribute_deprecated_msg__): Likewise.
* nis/nis_call.c (__do_niscall3): Likewise.
* nis/nis_callback.c (cb_prog_1): Likewise.
* nis/nis_defaults.c (searchaccess): Likewise.
* nis/nis_findserv.c (__nis_findfastest_with_timeout): Likewise.
* nis/nis_ismember.c (internal_ismember): Likewise.
* nis/nis_local_names.c (nis_local_principal): Likewise.
* nis/nss_nis/nis-rpc.c (_nss_nis_getrpcbyname_r): Likewise.
* nis/nss_nisplus/nisplus-netgrp.c (_nss_nisplus_getnetgrent_r):
Likewise.
* nis/ypclnt.c (yp_match): Likewise.
(yp_first): Likewise.
(yp_next): Likewise.
(yp_master): Likewise.
(yp_order): Likewise.
* nscd/hstcache.c (cache_addhst): Likewise.
* nscd/initgrcache.c (addinitgroupsX): Likewise.
* nss/nss_compat/compat-pwd.c (copy_pwd_changes): Likewise.
(internal_getpwuid_r): Likewise.
* nss/nss_compat/compat-spwd.c (copy_spwd_changes): Likewise.
* posix/glob.h (__GLOB_FLAGS): Likewise.
* posix/regcomp.c (peek_token): Likewise.
(peek_token_bracket): Likewise.
(parse_expression): Likewise.
* posix/regexec.c (sift_states_iter_mb): Likewise.
(check_node_accept_bytes): Likewise.
* posix/tst-spawn3.c (do_test): Likewise.
* posix/wordexp-test.c (testit): Likewise.
* posix/wordexp.c (parse_tilde): Likewise.
(exec_comm): Likewise.
* posix/wordexp.h (__WRDE_FLAGS): Likewise.
* resource/vtimes.c (TIMEVAL_TO_VTIMES): Likewise.
* setjmp/sigjmp.c (__sigjmp_save): Likewise.
* stdio-common/printf_fp.c (__printf_fp_l): Likewise.
* stdio-common/tst-fileno.c (do_test): Likewise.
* stdio-common/vfprintf-internal.c (vfprintf): Likewise.
* stdlib/strfmon_l.c (__vstrfmon_l_internal): Likewise.
* stdlib/strtod_l.c (round_and_return): Likewise.
(____STRTOF_INTERNAL): Likewise.
* stdlib/tst-strfrom.h (TEST_STRFROM): Likewise.
* string/strcspn.c (STRCSPN): Likewise.
* string/test-memmem.c (simple_memmem): Likewise.
* termios/tcsetattr.c (tcsetattr): Likewise.
* time/alt_digit.c (_nl_parse_alt_digit): Likewise.
* time/asctime.c (asctime_internal): Likewise.
* time/strptime_l.c (__strptime_internal): Likewise.
* time/sys/time.h (timercmp): Likewise.
* time/tzfile.c (__tzfile_compute): Likewise.
2019-02-22 01:32:36 +00:00
|
|
|
if (we.we_wordv[i+start_offs] == NULL
|
|
|
|
|| strcmp (tc->wordv[i], we.we_wordv[i+start_offs]) != 0)
|
2000-02-24 23:07:31 +00:00
|
|
|
{
|
|
|
|
bzzzt = 1;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
1998-03-05 16:42:56 +00:00
|
|
|
|
1998-03-06 11:39:36 +00:00
|
|
|
if (bzzzt)
|
|
|
|
{
|
|
|
|
printf ("FAILED\n");
|
2019-04-25 17:54:03 +00:00
|
|
|
printf ("info: Test words: <%s>, need retval %d, wordc %Zd\n",
|
1998-03-06 11:39:36 +00:00
|
|
|
tc->words, tc->retval, tc->wordc);
|
2000-02-24 23:07:31 +00:00
|
|
|
if (start_offs != 0)
|
|
|
|
printf ("(preceded by %d NULLs)\n", start_offs);
|
2001-02-26 19:32:00 +00:00
|
|
|
printf ("Got retval %d, wordc %Zd: ", retval, we.we_wordc);
|
2000-02-24 23:07:31 +00:00
|
|
|
if (retval == 0 || retval == WRDE_NOSPACE)
|
|
|
|
{
|
|
|
|
for (i = 0; i < we.we_wordc + start_offs; ++i)
|
|
|
|
if (we.we_wordv[i] == NULL)
|
|
|
|
printf ("NULL ");
|
|
|
|
else
|
|
|
|
printf ("<%s> ", we.we_wordv[i]);
|
|
|
|
}
|
1998-03-06 11:39:36 +00:00
|
|
|
printf ("\n");
|
1998-03-05 16:42:56 +00:00
|
|
|
}
|
Break some lines before not after operators.
The GNU Coding Standards specify that line breaks in expressions
should go before an operator, not after one. This patch fixes various
code to do this. It only changes code that appears to be mostly
following GNU style anyway, not files and directories with
substantially different formatting. It is not exhaustive even for
files using GNU style (for example, changes to sysdeps files are
deferred for subsequent cleanups). Some files changed are shared with
gnulib, but most are specific to glibc. Changes were made manually,
with places to change found by grep (so some cases, e.g. where the
operator was followed by a comment at end of line, are particularly
liable to have been missed by grep, but I did include cases where the
operator was followed by backslash-newline).
This patch generally does not attempt to address other coding style
issues in the expressions changed (for example, missing spaces before
'(', or lack of parentheses to ensure indentation of continuation
lines properly reflects operator precedence).
Tested for x86_64, and with build-many-glibcs.py.
* benchtests/bench-memmem.c (simple_memmem): Break lines before
rather than after operators.
* benchtests/bench-skeleton.c (TIMESPEC_AFTER): Likewise.
* crypt/md5.c (md5_finish_ctx): Likewise.
* crypt/sha256.c (__sha256_finish_ctx): Likewise.
* crypt/sha512.c (__sha512_finish_ctx): Likewise.
* elf/cache.c (load_aux_cache): Likewise.
* elf/dl-load.c (open_verify): Likewise.
* elf/get-dynamic-info.h (elf_get_dynamic_info): Likewise.
* elf/readelflib.c (process_elf_file): Likewise.
* elf/rtld.c (dl_main): Likewise.
* elf/sprof.c (generate_call_graph): Likewise.
* hurd/ctty-input.c (_hurd_ctty_input): Likewise.
* hurd/ctty-output.c (_hurd_ctty_output): Likewise.
* hurd/dtable.c (reauth_dtable): Likewise.
* hurd/getdport.c (__getdport): Likewise.
* hurd/hurd/signal.h (_hurd_interrupted_rpc_timeout): Likewise.
* hurd/hurd/sigpreempt.h (HURD_PREEMPT_SIGNAL_P): Likewise.
* hurd/hurdfault.c (_hurdsig_fault_catch_exception_raise):
Likewise.
* hurd/hurdioctl.c (fioctl): Likewise.
* hurd/hurdselect.c (_hurd_select): Likewise.
* hurd/hurdsig.c (_hurdsig_abort_rpcs): Likewise.
(STOPSIGS): Likewise.
* hurd/hurdstartup.c (_hurd_startup): Likewise.
* hurd/intr-msg.c (_hurd_intr_rpc_mach_msg): Likewise.
* hurd/lookup-retry.c (__hurd_file_name_lookup_retry): Likewise.
* hurd/msgportdemux.c (msgport_server): Likewise.
* hurd/setauth.c (_hurd_setauth): Likewise.
* include/features.h (__GLIBC_USE_DEPRECATED_SCANF): Likewise.
* libio/libioP.h [IO_DEBUG] (CHECK_FILE): Likewise.
* locale/programs/ld-ctype.c (set_class_defaults): Likewise.
* localedata/tests-mbwc/tst_swscanf.c (tst_swscanf): Likewise.
* login/tst-utmp.c (do_check): Likewise.
(simulate_login): Likewise.
* mach/lowlevellock.h (lll_lock): Likewise.
(lll_trylock): Likewise.
* math/test-fenv.c (ALL_EXC): Likewise.
* math/test-fenvinline.c (ALL_EXC): Likewise.
* misc/sys/cdefs.h (__attribute_deprecated_msg__): Likewise.
* nis/nis_call.c (__do_niscall3): Likewise.
* nis/nis_callback.c (cb_prog_1): Likewise.
* nis/nis_defaults.c (searchaccess): Likewise.
* nis/nis_findserv.c (__nis_findfastest_with_timeout): Likewise.
* nis/nis_ismember.c (internal_ismember): Likewise.
* nis/nis_local_names.c (nis_local_principal): Likewise.
* nis/nss_nis/nis-rpc.c (_nss_nis_getrpcbyname_r): Likewise.
* nis/nss_nisplus/nisplus-netgrp.c (_nss_nisplus_getnetgrent_r):
Likewise.
* nis/ypclnt.c (yp_match): Likewise.
(yp_first): Likewise.
(yp_next): Likewise.
(yp_master): Likewise.
(yp_order): Likewise.
* nscd/hstcache.c (cache_addhst): Likewise.
* nscd/initgrcache.c (addinitgroupsX): Likewise.
* nss/nss_compat/compat-pwd.c (copy_pwd_changes): Likewise.
(internal_getpwuid_r): Likewise.
* nss/nss_compat/compat-spwd.c (copy_spwd_changes): Likewise.
* posix/glob.h (__GLOB_FLAGS): Likewise.
* posix/regcomp.c (peek_token): Likewise.
(peek_token_bracket): Likewise.
(parse_expression): Likewise.
* posix/regexec.c (sift_states_iter_mb): Likewise.
(check_node_accept_bytes): Likewise.
* posix/tst-spawn3.c (do_test): Likewise.
* posix/wordexp-test.c (testit): Likewise.
* posix/wordexp.c (parse_tilde): Likewise.
(exec_comm): Likewise.
* posix/wordexp.h (__WRDE_FLAGS): Likewise.
* resource/vtimes.c (TIMEVAL_TO_VTIMES): Likewise.
* setjmp/sigjmp.c (__sigjmp_save): Likewise.
* stdio-common/printf_fp.c (__printf_fp_l): Likewise.
* stdio-common/tst-fileno.c (do_test): Likewise.
* stdio-common/vfprintf-internal.c (vfprintf): Likewise.
* stdlib/strfmon_l.c (__vstrfmon_l_internal): Likewise.
* stdlib/strtod_l.c (round_and_return): Likewise.
(____STRTOF_INTERNAL): Likewise.
* stdlib/tst-strfrom.h (TEST_STRFROM): Likewise.
* string/strcspn.c (STRCSPN): Likewise.
* string/test-memmem.c (simple_memmem): Likewise.
* termios/tcsetattr.c (tcsetattr): Likewise.
* time/alt_digit.c (_nl_parse_alt_digit): Likewise.
* time/asctime.c (asctime_internal): Likewise.
* time/strptime_l.c (__strptime_internal): Likewise.
* time/sys/time.h (timercmp): Likewise.
* time/tzfile.c (__tzfile_compute): Likewise.
2019-02-22 01:32:36 +00:00
|
|
|
else if (retval != 0 && retval != WRDE_NOSPACE
|
|
|
|
&& (we.we_wordc != sav_we.we_wordc
|
|
|
|
|| we.we_wordv != sav_we.we_wordv
|
|
|
|
|| we.we_offs != sav_we.we_offs))
|
2000-02-24 23:07:31 +00:00
|
|
|
{
|
|
|
|
bzzzt = 1;
|
|
|
|
printf ("FAILED to restore wordexp_t members\n");
|
|
|
|
}
|
1998-03-06 11:39:36 +00:00
|
|
|
else
|
|
|
|
printf ("OK\n");
|
|
|
|
|
1998-09-15 21:24:37 +00:00
|
|
|
if (retval == 0 || retval == WRDE_NOSPACE)
|
|
|
|
wordfree (&we);
|
1998-03-05 16:42:56 +00:00
|
|
|
|
2019-04-25 17:54:03 +00:00
|
|
|
support_next_to_fault_free (&words);
|
2015-03-09 04:37:31 +00:00
|
|
|
|
|
|
|
fflush (NULL);
|
1998-03-06 11:39:36 +00:00
|
|
|
return bzzzt;
|
1998-03-05 16:42:56 +00:00
|
|
|
}
|
2019-04-25 17:54:03 +00:00
|
|
|
|
|
|
|
#define TEST_FUNCTION_ARGV do_test
|
|
|
|
#include <support/test-driver.c>
|