From c564344766c1e888c0ab3f866ea4b3318135d0e5 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Wed, 13 Sep 2006 09:56:21 +0000
Subject: r18451: move repdir/ into the top dir
metze
(This used to be commit a564194817d9b78e353abb6bf0548b2dd9eb130b)
---
source4/lib/replace/repdir_getdents.c | 162 ++++++++++++++++++++++++++++++++++
1 file changed, 162 insertions(+)
create mode 100644 source4/lib/replace/repdir_getdents.c
(limited to 'source4/lib/replace/repdir_getdents.c')
diff --git a/source4/lib/replace/repdir_getdents.c b/source4/lib/replace/repdir_getdents.c
new file mode 100644
index 0000000000..eca1ecc9d5
--- /dev/null
+++ b/source4/lib/replace/repdir_getdents.c
@@ -0,0 +1,162 @@
+/*
+ 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
+
+ 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 getdents()
+ 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 <stdlib.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <dirent.h>
+
+#define DIR_BUF_BITS 9
+#define DIR_BUF_SIZE (1<<DIR_BUF_BITS)
+
+struct dir_buf {
+ int fd;
+ int nbytes, ofs;
+ off_t seekpos;
+ char buf[DIR_BUF_SIZE];
+};
+
+DIR *opendir(const char *dname)
+{
+ struct dir_buf *d;
+ d = malloc(sizeof(*d));
+ if (d == NULL) {
+ errno = ENOMEM;
+ return NULL;
+ }
+ d->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->seekpos = lseek(d->fd, 0, SEEK_CUR);
+ d->nbytes = getdents(d->fd, d->buf, DIR_BUF_SIZE);
+ 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;
+}
+
+#ifdef _OSF_SOURCE
+int seekdir(DIR *dir, long ofs)
+#else
+void seekdir(DIR *dir, long ofs)
+#endif
+{
+ struct dir_buf *d = (struct dir_buf *)dir;
+ d->seekpos = lseek(d->fd, ofs & ~(DIR_BUF_SIZE-1), SEEK_SET);
+ d->nbytes = getdents(d->fd, d->buf, DIR_BUF_SIZE);
+ d->ofs = 0;
+ while (d->ofs < (ofs & (DIR_BUF_SIZE-1))) {
+ if (readdir(dir) == NULL) break;
+ }
+#ifdef _OSF_SOURCE
+ return -1;
+#endif
+}
+
+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 2c3dc50953341c4f59cb46aed05be358dd9c3e81 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Wed, 13 Sep 2006 10:12:03 +0000
Subject: r18456: Tru64 doesn't have getdents() so we don't need this
ifdef's...
metze
(This used to be commit 5af86eb3f07e26aead67ab0dd46576e0aefe8eb4)
---
source4/lib/replace/repdir_getdents.c | 7 -------
1 file changed, 7 deletions(-)
(limited to 'source4/lib/replace/repdir_getdents.c')
diff --git a/source4/lib/replace/repdir_getdents.c b/source4/lib/replace/repdir_getdents.c
index eca1ecc9d5..07b9568dc1 100644
--- a/source4/lib/replace/repdir_getdents.c
+++ b/source4/lib/replace/repdir_getdents.c
@@ -118,11 +118,7 @@ long telldir(DIR *dir)
return d->seekpos + d->ofs;
}
-#ifdef _OSF_SOURCE
-int seekdir(DIR *dir, long ofs)
-#else
void seekdir(DIR *dir, long ofs)
-#endif
{
struct dir_buf *d = (struct dir_buf *)dir;
d->seekpos = lseek(d->fd, ofs & ~(DIR_BUF_SIZE-1), SEEK_SET);
@@ -131,9 +127,6 @@ void seekdir(DIR *dir, long ofs)
while (d->ofs < (ofs & (DIR_BUF_SIZE-1))) {
if (readdir(dir) == NULL) break;
}
-#ifdef _OSF_SOURCE
- return -1;
-#endif
}
void rewinddir(DIR *dir)
--
cgit
From 127c96f49905291b4566c2a1bc25d882ae111466 Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vlendec@samba.org>
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_getdents.c | 12 ++++++++++++
1 file changed, 12 insertions(+)
(limited to 'source4/lib/replace/repdir_getdents.c')
diff --git a/source4/lib/replace/repdir_getdents.c b/source4/lib/replace/repdir_getdents.c
index 07b9568dc1..6b115c4c4f 100644
--- a/source4/lib/replace/repdir_getdents.c
+++ b/source4/lib/replace/repdir_getdents.c
@@ -68,6 +68,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;
@@ -78,6 +79,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 <tridge@samba.org>
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_getdents.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'source4/lib/replace/repdir_getdents.c')
diff --git a/source4/lib/replace/repdir_getdents.c b/source4/lib/replace/repdir_getdents.c
index 6b115c4c4f..4ce981a619 100644
--- a/source4/lib/replace/repdir_getdents.c
+++ b/source4/lib/replace/repdir_getdents.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 <tridge@samba.org>
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_getdents.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
(limited to 'source4/lib/replace/repdir_getdents.c')
diff --git a/source4/lib/replace/repdir_getdents.c b/source4/lib/replace/repdir_getdents.c
index 4ce981a619..afc634a796 100644
--- a/source4/lib/replace/repdir_getdents.c
+++ b/source4/lib/replace/repdir_getdents.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 <http://www.gnu.org/licenses/>.
*/
/*
a replacement for opendir/readdir/telldir/seekdir/closedir for BSD systems
--
cgit