diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | stdlib/canonicalize.c | 21 | ||||
| -rw-r--r-- | stdlib/test-canon.c | 5 | ||||
| -rw-r--r-- | time/offtime.c | 9 |
4 files changed, 23 insertions, 20 deletions
@@ -1,5 +1,13 @@ 2002-05-15 Ulrich Drepper <drepper@redhat.com> + * stdlib/canonicalize.c (canonicalize): Rename to __realpath and + don't define static. Remove old __realpath function. TC1 of + POSIX 2001 will allow the second parameter to be NULL. + * stdlib/test-canon.c: Comment out test for NULL as second + parameter of realpath. + + * time/offtime.c (__offtime): Set errno if overflow is detected. + * elf/Makefile (rtld-routines): Remove dl-brk and dl-sbrk. * sysdeps/unix/sysv/linux/Makefile (sysdep-rtld-routines): Add dl-brk and dl-sbrk. diff --git a/stdlib/canonicalize.c b/stdlib/canonicalize.c index 2098d77df2..c859288147 100644 --- a/stdlib/canonicalize.c +++ b/stdlib/canonicalize.c @@ -1,5 +1,5 @@ /* Return the canonical absolute name of a given file. - Copyright (C) 1996,1997,1998,1999,2000,2001 Free Software Foundation, Inc. + Copyright (C) 1996-2001, 2002 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 @@ -37,8 +37,8 @@ that cannot be resolved. If the path can be resolved, RESOLVED holds the same value as the value returned. */ -static char * -canonicalize (const char *name, char *resolved) +char * +__realpath (const char *name, char *resolved) { char *rpath, *dest, *extra_buf = NULL; const char *start, *end, *rpath_limit; @@ -204,25 +204,12 @@ error: free (rpath); return NULL; } - - -char * -__realpath (const char *name, char *resolved) -{ - if (resolved == NULL) - { - __set_errno (EINVAL); - return NULL; - } - - return canonicalize (name, resolved); -} weak_alias (__realpath, realpath) char * __canonicalize_file_name (const char *name) { - return canonicalize (name, NULL); + return __realpath (name, NULL); } weak_alias (__canonicalize_file_name, canonicalize_file_name) diff --git a/stdlib/test-canon.c b/stdlib/test-canon.c index e1beafd332..6b7375afd9 100644 --- a/stdlib/test-canon.c +++ b/stdlib/test-canon.c @@ -1,5 +1,5 @@ /* Test program for returning the canonical absolute name of a given file. - Copyright (C) 1996, 1997, 2000 Free Software Foundation, Inc. + Copyright (C) 1996, 1997, 2000, 2002 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by David Mosberger <davidm@azstarnet.com>. @@ -132,6 +132,8 @@ do_test (int argc, char ** argv) ++errors; } +#if 0 + /* This is now allowed. The test is invalid. */ errno = 0; if (realpath ("/", NULL) != NULL || errno != EINVAL) { @@ -139,6 +141,7 @@ do_test (int argc, char ** argv) " for realpath(...,NULL)\n", argv[0]); ++errors; } +#endif errno = 0; if (realpath ("", buf) != NULL || errno != ENOENT) diff --git a/time/offtime.c b/time/offtime.c index 59f1b2c0e6..c0b1db59bd 100644 --- a/time/offtime.c +++ b/time/offtime.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1993, 1997, 1998 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1993, 1997, 1998, 2002 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 @@ -16,6 +16,7 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ +#include <errno.h> #include <time.h> #define SECS_PER_HOUR (60 * 60) @@ -73,7 +74,11 @@ __offtime (t, offset, tp) } tp->tm_year = y - 1900; if (tp->tm_year != y - 1900) - return 0; + { + /* The year cannot be represented due to overflow. */ + __set_errno (EOVERFLOW); + return 0; + } tp->tm_yday = days; ip = __mon_yday[__isleap(y)]; for (y = 11; days < (long int) ip[y]; --y) |