diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | io/Makefile | 2 | ||||
| -rw-r--r-- | io/tst-getcwd.c | 157 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/getcwd.c | 29 |
4 files changed, 181 insertions, 15 deletions
@@ -1,3 +1,11 @@ +2000-07-15 Ulrich Drepper <drepper@redhat.com> + + * sysdeps/unix/sysv/linux/getcwd.c: Correct last patch. + Patch by Greg McGary <greg@mcgary.org>. + + * io/Makefile (tests): Add tst-getcwd. + * io/tst-getcwd.c: New file. + 2000-07-15 Jakub Jelinek <jakub@redhat.com> * gconv_open (__gconv_open): Initialize whole __gconv_trans_data diff --git a/io/Makefile b/io/Makefile index 5f5bd08..0c2cf9b 100644 --- a/io/Makefile +++ b/io/Makefile @@ -55,7 +55,7 @@ static-only-routines = stat fstat lstat mknod stat64 fstat64 lstat64 others := pwd test-srcs := ftwtest -tests := test-utime test-stat test-lfs +tests := test-utime test-stat test-lfs tst-getcwd distribute := ftwtest-sh diff --git a/io/tst-getcwd.c b/io/tst-getcwd.c new file mode 100644 index 0000000..3dac2fb --- /dev/null +++ b/io/tst-getcwd.c @@ -0,0 +1,157 @@ +/* Test of getcwd function. + Copyright (C) 2000 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper <drepper@cygnus.com>, 2000. + + 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 <errno.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <unistd.h> +#include <sys/param.h> + + +#define TEST_FUNCTION do_test () +static int +do_test (void) +{ + char thepath[4096]; /* Yes, this limits the environment this test + can run it but I honestly don't care about + people which have this problem. */ + char *bufs[10]; + size_t lens[10]; + size_t sbs; + size_t len; + int i; + + if (getcwd (thepath, sizeof thepath) == NULL) + { + if (errno == ERANGE) + /* The path is too long, skip all tests. */ + return 0; + + puts ("getcwd (thepath, sizeof thepath) failed"); + return 1; + } + len = strlen (thepath); + + sbs = 1; + while (sbs < len + 1) + sbs <<= 1; + + for (i = 0; i < 4; ++i) + { + lens[i] = sbs; + bufs[i] = (char *) malloc (sbs); + } + + bufs[i] = getcwd (NULL, sbs); + lens[i] = sbs; + if (bufs[i] == NULL) + { + puts ("getcwd (NULL, sbs) failed"); + return 1; + } + ++i; + + for (; i < 10; sbs >>= 1, ++i) + { + bufs[i] = (char *) malloc (MAX (1, sbs)); + lens[i] = sbs; + } + + /* Before we test the result write something in the memory to see + whether the allocation went right. */ + for (i = 0; i < 10; ++i) + if (i != 4 && bufs[i] != NULL) + memset (bufs[i], '\xff', lens[i]); + + if (strcmp (thepath, bufs[4]) != 0) + { + printf ("\ +getcwd (NULL, sbs) = \"%s\", getcwd (thepath, sizeof thepath) = \"%s\"\n", + bufs[4], thepath); + return 1; + } + + /* Now overwrite all buffers to see that getcwd allocated the buffer + of right size. */ + for (i = 0; i < 10; ++i) + memset (bufs[i], i, lens[i]); + + for (i = 0; i < 10; ++i) + free (bufs[i]); + + /* Test whether the function signals success despite the buffer + being too small. */ + if (getcwd (NULL, len) != NULL) + { + puts ("getcwd (NULL, len) didn't failed"); + return 1; + } + + bufs[0] = malloc (len); + bufs[1] = malloc (len); + bufs[2] = malloc (len); + if (bufs[1] != NULL) + { + if (getcwd (bufs[1], len) != NULL) + { + puts ("getcwd (bufs[1], len) didn't failed"); + return 1; + } + free (bufs[0]); + free (bufs[1]); + free (bufs[2]); + } + + if (getcwd (thepath, len) != NULL) + { + puts ("getcwd (thepath, len) didn't failed"); + return 1; + } + + /* Now test handling of correctly sized buffers. */ + bufs[0] = getcwd (NULL, len + 1); + if (bufs[0] == NULL) + { + puts ("getcwd (NULL, len + 1) failed"); + return 1; + } + free (bufs[0]); + + memset (thepath, '\xff', sizeof thepath); + if (getcwd (thepath, len + 1) == NULL) + { + puts ("getcwd (thepath, len + 1) failed"); + return 1; + } + + for (i = len + 1; i < sizeof thepath; ++i) + if (thepath[i] != '\xff') + { + printf ("thepath[%d] != '\xff'\n", i); + return 1; + } + + puts ("everything OK"); + + return 0; +} + +#include "../test-skeleton.c" diff --git a/sysdeps/unix/sysv/linux/getcwd.c b/sysdeps/unix/sysv/linux/getcwd.c index b819f94..da42f48 100644 --- a/sysdeps/unix/sysv/linux/getcwd.c +++ b/sysdeps/unix/sysv/linux/getcwd.c @@ -104,13 +104,14 @@ __getcwd (char *buf, size_t size) if (retval >= 0) { if (buf == NULL && size == 0) - { - /* Ensure that the buffer is only as large as necessary. */ - buf = realloc (path, (size_t) retval); - if (buf == NULL) - /* `realloc' failed but we still have the original string. */ - buf = path; - } + /* Ensure that the buffer is only as large as necessary. */ + buf = realloc (path, (size_t) retval); + + if (buf == NULL) + /* Either buf was NULL all along, or `realloc' failed but + we still have the original string. */ + buf = path; + return buf; } @@ -156,13 +157,13 @@ __getcwd (char *buf, size_t size) path[n] = '\0'; if (buf == NULL && size == 0) - { - /* Ensure that the buffer is only as large as necessary. */ - buf = realloc (path, (size_t) n + 1); - if (buf == NULL) - /* `relloc' failed but we still have the original string. */ - buf = path; - } + /* Ensure that the buffer is only as large as necessary. */ + buf = realloc (path, (size_t) n + 1); + if (buf == NULL) + /* Either buf was NULL all along, or `realloc' failed but + we still have the original string. */ + buf = path; + return buf; } #ifndef have_new_dcache |