replacement directory handling for BSD systems

diff --git a/repdir/Makefile b/repdir/Makefile
new file mode 100644 (file)
index 0000000..171e92c
--- /dev/null
+++ b/repdir/Makefile
@@ -0,0 +1,9 @@
+CC=gcc
+CFLAGS=-Wall -g
+
+
+os2_delete: os2_delete.o repdir.o
+       $(CC) -o os2_delete os2_delete.o repdir.o
+
+clean:
+       rm -f *.o os2_delete *~

diff --git a/repdir/os2_delete.c b/repdir/os2_delete.c
new file mode 100644 (file)
index 0000000..c2c9e6d
--- /dev/null
+++ b/repdir/os2_delete.c
@@ -0,0 +1,109 @@
+/*
+  test readdir/unlink pattern that OS/2 uses
+  tridge@samba.org July 2005
+*/
+
+#define _GNU_SOURCE
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <dirent.h>
+#include <errno.h>
+#include <string.h>
+#include <fcntl.h>
+#include "repdir.h"
+
+#define NUM_FILES 700
+#define READDIR_SIZE 100
+#define DELETE_SIZE 4
+
+#define TESTDIR "test.dir"
+
+#define FAILED() (fprintf(stderr, "Failed at %s:%d - %s\n", __FUNCTION__, __LINE__, strerror(errno)), exit(1), 1)
+
+#ifndef MIN
+#define MIN(a,b) ((a)<(b)?(a):(b))
+#endif
+
+static void cleanup(void)
+{
+       /* I'm a lazy bastard */
+       system("rm -rf " TESTDIR);
+       mkdir(TESTDIR, 0700) == 0 || FAILED();
+}
+
+static void create_files()
+{
+       int i;
+       for (i=0;i<NUM_FILES;i++) {
+               char fname[40];
+               snprintf(fname, sizeof(fname), TESTDIR "/test%u.txt", i);
+               close(open(fname, O_CREAT|O_RDWR, 0600)) == 0 || FAILED();
+       }
+}
+
+static int os2_delete(DIR *d)
+{
+       off_t offsets[READDIR_SIZE];
+       int i, j;
+       struct dirent *de;
+       char names[READDIR_SIZE][30];
+
+       /* scan, remembering offsets */
+       for (i=0, de=readdir(d); 
+            de && i < READDIR_SIZE; 
+            de=readdir(d), i++) {
+               offsets[i] = telldir(d);
+               strcpy(names[i], de->d_name);
+       }
+
+       if (i == 0) {
+               return 0;
+       }
+
+       /* delete the first few */
+       for (j=0; j<MIN(i, DELETE_SIZE); j++) {
+               char fname[40];
+               snprintf(fname, sizeof(fname), TESTDIR "/%s", names[j]);
+               unlink(fname) == 0 || FAILED();
+       }
+
+       /* seek to just after the deletion */
+       seekdir(d, offsets[j-1]);
+
+       /* return number deleted */
+       return j;
+}
+
+int main(void)
+{
+       int total_deleted = 0;
+       DIR *d;
+       struct dirent *de;
+
+       cleanup();
+       create_files();
+       
+       d = opendir(TESTDIR);
+
+       /* skip past . and .. */
+       de = readdir(d);
+       strcmp(de->d_name, ".") == 0 || FAILED();
+       de = readdir(d);
+       strcmp(de->d_name, "..") == 0 || FAILED();
+
+       while (1) {
+               int n = os2_delete(d);
+               if (n == 0) break;
+               total_deleted += n;
+       }
+       closedir(d);
+
+       printf("Deleted %d files of %d\n", total_deleted, NUM_FILES);
+
+       rmdir(TESTDIR) == 0 || FAILED();
+
+       return 0;
+}

diff --git a/repdir/repdir.c b/repdir/repdir.c
new file mode 100644 (file)
index 0000000..ba2fd85
--- /dev/null
+++ b/repdir/repdir.c
@@ -0,0 +1,94 @@
+/*
+  a replacement for opendir/readdir/telldir/seekdir/closedir for BSD systems
+  
+*/
+
+#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];
+};
+
+struct dir_buf *rep_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 d;
+}
+
+struct dirent *rep_readdir(struct dir_buf *d)
+{
+       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;
+}
+
+off_t rep_telldir(struct dir_buf *d)
+{
+       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 rep_seekdir(struct dir_buf *d, off_t ofs)
+{
+       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 (rep_readdir(d) == NULL) break;
+       }
+}
+
+int rep_closedir(struct dir_buf *d)
+{
+       int r = close(d->fd);
+       if (r != 0) {
+               return r;
+       }
+       free(d);
+       return 0;
+}
+

diff --git a/repdir/repdir.h b/repdir/repdir.h
new file mode 100644 (file)
index 0000000..a46021e
--- /dev/null
+++ b/repdir/repdir.h
@@ -0,0 +1,20 @@
+/*
+  a replacement for opendir/readdir/telldir/seekdir/closedir for BSD systems
+  
+*/
+
+struct dir_buf;
+
+struct dir_buf *rep_opendir(const char *dname);
+struct dirent *rep_readdir(struct dir_buf *d);
+off_t rep_telldir(struct dir_buf *d);
+void rep_seekdir(struct dir_buf *d, off_t ofs);
+int rep_closedir(struct dir_buf *d);
+
+/* and for compatibility ... */
+#define DIR struct dir_buf
+#define opendir rep_opendir
+#define readdir rep_readdir
+#define telldir rep_telldir
+#define seekdir rep_seekdir
+#define closedir rep_closedir