X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=libsysio%2Fsrc%2Fstdlib.c;h=03bf1c7b2dd8ab510e37cd3068c662d7b5a6542c;hb=55e8287b7024ee4ac280806caea9636dd454a0ed;hp=fcd463a9cb3b41bccf18717015a5dcfcac46e20a;hpb=8692f4651696ff4324db3ad738d3fa62f68d7347;p=fs%2Flustre-release.git

diff --git a/libsysio/src/stdlib.c b/libsysio/src/stdlib.c
index fcd463a..03bf1c7 100644
--- a/libsysio/src/stdlib.c
+++ b/libsysio/src/stdlib.c
@@ -39,200 +39,6 @@
 
 #include "sysio-symbols.h"
 
-#if !defined(__USE_LARGEFILE64)
-#error "__LARGEFILE64_SOURCE must be defined"
-#endif
-
-
-/***********************************************************
- * dir series functions                                    *
- ***********************************************************/
-
-#undef  BUFSIZE
-#define BUFSIZE	4096
-
-struct __dirstream {
-	int               fd;
-	loff_t		  base;
-	loff_t            filepos;       /* current pos in dir file stream */
-	struct dirent    *curent;        /* current dirent pointer */
-	struct dirent64  *curent64;      /* current dirent64 pointer */
-	struct dirent    *retent;        /* ent returned to caller */
-	struct dirent64  *retent64;      /* ent64 returned to caller */
-	unsigned int      effective;     /* effective data size in buffer */
-	char              buf[BUFSIZE];
-};
-
-DIR* opendir(const char *name)
-{
-	DIR *dir;
-
-	dir = (DIR *) malloc(sizeof(*dir));
-	if (!dir) {
-		errno = ENOMEM;
-		return NULL;
-	}
-
-#if __USE_LARGEFILE64
-	dir->fd = open64(name, O_RDONLY);
-#else
-	dir->fd = open(name, O_RDONLY);
-#endif
-	if (dir->fd < 0)
-		goto err_out;
-
-	dir->base = 0;
-	dir->filepos = 0;
-	dir->curent = (struct dirent *) dir->buf;
-	dir->curent64 = (struct dirent64 *) dir->buf;
-	dir->retent = NULL;
-	dir->retent64 = NULL;
-	dir->effective = 0;
-
-	return dir;
-err_out:
-	free(dir);
-	return NULL;
-}
-
-sysio_sym_weak_alias(opendir, __opendir);
-
-struct dirent64 *readdir64(DIR *dir)
-{
-	int rc, reclen;
-
-	/* need to read new data? */
-	if ((char*)dir->curent64 - dir->buf >= dir->effective) {
-		rc = getdirentries64(dir->fd, dir->buf, BUFSIZE, &dir->base);
-		/* error or end-of-file */
-		if (rc <= 0)
-			return NULL;
-
-		dir->curent64 = (struct dirent64 *) dir->buf;
-		dir->effective = rc;
-	}
-
-	dir->retent64 = dir->curent64;
-	dir->curent64 = (struct dirent64*) ((char *)(dir->curent64) +
-				dir->curent64->d_reclen);
-#ifdef _DIRENT_HAVE_D_OFF
-	dir->filepos = dir->curent64->d_off;
-#else
-	dir->filepos += dir->curent64->d_reclen;
-#endif
-	return dir->retent64;
-}
-
-sysio_sym_weak_alias(readdir64, __readdir64);
-
-/* XXX probably the following assumption is not true */
-#if __WORDSIZE == 64
-#define NATURAL_READDIR64
-#else
-#undef  NATURAL_READDIR64
-#endif
-
-#ifndef NATURAL_READDIR64
-
-struct dirent *readdir(DIR *dir)
-{
-	int rc, reclen;
-
-	/* need to read new data? */
-	if ((char*)dir->curent - dir->buf >= dir->effective) {
-		rc = getdirentries(dir->fd, dir->buf, BUFSIZE, (off_t*) &dir->base);
-		/* error or end-of-file */
-		if (rc <= 0)
-			return NULL;
-
-		dir->curent = (struct dirent *) dir->buf;
-		dir->effective = rc;
-	}
-
-	dir->retent = dir->curent;
-	dir->curent = (struct dirent*) ((char *)(dir->curent) +
-				dir->curent->d_reclen);
-#ifdef _DIRENT_HAVE_D_OFF
-	dir->filepos = dir->curent->d_off;
-#else
-	dir->filepos += dir->curent->d_reclen;
-#endif
-	return dir->retent;
-}
-sysio_sym_weak_alias(readdir, __readdir);
-
-#else /* NATURAL_READDIR64 */
-
-struct dirent *readdir(DIR *dir) {
-	return (struct dirent *) readdir64(dir);
-}
-sysio_sym_weak_alias(readdir, __readdir);
-
-#endif /* NATURAL_READDIR64 */
-
-int closedir(DIR *dir)
-{
-	int rc;
-
-	rc = close(dir->fd);
-
-	free(dir);
-	return rc;
-}
-
-sysio_sym_weak_alias(closedir, __closedir);
-
-int dirfd(DIR *dir)
-{
-	return dir->fd;
-}
-
-off_t telldir(DIR *dir)
-{
-	return (dir->filepos);
-}
-
-void seekdir(DIR *dir, off_t offset)
-{
-	dir->filepos = offset;
-
-	dir->base = offset;
-	dir->curent64 = (struct dirent64 *) dir->buf;
-	dir->retent64 = NULL;
-	dir->effective = 0;
-	dir->curent = (struct dirent *) dir->buf;
-	dir->retent = NULL;
-}
-
-void rewinddir(DIR *dir)
-{
-	dir->base = 0;
-	dir->filepos = 0;
-	dir->curent64 = (struct dirent64 *) dir->buf;
-	dir->retent64 = NULL;
-	dir->curent = (struct dirent *) dir->buf;
-	dir->retent = NULL;
-	dir->effective = 0;
-}
-
-#if 0
-int scandir(const char *dir, struct dirent ***namelist,
-            int(*select)(const struct dirent *),
-            int(*compar)(const void *, const void *))
-{
-	errno = ENOSYS;
-	return -1;
-}
-
-int scandir64(const char *dir, struct dirent64 ***namelist,
-              int(*select)(const struct dirent64 *),
-              int(*compar)(const void *, const void *))
-{
-	errno = ENOSYS;
-	return -1;
-}
-#endif
-
 /***********************************************************
  * FIXME workaround for linux only                         *
  ***********************************************************/