diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | io/Makefile | 2 | ||||
| -rw-r--r-- | io/bug-ftw2.c | 88 | ||||
| -rw-r--r-- | io/ftw.c | 2 | ||||
| -rw-r--r-- | stdlib/jrand48_r.c | 2 |
5 files changed, 98 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index ae16f97217..4fb9da32ce 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2001-01-20 Ulrich Drepper <drepper@redhat.com> + + * io/ftw.c (ftw_dir): Add slash after directory name if there + wasn't any. Reported by loris <loris@iol.it>. + * io/Makefile (tests): Add bug-ftw2. + * io/bug-ftw2.c: New file. + 2001-01-19 Ulrich Drepper <drepper@redhat.com> * stdlib/jrand48_r.c (__jrand48_r): Correct constructing of diff --git a/io/Makefile b/io/Makefile index b1bc32d246..f68b12d2a1 100644 --- a/io/Makefile +++ b/io/Makefile @@ -56,7 +56,7 @@ static-only-routines = stat fstat lstat mknod stat64 fstat64 lstat64 others := pwd test-srcs := ftwtest tests := test-utime test-stat test-stat2 test-lfs tst-getcwd \ - tst-fcntl bug-ftw1 + tst-fcntl bug-ftw1 bug-ftw2 distribute := ftwtest-sh diff --git a/io/bug-ftw2.c b/io/bug-ftw2.c new file mode 100644 index 0000000000..2397b13b06 --- /dev/null +++ b/io/bug-ftw2.c @@ -0,0 +1,88 @@ +/* Test for ftw function searching in current directory. + Copyright (C) 2001 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper <drepper@cygnus.com>, 2001. + + 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 <ftw.h> +#include <mcheck.h> +#include <stdio.h> +#include <string.h> + + +int cnt; +int result; +int sawown; +int sawcur; + + +static int +callback (const char *fname, const struct stat *st, int flag) +{ + printf ("%d: \"%s\" -> ", ++cnt, fname); + if (strcmp (fname, ".") == 0 && sawcur) + { + puts ("current directory reported twice"); + result = 1; + } + else if (strcmp (fname, "./bug-ftw2.c") == 0 && sawown) + { + puts ("source file reported twice"); + result = 1; + } + else if (fname[0] != '.') + { + puts ("missing '.' as first character"); + result = 1; + } + else if (fname[1] != '\0' && fname[1] != '/') + { + puts ("no '/' in second position"); + result = 1; + } + else + { + puts ("OK"); + sawcur |= strcmp (fname, ".") == 0; + sawown |= strcmp (fname, "./bug-ftw2.c") == 0; + } + + return 0; +} + + +int +main (void) +{ + mtrace (); + + ftw (".", callback, 10); + + if (! sawcur) + { + puts ("current directory wasn't reported"); + result = 1; + } + + if (! sawown) + { + puts ("source file wasn't reported"); + result = 1; + } + + return result; +} diff --git a/io/ftw.c b/io/ftw.c index 18b60519f0..dc02ebf205 100644 --- a/io/ftw.c +++ b/io/ftw.c @@ -398,7 +398,7 @@ ftw_dir (struct ftw_data *data, struct STAT *st) startp = strchr (data->dirbuf, '\0'); /* There always must be a directory name. */ assert (startp != data->dirbuf); - if (startp != data->dirbuf + 1) + if (startp[-1] != '/') *startp++ = '/'; data->ftw.base = startp - data->dirbuf; diff --git a/stdlib/jrand48_r.c b/stdlib/jrand48_r.c index 48def5ef35..9df36942f6 100644 --- a/stdlib/jrand48_r.c +++ b/stdlib/jrand48_r.c @@ -31,7 +31,7 @@ __jrand48_r (xsubi, buffer, result) /* Store the result. */ if (sizeof (unsigned short int) == 2) - *result = (xsubi[2] << 16) | xsubi[1]; + *result = ((xsubi[2] << 16) | xsubi[1]) & 0xffffffffl; else *result = xsubi[2] & 0xffffffffl; |