From 310b3460e0740903996b838e9f9f5842c579cb0f Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Tue, 14 Apr 1998 16:51:08 +0000 Subject: Update. 1998-04-14 16:34 Ulrich Drepper * test-skeleton.c: Provide hook for initializing code before the fork. * rt/tst-aio.c: Use PREPARE hook to make suer temp files are always removed. * libio/fcloseall.c (__fcloseall): Return return value of _IO_cleanup. * libio/genops.c (_IO_cleanup): Return return value of _IO_flush_all. * libio/libioP.h: Adopt _IO_cleanup prototype. * stdlib/Makefile (tests): Add test-canon2. * stdlib/test-canon2.c: New file. * stdlib/canonicalize.c (canonicalize): Allow RESOLVED parameter to be NULL. Use __lxstat, not __lstat. Correctly recognize long symlink sequences. (__realpath): Make real function which checks RESOLVED parameter for not being NULL. 1998-04-14 Ulrich Drepper * catgets/open_catalog.c (__open_catalog): Fix problems with reading non-files. Always close file. Reported by Cristian Gafton . * elf/dl-minimal.c (__strtol_internal): Prevent overflow warnings. 1998-04-14 13:28 Ulrich Drepper * libc.map: Add various low-level I/O functions. 1998-04-14 10:35 Ulrich Drepper * string/Makefile (routines): Remove strerror_r. * string/strerror_r.c: Removed. * string/strerror.c: Call __strerror_r for doing the real work. * sysdeps/generic/_strerror.c: Rename function to __strerror_r and add weak alias strerror_r. * sysdeps/mach/_strerror.c: Likewise. * assert/assert-perr.c: Use __strerror_r instead of _strerror_internal. * elf/dl-error.c (_dl_signal_error): Likewise. * elf/dl-profile.c (_dl_start_profile): Likewise. * gmon/gmon.c (write_gmon): Likewise. * stdio-common/perror.c: Likewise. * stdio-common/vfprintf.c: Likewise. 1998-04-10 Mark Kettenis * sysdeps/unix/sysv/linux/Makefile [$(subdir)=inet] (sysdep_headers): Add netatalk/at.h. 1998-04-12 Andreas Schwab * manual/socket.texi, manual/creature.texi, manual/time.texi: Formatting fixes. 1998-04-13 Andreas Schwab * posix/regex.c: Rename __re_syntax_options back to re_syntax_options, aliases do not work with global variables due to copy relocations. (regex_compile): Use syntax parameter instead of re_syntax_options. 1998-04-14 Andreas Jaeger * configure.in: Document that enable-force-install is default. --- stdlib/Makefile | 2 +- stdlib/canonicalize.c | 26 +++++++++++++----- stdlib/test-canon2.c | 74 +++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 94 insertions(+), 8 deletions(-) create mode 100644 stdlib/test-canon2.c (limited to 'stdlib') diff --git a/stdlib/Makefile b/stdlib/Makefile index 85a5347..91eaf60 100644 --- a/stdlib/Makefile +++ b/stdlib/Makefile @@ -51,7 +51,7 @@ routines := \ distribute := exit.h grouping.h abort-instr.h isomac.c tests := tst-strtol tst-strtod testmb testrand testsort testdiv \ - test-canon + test-canon test-canon2 # Several mpn functions from GNU MP are used by the strtod function. diff --git a/stdlib/canonicalize.c b/stdlib/canonicalize.c index ef7311e..faf4422 100644 --- a/stdlib/canonicalize.c +++ b/stdlib/canonicalize.c @@ -45,10 +45,12 @@ canonicalize (const char *name, char *resolved) long int path_max; int num_links = 0; - if (name == NULL || resolved == NULL) + if (name == NULL) { /* As per Single Unix Specification V2 we must return an error if - either parameter is a null pointer. */ + either parameter is a null pointer. We extend this to allow + the RESOLVED parameter be NULL in case the we are expected to + allocate the room for the return value. */ __set_errno (EINVAL); return NULL; } @@ -133,7 +135,7 @@ canonicalize (const char *name, char *resolved) dest = __mempcpy (dest, start, end - start); *dest = '\0'; - if (__lstat (rpath, &st) < 0) + if (__lxstat (_STAT_VER, rpath, &st) < 0) goto error; if (S_ISLNK (st.st_mode)) @@ -174,8 +176,6 @@ canonicalize (const char *name, char *resolved) if (dest > rpath + 1) while ((--dest)[-1] != '/'); } - else - num_links = 0; } } if (dest > rpath + 1 && dest[-1] == '/') @@ -191,8 +191,20 @@ error: free (rpath); return NULL; } -strong_alias (canonicalize, __realpath) -weak_alias (canonicalize, realpath) + + +char * +__realpath (const char *name, char *resolved) +{ + if (resolved == NULL) + { + __set_errno (EINVAL); + return NULL; + } + + return canonicalize (name, resolved); +} +weak_alias (__realpath, realpath) char * diff --git a/stdlib/test-canon2.c b/stdlib/test-canon2.c new file mode 100644 index 0000000..0dc1615 --- /dev/null +++ b/stdlib/test-canon2.c @@ -0,0 +1,74 @@ +/* Test for realpath/canonicalize function. + Copyright (C) 1998 Free Software Foundation, Inc. + Contributed by Ulrich Drepper , 1998. + + 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 +#include + + +/* Prototype for our test function. */ +extern void do_prepare (int argc, char *argv[]); +extern int do_test (int argc, char *argv[]); + +/* We have a preparation function. */ +#define PREPARE do_prepare + +#include + +/* Name of the temporary files we create. */ +char *name1; +char *name2; + +/* Preparation. */ +void +do_prepare (int argc, char *argv[]) +{ + char test_dir_len; + + test_dir_len = strlen (test_dir); + + /* Generate the circular symlinks. */ + name1 = malloc (test_dir_len + sizeof ("/canonXXXXXX")); + mempcpy (mempcpy (name1, test_dir, test_dir_len), + "/canonXXXXXX", sizeof ("/canonXXXXXX")); + name2 = strdup (name1); + + add_temp_file (mktemp (name1)); + add_temp_file (mktemp (name2)); +} + + +/* Run the test. */ +int +do_test (int argc, char *argv[]) +{ + char *canon; + + printf ("create symlinks from %s to %s and vice versa\n", name1, name2); + if (symlink (name1, name2) == -1 + || symlink (name2, name1) == -1) + /* We cannot test this. */ + return 0; + + /* Call the function. This is equivalent the using `realpath' but the + function allocates the room for the result. */ + errno = 0; + canon = canonicalize_file_name (name1); + + return canon != NULL || errno != ELOOP; +} -- cgit v1.1