diff options
author | Jakub Jelinek <jakub@redhat.com> | 2008-07-03 12:21:19 +0000 |
---|---|---|
committer | Jakub Jelinek <jakub@redhat.com> | 2008-07-03 12:21:19 +0000 |
commit | 1cb6b555a864f401c8a2ba75814e982b66a62971 (patch) | |
tree | 506eb1640092c658b5e31474916d143d7be0200e /stdlib | |
parent | e6042ff1eea1f5259df14cf42961898e6c9e6cb1 (diff) |
Updated to fedora-glibc-20080703T1203cvs/fedora-glibc-2_8_90-8
Diffstat (limited to 'stdlib')
-rw-r--r-- | stdlib/canonicalize.c | 4 | ||||
-rw-r--r-- | stdlib/tst-setcontext.c | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/stdlib/canonicalize.c b/stdlib/canonicalize.c index 19808b50d6..67e4d05535 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-2002, 2004, 2005, 2006 Free Software Foundation, Inc. + Copyright (C) 1996-2002,2004,2005,2006,2008 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 @@ -173,7 +173,7 @@ __realpath (const char *name, char *resolved) goto error; } - n = __readlink (rpath, buf, path_max); + n = __readlink (rpath, buf, path_max - 1); if (n < 0) goto error; buf[n] = '\0'; diff --git a/stdlib/tst-setcontext.c b/stdlib/tst-setcontext.c index beec23a686..51296f74ab 100644 --- a/stdlib/tst-setcontext.c +++ b/stdlib/tst-setcontext.c @@ -150,7 +150,10 @@ main (void) if (getcontext (&ctx[1]) != 0) { if (errno == ENOSYS) - exit (0); + { + back_in_main = 1; + exit (0); + } printf ("%s: getcontext: %m\n", __FUNCTION__); exit (1); |