mirror of
git://sourceware.org/git/glibc.git
synced 2024-11-27 03:41:23 +08:00
b17277cfa2
1998-05-15 14:36 Ulrich Drepper <drepper@cygnus.com> * posix/wordexp-test.c: Avoid duplicate messages. * sysdeps/generic/setenv.c: Use __tfind and __tsearch, not tfind and tsearch. Correctly interpret values returned by those functions. (unsetenv): Store pointer to string, not pointer to string pointer. * time/tzfile.c (__tzfile_compute): Take new arguments. Store DST information and offset in them. * time/tzset.c (__tz_convert): Pass extra parameters to __tzfile_compute. Compute equivalent values for use of tz_rules. 1998-05-15 00:49:11 Zack Weinberg <zack@rabi.phys.columbia.edu> * iconvdata/Makefile (gen-8bit-table): Use move-if-change and stamp files to avoid unnecessary recompilation. (gen-8bit-gap-table): Likewise. (move-if-change): New variable. (all generated .h rules): Change to be .stmp rules. (%.h): New rule; depend on %.stmp; no commands. (distribute): Add gen-8bit.sh, gen-8bit-gap.sh, gen-8bit-gap-1.sh. 1998-05-15 01:09 Zack Weinberg <zack@rabi.phys.columbia.edu> * Makerules (libc-map): Deleted. (load-map-file): Set to the appropriate compiler switch, not just the file name. If libfoo-map is not set, look for a libfoo.map in the current directory and $(..). (map-file): New variable, contains just the mapfile name. (build-shlib): Adjust for new value of load-map-file. (libc.so): Correct dependencies. * extra-lib.mk: Correct shlib dependencies since libfoo-map may not be set anymore. * elf/Makefile: Set ld-map to $(..)libc.map, not $(libc-map). Delete libdl-map. Tweak ld.so link rule to work with changed variable settings in Makerules. * iconvdata/Makefile: Tweak build-module to work with changed variable settings in Makerules. * db/Makefile: Delete libdb-map. * hesiod/Makefile: Delete libnss_hesiod-map. * linuxthreads/Makefile: Delete libpthread-map. * locale/Makefile: Delete libBrokenLocale-map. * login/Makefile: Delete libutil-map. * math/Makefile: Delete libm-map. * md5-crypt/Makefile: Delete libcrypt-map. * nis/Makefile: Delete libnsl-map, libnss_nis-map, libnss_nisplus-map, and libnss_compat-map. * nss/Makefile: Delete libnss_files-map, libnss_db-map, and libnss_ldap-map. * resolv/Makefile: Delete libresolv-map and libnss_dns-map. * rt/Makefile: Delete librt-map. 1998-05-15 01:06 Zack Weinberg <zack@rabi.phys.columbia.edu> * configure.in: Instead of substituting `yes' or `no' for whether --no-whole-archive is available, set @no_whole_archive@ to the appropriate gcc switch or the empty string. Likewise for -fno-exceptions. * config.make.in: Replace have-no-whole-archive with no-whole-archive and have-no-exceptions with no-exceptions. * Makerules: Delete stanzas setting no-whole-archive and no-exceptions. * sunrpc/Makefile: Use move-if-change to update generated .h and .c files. 1998-05-13 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * wcsmbs/wcsmbsload.c (extract_charset_name): Use strcspn instead of strchr loop. 1998-05-15 Andreas Jaeger <aj@arthur.rhein-neckar.de> * time/tzfile.c (__tzfile_read): Remove unused variable info. (__tzfile_compute): Likewise. 1998-05-15 Andreas Jaeger <aj@arthur.rhein-neckar.de> * sysdeps/unix/sysv/linux/bits/socket.h (AF_SNA,PF_SNA): Add new defines from Linux 2.1.102.
286 lines
9.2 KiB
C
286 lines
9.2 KiB
C
/* Copyright (C) 1997, 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. */
|
|
|
|
#include <sys/stat.h>
|
|
#include <sys/types.h>
|
|
#include <fcntl.h>
|
|
#include <unistd.h>
|
|
#include <pwd.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <wordexp.h>
|
|
|
|
#define IFS " \n\t"
|
|
|
|
struct test_case_struct
|
|
{
|
|
int retval;
|
|
const char *env;
|
|
const char *words;
|
|
int flags;
|
|
int wordc;
|
|
const char *wordv[10];
|
|
const char *ifs;
|
|
} test_case[] =
|
|
{
|
|
/* Simple field-splitting */
|
|
{ 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 },
|
|
{ 0, NULL, " red , white blue", 0, 3, { "red", "white", "blue", }, ", \n\t" },
|
|
|
|
/* Simple parameter expansion */
|
|
{ 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 },
|
|
|
|
/* Simple quote removal */
|
|
{ 0, NULL, "\"quoted\"", 0, 1, { "quoted", }, IFS },
|
|
{ 0, "foo", "\"$var\"\"$var\"", 0, 1, { "foofoo", }, IFS },
|
|
{ 0, NULL, "'singly-quoted'", 0, 1, { "singly-quoted", }, IFS },
|
|
|
|
/* Simple command substitution */
|
|
{ 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 },
|
|
|
|
/* Simple arithmetic expansion */
|
|
{ 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 },
|
|
|
|
/* Advanced parameter expansion */
|
|
{ 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 },
|
|
|
|
{ 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 },
|
|
{ 0, "borabora-island", "${var##*bora}", 0, 1, {"-island", }, IFS },
|
|
{ 0, "100%", "${var%0%}", 0, 1, { "10" }, IFS },
|
|
|
|
/* Pathname expansion */
|
|
{ 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 },
|
|
|
|
/* Nested constructs */
|
|
{ 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 },
|
|
{ 0, "foo", "*$var*", 0, 1, { "*foo*", }, IFS },
|
|
{ 0, "o thr", "*$var*", 0, 2, { "two", "three" }, IFS },
|
|
|
|
/* Other things that should succeed */
|
|
{ 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 },
|
|
|
|
/* Things that should fail */
|
|
{ WRDE_BADCHAR, NULL, "new\nline", 0, 0, { NULL, }, IFS },
|
|
{ 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_CMDSUB, NULL, "$(ls)", WRDE_NOCMD, 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 },
|
|
{ WRDE_SYNTAX, NULL, "$((2+))", 0, 0, { NULL, }, IFS },
|
|
{ WRDE_SYNTAX, NULL, "`", 0, 0, { NULL, }, IFS },
|
|
|
|
{ -1, NULL, NULL, 0, 0, { NULL, }, IFS },
|
|
};
|
|
|
|
static int testit (struct test_case_struct *tc);
|
|
static int tests;
|
|
|
|
void
|
|
command_line_test (const char *words)
|
|
{
|
|
wordexp_t we;
|
|
int i;
|
|
int retval = wordexp (words, &we, 0);
|
|
printf ("wordexp returned %d\n", retval);
|
|
for (i = 0; i < we.we_wordc; i++)
|
|
printf ("we_wordv[%d] = \"%s\"\n", i, we.we_wordv[i]);
|
|
}
|
|
|
|
int
|
|
main (int argc, char *argv[])
|
|
{
|
|
const char *globfile[] = { "one", "two", "three", NULL };
|
|
char tmpdir[32];
|
|
struct passwd *pw;
|
|
const char *cwd;
|
|
int test;
|
|
int fail = 0;
|
|
int i;
|
|
|
|
if (argc > 1)
|
|
{
|
|
command_line_test (argv[1]);
|
|
return 0;
|
|
}
|
|
|
|
cwd = getcwd (NULL, 0);
|
|
|
|
/* Set up arena for pathname expansion */
|
|
tmpnam (tmpdir);
|
|
if (mkdir (tmpdir, S_IRWXU) || chdir (tmpdir))
|
|
return -1;
|
|
else
|
|
{
|
|
int fd;
|
|
|
|
for (i = 0; globfile[i]; ++i)
|
|
if ((fd = creat (globfile[i], S_IRUSR | S_IWUSR)) == -1
|
|
|| close (fd))
|
|
return -1;
|
|
}
|
|
|
|
for (test = 0; test_case[test].retval != -1; test++)
|
|
if (testit (&test_case[test]))
|
|
++fail;
|
|
|
|
pw = getpwnam ("root");
|
|
if (pw != NULL)
|
|
{
|
|
struct test_case_struct ts;
|
|
|
|
ts.retval = 0;
|
|
ts.env = NULL;
|
|
ts.words = "~root";
|
|
ts.flags = 0;
|
|
ts.wordc = 1;
|
|
ts.wordv[0] = pw->pw_dir;
|
|
ts.ifs = IFS;
|
|
|
|
if (testit (&ts))
|
|
++fail;
|
|
}
|
|
|
|
puts ("tests completed, now cleaning up");
|
|
|
|
/* Clean up */
|
|
for (i = 0; globfile[i]; ++i)
|
|
remove (globfile[i]);
|
|
|
|
if (cwd == NULL)
|
|
cwd = "..";
|
|
|
|
chdir (cwd);
|
|
rmdir (tmpdir);
|
|
|
|
printf ("tests failed: %d\n", fail);
|
|
|
|
return fail != 0;
|
|
}
|
|
|
|
|
|
static int
|
|
testit (struct test_case_struct *tc)
|
|
{
|
|
int retval;
|
|
wordexp_t we;
|
|
int bzzzt = 0;
|
|
int i;
|
|
|
|
if (tc->env)
|
|
setenv ("var", tc->env, 1);
|
|
else
|
|
unsetenv ("var");
|
|
|
|
if (tc->ifs)
|
|
setenv ("IFS", tc->ifs, 1);
|
|
else
|
|
unsetenv ("IFS");
|
|
|
|
printf ("Test %d (%s): ", ++tests, tc->words);
|
|
retval = wordexp (tc->words, &we, tc->flags);
|
|
|
|
if (retval != tc->retval || (retval == 0 && we.we_wordc != tc->wordc))
|
|
bzzzt = 1;
|
|
else
|
|
for (i = 0; i < we.we_wordc; ++i)
|
|
if (strcmp (tc->wordv[i], we.we_wordv[i]) != 0)
|
|
{
|
|
bzzzt = 1;
|
|
break;
|
|
}
|
|
|
|
if (bzzzt)
|
|
{
|
|
printf ("FAILED\n");
|
|
printf ("Test words: <%s>, need retval %d, wordc %d\n",
|
|
tc->words, tc->retval, tc->wordc);
|
|
printf ("Got retval %d, wordc %d: ", retval, we.we_wordc);
|
|
for (i = 0; i < we.we_wordc; ++i)
|
|
printf ("<%s> ", we.we_wordv[i]);
|
|
printf ("\n");
|
|
}
|
|
else
|
|
printf ("OK\n");
|
|
|
|
wordfree (&we);
|
|
|
|
return bzzzt;
|
|
}
|