Import dietlibc 0.22 + other fixes for AMD64

1 files changed, 62 insertions, 0 deletions

diff --git a/mdk-stage1/dietlibc/lib/readdir64.c b/mdk-stage1/dietlibc/lib/readdir64.c
new file mode 100644
index 000000000..b9b0aafcc
--- /dev/null
+++ b/mdk-stage1/dietlibc/lib/readdir64.c
@@ -0,0 +1,62 @@
+#include "dietfeatures.h"
+#include "dietdirent.h"
+#include <unistd.h>
+#include <dirent.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <string.h>
+#include "syscalls.h"
+
+#ifndef __NR_getdents64
+#define WANT_LARGEFILE_BACKCOMPAT
+#endif
+
+#ifndef WANT_LARGEFILE_BACKCOMPAT
+struct dirent64* readdir64(DIR *d) {
+  if (!d->num || (d->cur += ((struct dirent64*)(d->buf+d->cur))->d_reclen)>=d->num) {
+    int res=getdents64(d->fd,(struct dirent64*)d->buf, sizeof (d->buf)-1);
+    if (res<=0) return 0;
+    d->num=res; d->cur=0;
+  }
+  return (struct dirent64*)(d->buf+d->cur);
+}
+#else
+struct dirent64* readdir64(DIR *d) {
+#ifdef __NR_getdents64
+  static int trygetdents64=1;
+#endif
+  struct dirent* o;
+  static struct dirent64 d64;
+again:
+#ifdef __NR_getdents64
+  if (!trygetdents64) {
+#endif
+    if (!d->num || (d->cur += ((struct dirent*)(d->buf+d->cur))->d_reclen)>=d->num) {
+      int res=getdents(d->fd,(struct dirent*)d->buf, sizeof (d->buf)-1);
+      if (res<=0) return 0;
+      d->num=res; d->cur=0;
+    }
+    o=(struct dirent*)(d->buf+d->cur);
+    d64.d_ino=o->d_ino;
+    d64.d_off=o->d_off;
+    d64.d_reclen=o->d_reclen;
+    strcpy(d64.d_name,o->d_name);
+    d64.d_type=0;	/* is this correct? */
+    return &d64;
+#ifdef __NR_getdents64
+  }
+  if (!d->num || (d->cur += ((struct dirent64*)(d->buf+d->cur))->d_reclen)>=d->num) {
+    int res=getdents64(d->fd,(struct dirent64*)d->buf,sizeof (d->buf));
+    if (res<=0) {
+      if (errno==ENOSYS) {
+	trygetdents64=0;
+	goto again;
+      }
+      return 0;
+    }
+    d->num=res; d->cur=0;
+  }
+  return (struct dirent64*)(d->buf+d->cur);
+#endif
+}
+#endif