diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2005-04-27 07:37:00 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2005-04-27 07:37:00 +0000 |
| commit | 0f888d8ec6e038895be5d0a562d90be5e930a88a (patch) | |
| tree | 0b98ab87be4952d2ba858e1710ea894826f4e4cb /stdlib/test-canon.c | |
| parent | 935f3e6715f2f178159eef1501ae30ad53a68150 (diff) | |
| download | glibc-0f888d8ec6e038895be5d0a562d90be5e930a88a.zip glibc-0f888d8ec6e038895be5d0a562d90be5e930a88a.tar.gz glibc-0f888d8ec6e038895be5d0a562d90be5e930a88a.tar.bz2 | |
* stdlib/test-canon.c: Make doesExist a directory and add more tests
for the new error case.
2004-06-02 Dmitry V. Levin <ldv@altlinux.org>
Ranjani Murthy <ranmur@gmail.com>
* stdlib/canonicalize.c (__realpath): Change realpath(3) to
return NULL and set errno to ENOTDIR for such pathnames like
"/path/to/existing-non-directory/".
Diffstat (limited to 'stdlib/test-canon.c')
| -rw-r--r-- | stdlib/test-canon.c | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/stdlib/test-canon.c b/stdlib/test-canon.c index f070df7..5426746 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, 2002, 2004 Free Software Foundation, Inc. + Copyright (C) 1996,1997,2000,2002,2004,2005 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by David Mosberger <davidm@azstarnet.com>. @@ -89,7 +89,10 @@ struct { {"SYMLINK_5", 0, "./doesNotExist", ENOENT}, {"SYMLINK_5/foobar", 0, "./doesNotExist", ENOENT}, {"doesExist/../../stdlib/doesExist", "./doesExist"}, - {"doesExist/.././../stdlib/.", "."} + {"doesExist/.././../stdlib/.", "."}, + /* 30 */ + {"./doesExist/someFile/", 0, "./doesExist/someFile", ENOTDIR}, + {"./doesExist/someFile/..", 0, "./doesExist/someFile", ENOTDIR}, }; @@ -118,7 +121,7 @@ int do_test (int argc, char ** argv) { char * result; - int fd, i, errors = 0; + int i, errors = 0; char buf[PATH_MAX]; getcwd (cwd, sizeof(buf)); @@ -154,7 +157,9 @@ do_test (int argc, char ** argv) 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); + int has_dir = mkdir ("doesExist", 0777) == 0; + + int fd = has_dir ? creat ("doesExist/someFile", 0777) : -1; for (i = 0; i < (int) (sizeof (tests) / sizeof (tests[0])); ++i) { @@ -208,7 +213,10 @@ do_test (int argc, char ** argv) } if (fd >= 0) - unlink("doesExist"); + unlink ("doesExist/someFile"); + + if (has_dir) + rmdir ("doesExist"); for (i = 0; i < (int) (sizeof (symlinks) / sizeof (symlinks[0])); ++i) unlink (symlinks[i].name); |