mirror of
git://sourceware.org/git/glibc.git
synced 2024-11-21 01:12:26 +08:00
d68171edce
Sat Sep 28 03:02:49 1996 Ulrich Drepper <drepper@cygnus.com> * dirent/Makefile (routines): Add readdir_r. * dirent/readdir_r.c: New file. Wrapper around readdir.c. * dirent/dirent.h: Add prototype for readdir_r. * misc/hsearch_r.c (ENTRY): Make field `used' of type `unsigned int' to prevent warnings. * sysdeps/unix/sysv/linux/getsysstats.c (get_proc_path): Initialize `result'. Sat Sep 28 01:16:42 1996 Ulrich Drepper <drepper@cygnus.com> * sysdeps/generic/strsep.c: Rename to __strsep and make strsep weak alias. * string/string.h: Add prototype for __strsep. * misc/mntent_r.c: Use __strsep instead of strsep to keep namespace clean. * sysdeps/stub/nanosleep.c: Rename to __libc_nanosleep and make __nanosleep and nanosleep weak aliases. * sysdeps/unix/sysv/linux/syscalls.list: Add __nanosleep as weak alias. * sysdeps/unix/sysv/linux/sleep.c: Call __nanosleep instead of nanosleep to keep namespace clean. * sysdeps/posix/ttyname.c (ttyname): Add cast to prevent warning. * sysdeps/posix/ttyname_r.c (ttyname_r): Likewise. * sysdeps/posix/getcwd.c (__getcwd): Likewise. * sysdeps/unix/nlist.c: Use ISO C definition since we don't always have prototype. * login/Makefile (headers): Add pty.h. * login/pty.h: New file. * sysdeps/generic/pty.h: Include <pty.h>. * login/pututline_r.c: Add cast to prevent warning. * gmon/gmon.c: Add prototype for __profile_frequency. (monstartup): Add cast to prevent warning. * sysdeps/generic/prof-freq.c: Change to use ISO C style definition. * locale/programs/ld-time.c (time_output): Write `era' information in correct order. Sat Sep 28 00:11:08 1996 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/sysv/linux/syscalls.list: Add weak alias `adjtimex'. Set caller for mlock, mlockall, mremap, munlock, and munlockall to EXTRA. Reported by Matthias Urlichs <smurf@smurf.noris.de>. 1996-09-27 Paul Eggert <eggert@twinsun.com> * strftime.c (strftime): Output incomplete formats like %E at end of string. 1996-09-27 Paul Eggert <eggert@twinsun.com> * strftime.c (strftime): Add support for %EC and %Ey. Fix support for %EY. This uses the new _nl_get_era_entry function. Fri Sep 27 14:12:27 1996 Ulrich Drepper <drepper@cygnus.com> Security related patch by Elliot Lee <sopwith@redhat.com> and David Holland <dholland@eecs.harvard.edu>. * inet/rexec.c (rexec): Increase size of `num' array from 8 to 32. * inet/ruserpass.c (ruserpass): Don't allow $HOME envvar to not exist. * sysdeps/generic/getenv.c (__secure_getenv): New function. Return NULL when programs runs with SUID or SGID enabled. * sysdeps/stub/getenv.c: Make __secure_getenv an alias of getenv. * stdlib/stdlib.h: Add prototype for __secure_getenv. * locale/setlocale.c: Use __secure_getenv. * resolv/res_init.c: Likewise. * resolv/res_query.c: Likewise. * inet/ruserpass.c: Likewise. * sysdeps/posix/tempname.c: Likewise. * malloc/mtrace.c: Likewise. * catgets/catgets.c: Likewise. Make temporary file handling functions reentrant. * stdio-common/tmpnam.c: Rewrite to have own buffer to write result to. The called __stdio_gen_tempname function must be thread safe. * stdio-common/tmpnam_r.c: New file. * stdio/stdio.h: Add prototype for `tmpnam_r'. Change prototype for __stdio_gen_tempname. * stdio/libio.h: Likewise. * sysdeps/posix/tempname.c: Add new parameters and use them instead of static buffer. Don't reset `indeces' when PID changed between calls. Don't fail for long running programs when index counter once reached the limit. * sysdeps/stub/tempname.c: Likewise. * stdio-common/tempnam.c: Provide local buffer as extra argument to __stdio_gen_tempname. This makes this function reentrant. * stdio-common/tmpfile.c: Likewise. * stdio-common/temptest.c: Provide extra argument to __stdio_gen_tempname. * manual/filesys.texi: Describe tmpnam_r and add comments about reentrancy of the functions. * inet/rcmd.c: Fixed address length handling. * sysdeps/posix/mk-stdiolim.c: Count final \0 byte in L_tmpnam value. * time/strftime.c: Remove unused variables alt_digits and end_alt_digits. * sysdeps/unix/sysv/linux/sys/sysinfo.h: Correct prototype names for get_nprocs and get_nprocs_conf. * sysdeps/generic/sys/sysinfo.h: Likewise. * stdlib/test-canon.c: Finally do the right fix. * misc/Makefile: Only compile force-wrapper when compiling reentrant libc.
180 lines
4.7 KiB
C
180 lines
4.7 KiB
C
/* Test program for returning the canonical absolute name of a given file.
|
|
Copyright (C) 1996 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by David Mosberger <davidm@azstarnet.com>.
|
|
|
|
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., 675 Mass Ave,
|
|
Cambridge, MA 02139, USA. */
|
|
|
|
/* This file must be run from within a directory called "stdlib". */
|
|
|
|
#include <errno.h>
|
|
#include <fcntl.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <unistd.h>
|
|
#include <sys/param.h>
|
|
|
|
static char cwd[1024];
|
|
static size_t cwd_len;
|
|
|
|
struct {
|
|
const char * name;
|
|
const char * value;
|
|
} symlinks[] = {
|
|
{"SYMLINK_LOOP", "SYMLINK_LOOP"},
|
|
{"SYMLINK_1", "."},
|
|
{"SYMLINK_2", "//////./../../etc"},
|
|
{"SYMLINK_3", "SYMLINK_1"},
|
|
{"SYMLINK_4", "SYMLINK_2"},
|
|
{"SYMLINK_5", "doesNotExist"},
|
|
};
|
|
|
|
struct {
|
|
const char * in, * out, * resolved;
|
|
int error;
|
|
} tests[] = {
|
|
/* 0 */
|
|
{"/", "/"},
|
|
{"/////////////////////////////////", "/"},
|
|
{"/.././.././.././..///", "/"},
|
|
{"/etc", "/etc"},
|
|
{"/etc/../etc", "/etc"},
|
|
/* 5 */
|
|
{"/doesNotExist/../etc", 0, "/doesNotExist", ENOENT},
|
|
{"./././././././././.", "."},
|
|
{"/etc/.//doesNotExist", 0, "/etc/doesNotExist", ENOENT},
|
|
{"./doesExist", "./doesExist"},
|
|
{"./doesExist/", "./doesExist"},
|
|
/* 10 */
|
|
{"./doesExist/../doesExist", "./doesExist"},
|
|
{"foobar", 0, "./foobar", ENOENT},
|
|
{".", "."},
|
|
{"./foobar", 0, "./foobar", ENOENT},
|
|
{"SYMLINK_LOOP", 0, "./SYMLINK_LOOP", ELOOP},
|
|
/* 15 */
|
|
{"./SYMLINK_LOOP", 0, "./SYMLINK_LOOP", ELOOP},
|
|
{"SYMLINK_1", "."},
|
|
{"SYMLINK_1/foobar", 0, "./foobar", ENOENT},
|
|
{"SYMLINK_2", "/etc"},
|
|
{"SYMLINK_3", "."},
|
|
/* 20 */
|
|
{"SYMLINK_4", "/etc"},
|
|
{"../stdlib/SYMLINK_1", "."},
|
|
{"../stdlib/SYMLINK_2", "/etc"},
|
|
{"../stdlib/SYMLINK_3", "."},
|
|
{"../stdlib/SYMLINK_4", "/etc"},
|
|
/* 25 */
|
|
{"./SYMLINK_5", 0, "./doesNotExist", ENOENT},
|
|
{"SYMLINK_5", 0, "./doesNotExist", ENOENT},
|
|
{"SYMLINK_5/foobar", 0, "./doesNotExist", ENOENT},
|
|
{"doesExist/../../stdlib/doesExist", "./doesExist"},
|
|
{"doesExist/.././../stdlib/.", "."}
|
|
};
|
|
|
|
|
|
int
|
|
check_path (const char * result, const char * expected)
|
|
{
|
|
int good;
|
|
|
|
if (!result)
|
|
return (expected == NULL);
|
|
|
|
if (!expected)
|
|
return 0;
|
|
|
|
if (expected[0] == '.' && (expected[1] == '/' || expected[1] == '\0'))
|
|
good = (strncmp (result, cwd, cwd_len) == 0
|
|
&& strcmp (result + cwd_len, expected + 1) == 0);
|
|
else
|
|
good = (strcmp (expected, result) == 0);
|
|
|
|
return good;
|
|
}
|
|
|
|
|
|
int
|
|
main (int argc, char ** argv)
|
|
{
|
|
char * result;
|
|
int fd, i, errors = 0;
|
|
char buf[PATH_MAX];
|
|
|
|
getcwd (cwd, sizeof(buf));
|
|
cwd_len = strlen (cwd);
|
|
|
|
for (i = 0; i < (int) (sizeof (symlinks) / sizeof (symlinks[0])); ++i)
|
|
symlink (symlinks[i].value, symlinks[i].name);
|
|
|
|
fd = open("doesExist", O_CREAT | O_EXCL, 0777);
|
|
|
|
for (i = 0; i < (int) (sizeof (tests) / sizeof (tests[0])); ++i)
|
|
{
|
|
buf[0] = '\0';
|
|
result = realpath (tests[i].in, buf);
|
|
|
|
if (!check_path (result, tests[i].out))
|
|
{
|
|
printf ("%s: flunked test %d (expected `%s', got `%s')\n",
|
|
argv[0], i, tests[i].out ? tests[i].out : "NULL",
|
|
result ? result : "NULL");
|
|
++errors;
|
|
continue;
|
|
}
|
|
|
|
if (!check_path (buf, tests[i].out ? tests[i].out : tests[i].resolved))
|
|
{
|
|
printf ("%s: flunked test %d (expected resolved `%s', got `%s')\n",
|
|
argv[0], i, tests[i].out ? tests[i].out : tests[i].resolved,
|
|
buf);
|
|
++errors;
|
|
continue;
|
|
}
|
|
|
|
if (!tests[i].out && errno != tests[i].error)
|
|
{
|
|
printf ("%s: flunked test %d (expected errno %d, got %d)\n",
|
|
argv[0], i, tests[i].error, errno);
|
|
++errors;
|
|
continue;
|
|
}
|
|
}
|
|
|
|
getcwd (buf, sizeof(buf));
|
|
if (strcmp (buf, cwd))
|
|
{
|
|
printf ("%s: current working directory changed from %s to %s\n",
|
|
argv[0], cwd, buf);
|
|
++errors;
|
|
}
|
|
|
|
if (fd >= 0)
|
|
unlink("doesExist");
|
|
|
|
for (i = 0; i < (int) (sizeof (symlinks) / sizeof (symlinks[0])); ++i)
|
|
unlink (symlinks[i].name);
|
|
|
|
if (errors != 0)
|
|
{
|
|
printf ("%d errors.\n", errors);
|
|
exit (EXIT_FAILURE);
|
|
}
|
|
|
|
puts ("No errors.");
|
|
return EXIT_SUCCESS;
|
|
}
|