From dfef2dc22fd8188b5ac577c7c87ab6f58ebb6440 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 13 Sep 2006 10:00:45 +0000 Subject: r18452: add configure test for a getdirentries() based replacement for broken readdir() Tru64 need this, linux also has getdirentries() but the native readdir() works but it means we can write the code on linux and when it works it may work on Tru64 too. tridge: can you try to implement this? metze (This used to be commit dd791d255ca61159b38a59b89f954a61fc5e9cf6) --- source4/lib/replace/repdir_getdirentries.c | 1 + 1 file changed, 1 insertion(+) create mode 100644 source4/lib/replace/repdir_getdirentries.c (limited to 'source4/lib/replace/repdir_getdirentries.c') diff --git a/source4/lib/replace/repdir_getdirentries.c b/source4/lib/replace/repdir_getdirentries.c new file mode 100644 index 0000000000..ff93ed4ea3 --- /dev/null +++ b/source4/lib/replace/repdir_getdirentries.c @@ -0,0 +1 @@ +#error "the readdir() replacement using getdirentried() isn't implemented yet" -- cgit From ae984783858b14e770e44343df04b7576be6d6a1 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Thu, 14 Sep 2006 02:25:57 +0000 Subject: r18492: an attempt at replacing readdir() with something based on getdirentries() This is untested on any of the platforms that matter, so we'll just have to see if the build farm machines like it (This used to be commit 343b0871b16c86b68badd4581420f475f94e79c9) --- source4/lib/replace/repdir_getdirentries.c | 158 ++++++++++++++++++++++++++++- 1 file changed, 157 insertions(+), 1 deletion(-) (limited to 'source4/lib/replace/repdir_getdirentries.c') diff --git a/source4/lib/replace/repdir_getdirentries.c b/source4/lib/replace/repdir_getdirentries.c index ff93ed4ea3..3079eefed0 100644 --- a/source4/lib/replace/repdir_getdirentries.c +++ b/source4/lib/replace/repdir_getdirentries.c @@ -1 +1,157 @@ -#error "the readdir() replacement using getdirentried() isn't implemented yet" +/* + Unix SMB/CIFS implementation. + + Copyright (C) Andrew Tridgell 2005 + + ** NOTE! The following LGPL license applies to the replace + ** library. This does NOT imply that all of Samba is released + ** under the LGPL + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ +/* + a replacement for opendir/readdir/telldir/seekdir/closedir for BSD + systems using getdirentries + + This is needed because the existing directory handling in FreeBSD + and OpenBSD (and possibly NetBSD) doesn't correctly handle unlink() + on files in a directory where telldir() has been used. On a block + boundary it will occasionally miss a file when seekdir() is used to + return to a position previously recorded with telldir(). + + This also fixes a severe performance and memory usage problem with + telldir() on BSD systems. Each call to telldir() in BSD adds an + entry to a linked list, and those entries are cleaned up on + closedir(). This means with a large directory closedir() can take an + arbitrary amount of time, causing network timeouts as millions of + telldir() entries are freed + + Note! This replacement code is not portable. It relies on + getdirentries() always leaving the file descriptor at a seek offset + that is a multiple of DIR_BUF_SIZE. If the code detects that this + doesn't happen then it will abort(). It also does not handle + directories with offsets larger than can be stored in a long, + + This code is available under other free software licenses as + well. Contact the author. +*/ + +#include +#include +#include +#include +#include +#include +#include + +#define DIR_BUF_BITS 9 +#define DIR_BUF_SIZE (1<fd = open(dname, O_RDONLY); + if (d->fd == -1) { + free(d); + return NULL; + } + d->ofs = 0; + d->seekpos = 0; + d->nbytes = 0; + return (DIR *)d; +} + +struct dirent *readdir(DIR *dir) +{ + struct dir_buf *d = (struct dir_buf *)dir; + struct dirent *de; + + if (d->ofs >= d->nbytes) { + d->nbytes = getdirentries(d->fd, d->buf, DIR_BUF_SIZE, &d->seekpos); + d->ofs = 0; + } + if (d->ofs >= d->nbytes) { + return NULL; + } + de = (struct dirent *)&d->buf[d->ofs]; + d->ofs += de->d_reclen; + return de; +} + +long telldir(DIR *dir) +{ + struct dir_buf *d = (struct dir_buf *)dir; + if (d->ofs >= d->nbytes) { + d->seekpos = lseek(d->fd, 0, SEEK_CUR); + d->ofs = 0; + d->nbytes = 0; + } + /* this relies on seekpos always being a multiple of + DIR_BUF_SIZE. Is that always true on BSD systems? */ + if (d->seekpos & (DIR_BUF_SIZE-1)) { + abort(); + } + return d->seekpos + d->ofs; +} + +void seekdir(DIR *dir, long ofs) +{ + struct dir_buf *d = (struct dir_buf *)dir; + d->seekpos = lseek(d->fd, ofs & ~(DIR_BUF_SIZE-1), SEEK_SET); + d->nbytes = getdirentries(d->fd, d->buf, DIR_BUF_SIZE, &d->seekpos); + d->ofs = 0; + while (d->ofs < (ofs & (DIR_BUF_SIZE-1))) { + if (readdir(dir) == NULL) break; + } +} + +void rewinddir(DIR *dir) +{ + seekdir(dir, 0); +} + +int closedir(DIR *dir) +{ + struct dir_buf *d = (struct dir_buf *)dir; + int r = close(d->fd); + if (r != 0) { + return r; + } + free(d); + return 0; +} + +#ifndef dirfd +/* darn, this is a macro on some systems. */ +int dirfd(DIR *dir) +{ + struct dir_buf *d = (struct dir_buf *)dir; + return d->fd; +} +#endif + + -- cgit From bdfecf3c9777bac276eb3d257ef55728e5dcc6ca Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Thu, 14 Sep 2006 02:37:00 +0000 Subject: r18493: another "blind coding" attempt at a getdirentries() based readdir() replacement (This used to be commit 94b73d692bf85604c7be811bad0b8c6a08b18103) --- source4/lib/replace/repdir_getdirentries.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'source4/lib/replace/repdir_getdirentries.c') diff --git a/source4/lib/replace/repdir_getdirentries.c b/source4/lib/replace/repdir_getdirentries.c index 3079eefed0..33c63c3bcc 100644 --- a/source4/lib/replace/repdir_getdirentries.c +++ b/source4/lib/replace/repdir_getdirentries.c @@ -91,7 +91,9 @@ struct dirent *readdir(DIR *dir) struct dirent *de; if (d->ofs >= d->nbytes) { - d->nbytes = getdirentries(d->fd, d->buf, DIR_BUF_SIZE, &d->seekpos); + long pos; + d->nbytes = getdirentries(d->fd, d->buf, DIR_BUF_SIZE, &pos); + d->seekpos = pos; d->ofs = 0; } if (d->ofs >= d->nbytes) { @@ -121,8 +123,9 @@ long telldir(DIR *dir) void seekdir(DIR *dir, long ofs) { struct dir_buf *d = (struct dir_buf *)dir; + long pos; d->seekpos = lseek(d->fd, ofs & ~(DIR_BUF_SIZE-1), SEEK_SET); - d->nbytes = getdirentries(d->fd, d->buf, DIR_BUF_SIZE, &d->seekpos); + d->nbytes = getdirentries(d->fd, d->buf, DIR_BUF_SIZE, &pos); d->ofs = 0; while (d->ofs < (ofs & (DIR_BUF_SIZE-1))) { if (readdir(dir) == NULL) break; -- cgit From ac24d381a5a9bc4611701bcbf956fe017bdddaeb Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Thu, 14 Sep 2006 05:33:54 +0000 Subject: r18499: this hopefully lets the code compile on OpenBSD the prototype was fixed in this revision http://www.openbsd.org/cgi-bin/cvsweb/src/include/dirent.h.diff?r1=1.15&r2=1.16 so we'll need a configure test to find the prototype of telldir later metze (This used to be commit c4da3b43640368aff98e501b6ca7801821fd2fbd) --- source4/lib/replace/repdir_getdirentries.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'source4/lib/replace/repdir_getdirentries.c') diff --git a/source4/lib/replace/repdir_getdirentries.c b/source4/lib/replace/repdir_getdirentries.c index 33c63c3bcc..a9c1c1ce82 100644 --- a/source4/lib/replace/repdir_getdirentries.c +++ b/source4/lib/replace/repdir_getdirentries.c @@ -104,7 +104,13 @@ struct dirent *readdir(DIR *dir) return de; } +#define TELLDIR_TAKES_CONST_DIR + +#ifdef TELLDIR_TAKES_CONST_DIR +long telldir(const DIR *dir) +#else long telldir(DIR *dir) +#endif { struct dir_buf *d = (struct dir_buf *)dir; if (d->ofs >= d->nbytes) { -- cgit From a0e87e5dc79bc631cb2362ebbf4d91913a342273 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Thu, 14 Sep 2006 08:26:41 +0000 Subject: r18505: add configure checks for telldir() and seekdir() telldir() is different on older OpenBSD versions seekdir() is different Tru64 tridge: OpenBSD seems to like this replacement:-) while MAC OS 10 gets 134 runtime error:-( lets wait what Tru64 will give metze (This used to be commit 1f4e602ff239b7feabb2dd1d6938dedf91bde5cd) --- source4/lib/replace/repdir_getdirentries.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'source4/lib/replace/repdir_getdirentries.c') diff --git a/source4/lib/replace/repdir_getdirentries.c b/source4/lib/replace/repdir_getdirentries.c index a9c1c1ce82..9e4b63145c 100644 --- a/source4/lib/replace/repdir_getdirentries.c +++ b/source4/lib/replace/repdir_getdirentries.c @@ -48,6 +48,7 @@ well. Contact the author. */ +#include "replace.h" #include #include #include @@ -104,8 +105,6 @@ struct dirent *readdir(DIR *dir) return de; } -#define TELLDIR_TAKES_CONST_DIR - #ifdef TELLDIR_TAKES_CONST_DIR long telldir(const DIR *dir) #else @@ -126,7 +125,11 @@ long telldir(DIR *dir) return d->seekpos + d->ofs; } +#ifdef SEEKDIR_RETURNS_INT +int seekdir(DIR *dir, long ofs) +#else void seekdir(DIR *dir, long ofs) +#endif { struct dir_buf *d = (struct dir_buf *)dir; long pos; @@ -136,6 +139,9 @@ void seekdir(DIR *dir, long ofs) while (d->ofs < (ofs & (DIR_BUF_SIZE-1))) { if (readdir(dir) == NULL) break; } +#ifdef SEEKDIR_RETURNS_INT + return -1; +#endif } void rewinddir(DIR *dir) -- cgit From 127c96f49905291b4566c2a1bc25d882ae111466 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Sun, 1 Oct 2006 20:45:46 +0000 Subject: r19017: Merge from Samba3: Attempt to fix the BSD RAW-CHKPATH failures: In Samba3 we rely on opendir returning ENOTDIR when the file opened is not a directory. Can we merge this back into Samba4? This includes the tabs->spaces fix requested by Stefan. Volker (This used to be commit 7b9ee1171ddc89537ba3b286f20c722fb70c980b) --- source4/lib/replace/repdir_getdirentries.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'source4/lib/replace/repdir_getdirentries.c') diff --git a/source4/lib/replace/repdir_getdirentries.c b/source4/lib/replace/repdir_getdirentries.c index 9e4b63145c..a6026dfb5d 100644 --- a/source4/lib/replace/repdir_getdirentries.c +++ b/source4/lib/replace/repdir_getdirentries.c @@ -70,6 +70,7 @@ struct dir_buf { DIR *opendir(const char *dname) { struct dir_buf *d; + struct stat sb; d = malloc(sizeof(*d)); if (d == NULL) { errno = ENOMEM; @@ -80,6 +81,17 @@ DIR *opendir(const char *dname) free(d); return NULL; } + if (fstat(d->fd, &sb) < 0) { + close(d->fd); + free(d); + return NULL; + } + if (!S_ISDIR(sb.st_mode)) { + close(d->fd); + free(d); + errno = ENOTDIR; + return NULL; + } d->ofs = 0; d->seekpos = 0; d->nbytes = 0; -- cgit From b8d69a7ea2505b706ff7c74d7c97bc89d82dfa07 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Tue, 10 Jul 2007 02:46:15 +0000 Subject: r23795: more v2->v3 conversion (This used to be commit 84b468b2f8f2dffda89593f816e8bc6a8b6d42ac) --- source4/lib/replace/repdir_getdirentries.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source4/lib/replace/repdir_getdirentries.c') diff --git a/source4/lib/replace/repdir_getdirentries.c b/source4/lib/replace/repdir_getdirentries.c index a6026dfb5d..34dd0dd314 100644 --- a/source4/lib/replace/repdir_getdirentries.c +++ b/source4/lib/replace/repdir_getdirentries.c @@ -10,7 +10,7 @@ This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. + version 3 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of -- cgit From 6c973f4e8ccbcb6c9275f8a54e26abb19df7e15a Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Tue, 10 Jul 2007 03:42:26 +0000 Subject: r23798: updated old Temple Place FSF addresses to new URL (This used to be commit 40c0919aaa9c1b14bbaebb95ecce53eb0380fdbb) --- source4/lib/replace/repdir_getdirentries.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'source4/lib/replace/repdir_getdirentries.c') diff --git a/source4/lib/replace/repdir_getdirentries.c b/source4/lib/replace/repdir_getdirentries.c index 34dd0dd314..197e5931fc 100644 --- a/source4/lib/replace/repdir_getdirentries.c +++ b/source4/lib/replace/repdir_getdirentries.c @@ -18,8 +18,7 @@ Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + License along with this library; if not, see . */ /* a replacement for opendir/readdir/telldir/seekdir/closedir for BSD -- cgit