acconfig.h configure configure.in include/config.h.in

lib/system.c script/mkproto.awk include/includes.h: Added sys_readdir that
      wraps readdir64.
lib/util.c: Changed gethostname() to use sizeof(hostname) as the second arg
for buffer size.
Jeremy.

3 files changed, 14 insertions, 0 deletions

diff --git a/source/include/config.h.in b/source/include/config.h.in
index 5904bede8e0..45370d4b9aa 100644
--- a/source/include/config.h.in
+++ b/source/include/config.h.in
@@ -152,6 +152,7 @@
 #undef HAVE_SHADOW_H
 #undef HAVE_MEMSET
 #undef HAVE_STRCASECMP
+#undef HAVE_STRUCT_DIRENT64
 
 /* The number of bytes in a int.  */
 #undef SIZEOF_INT
diff --git a/source/include/includes.h b/source/include/includes.h
index 20d784e19df..447196009de 100644
--- a/source/include/includes.h
+++ b/source/include/includes.h
@@ -464,6 +464,18 @@
 #endif
 
 /*
+ * Type for dirent structure.
+ */
+
+#ifndef SMB_STRUCT_DIRENT
+#  if defined(HAVE_STRUCT_DIRENT64)
+#    define SMB_STRUCT_DIRENT struct dirent64
+#  else
+#    define SMB_STRUCT_DIRENT struct dirent
+#  endif
+#endif
+
+/*
  * Defines for 64 bit fcntl locks.
  */
 
diff --git a/source/include/proto.h b/source/include/proto.h
index c06d7e51750..effdcc2d61f 100644
--- a/source/include/proto.h
+++ b/source/include/proto.h
@@ -175,6 +175,7 @@ int sys_creat(const char *path, mode_t mode);
 int sys_open(const char *path, int oflag, mode_t mode);
 FILE *sys_fopen(const char *path, const char *type);
 void *sys_mmap(void *addr, size_t len, int prot, int flags, int fd, SMB_OFF_T offset);
+SMB_STRUCT_DIRENT *sys_readdir(DIR *dirp);
 int sys_waitpid(pid_t pid,int *status,int options);
 char *sys_getwd(char *s);
 int sys_chown(const char *fname,uid_t uid,gid_t gid);