Fixed windows build by adding d_reclen into win32 dirent wrapper.

Convert /r/n --> /n (patch tool doesn't handle it, grr).

CVS patchset: 7399
CVS date: 2005/02/11 21:18:39

2 files changed, 169 insertions, 167 deletions

diff --git a/win32/contrib/dirent/dirent.c b/win32/contrib/dirent/dirent.c
index 8249b60ce..1ef58a302 100644
--- a/win32/contrib/dirent/dirent.c
+++ b/win32/contrib/dirent/dirent.c
@@ -1,135 +1,136 @@
-/*

-

-    Implementation of POSIX directory browsing functions and types for Win32.

-

-    Kevlin Henney (mailto:kevlin@acm.org), March 1997.

-

-    Copyright Kevlin Henney, 1997. All rights reserved.

-

-    Permission to use, copy, modify, and distribute this software and its

-    documentation for any purpose is hereby granted without fee, provided

-    that this copyright and permissions notice appear in all copies and

-    derivatives, and that no charge may be made for the software and its

-    documentation except to cover cost of distribution.

-    

-    This software is supplied "as is" without express or implied warranty.

-

-    But that said, if there are any problems please get in touch.

-

-*/

-

-#include <dirent.h>

-#include <errno.h>

-#include <io.h>

-#include <stdlib.h>

-#include <string.h>

-

-#ifndef DIR

-

-struct DIR

-{

-    long                handle; /* -1 for failed rewind */

-    struct _finddata_t  info;

-    struct dirent       result; /* d_name null iff first time */

-    char                *name;  /* NTBS */

-};

-

-#endif

-

-DIR *opendir(const char *name)

-{

-    DIR *dir = 0;

-

-    if(name && name[0])

-    {

-        size_t base_length = strlen(name);

-        const char *all = /* the root directory is a special case... */

-            strchr("/\\", name[base_length - 1]) ? "*" : "/*";

-

-        if((dir = (DIR *) malloc(sizeof *dir)) != 0 &&

-           (dir->name = (char *) malloc(base_length + strlen(all) + 1)) != 0)

-        {

-            strcat(strcpy(dir->name, name), all);

-

-            if((dir->handle = _findfirst(dir->name, &dir->info)) != -1)

-            {

-                dir->result.d_name = 0;

-            }

-            else /* rollback */

-            {

-                free(dir->name);

-                free(dir);

-                dir = 0;

-            }

-        }

-        else /* rollback */

-        {

-            free(dir);

-            dir   = 0;

-            errno = ENOMEM;

-        }

-    }

-    else

-    {

-        errno = EINVAL;

-    }

-

-    return dir;

-}

-

-int closedir(DIR *dir)

-{

-    int result = -1;

-

-    if(dir)

-    {

-        if(dir->handle != -1)

-        {

-            result = _findclose(dir->handle);

-        }

-

-        free(dir->name);

-        free(dir);

-    }

-

-    if(result == -1) /* map all errors to EBADF */

-    {

-        errno = EBADF;

-    }

-

-    return result;

-}

-

-struct dirent *readdir(DIR *dir)

-{

-    struct dirent *result = 0;

-

-    if(dir && dir->handle != -1)

-    {

-        if(!dir->result.d_name || _findnext(dir->handle, &dir->info) != -1)

-        {

-            result         = &dir->result;

-            result->d_name = dir->info.name;

-        }

-    }

-    else

-    {

-        errno = EBADF;

-    }

-

-    return result;

-}

-

-void rewinddir(DIR *dir)

-{

-    if(dir && dir->handle != -1)

-    {

-        _findclose(dir->handle);

-        dir->handle = _findfirst(dir->name, &dir->info);

-        dir->result.d_name = 0;

-    }

-    else

-    {

-        errno = EBADF;

-    }

-}

+/*
+
+    Implementation of POSIX directory browsing functions and types for Win32.
+
+    Kevlin Henney (mailto:kevlin@acm.org), March 1997.
+
+    Copyright Kevlin Henney, 1997. All rights reserved.
+
+    Permission to use, copy, modify, and distribute this software and its
+    documentation for any purpose is hereby granted without fee, provided
+    that this copyright and permissions notice appear in all copies and
+    derivatives, and that no charge may be made for the software and its
+    documentation except to cover cost of distribution.
+    
+    This software is supplied "as is" without express or implied warranty.
+
+    But that said, if there are any problems please get in touch.
+
+*/
+
+#include <dirent.h>
+#include <errno.h>
+#include <io.h>
+#include <stdlib.h>
+#include <string.h>
+
+#ifndef DIR
+
+struct DIR
+{
+    long                handle; /* -1 for failed rewind */
+    struct _finddata_t  info;
+    struct dirent       result; /* d_name null iff first time */
+    char                *name;  /* NTBS */
+};
+
+#endif
+
+DIR *opendir(const char *name)
+{
+    DIR *dir = 0;
+
+    if(name && name[0])
+    {
+        size_t base_length = strlen(name);
+        const char *all = /* the root directory is a special case... */
+            strchr("/\\", name[base_length - 1]) ? "*" : "/*";
+
+        if((dir = (DIR *) malloc(sizeof *dir)) != 0 &&
+           (dir->name = (char *) malloc(base_length + strlen(all) + 1)) != 0)
+        {
+            strcat(strcpy(dir->name, name), all);
+
+            if((dir->handle = _findfirst(dir->name, &dir->info)) != -1)
+            {
+                dir->result.d_name = 0;
+            }
+            else /* rollback */
+            {
+                free(dir->name);
+                free(dir);
+                dir = 0;
+            }
+        }
+        else /* rollback */
+        {
+            free(dir);
+            dir   = 0;
+            errno = ENOMEM;
+        }
+    }
+    else
+    {
+        errno = EINVAL;
+    }
+
+    return dir;
+}
+
+int closedir(DIR *dir)
+{
+    int result = -1;
+
+    if(dir)
+    {
+        if(dir->handle != -1)
+        {
+            result = _findclose(dir->handle);
+        }
+
+        free(dir->name);
+        free(dir);
+    }
+
+    if(result == -1) /* map all errors to EBADF */
+    {
+        errno = EBADF;
+    }
+
+    return result;
+}
+
+struct dirent *readdir(DIR *dir)
+{
+    struct dirent *result = 0;
+
+    if(dir && dir->handle != -1)
+    {
+        if(!dir->result.d_name || _findnext(dir->handle, &dir->info) != -1)
+        {
+            result         = &dir->result;
+            result->d_name = dir->info.name;
+            result->d_reclen = strlen(dir->info.name);
+        }
+    }
+    else
+    {
+        errno = EBADF;
+    }
+
+    return result;
+}
+
+void rewinddir(DIR *dir)
+{
+    if(dir && dir->handle != -1)
+    {
+        _findclose(dir->handle);
+        dir->handle = _findfirst(dir->name, &dir->info);
+        dir->result.d_name = 0;
+    }
+    else
+    {
+        errno = EBADF;
+    }
+}
diff --git a/win32/contrib/dirent/dirent.h b/win32/contrib/dirent/dirent.h
index 588048c67..46e0ed127 100644
--- a/win32/contrib/dirent/dirent.h
+++ b/win32/contrib/dirent/dirent.h
@@ -1,32 +1,33 @@
-/*

-

-    Declaration of POSIX directory browsing functions and types for Win32.

-

-    Kevlin Henney (mailto:kevlin@acm.org), March 1997.

-

-    Copyright Kevlin Henney, 1997. All rights reserved.

-

-    Permission to use, copy, modify, and distribute this software and its

-    documentation for any purpose is hereby granted without fee, provided

-    that this copyright and permissions notice appear in all copies and

-    derivatives, and that no charge may be made for the software and its

-    documentation except to cover cost of distribution.

-    

-*/

-

-#ifndef DIRENT_INCLUDED

-#define DIRENT_INCLUDED

-

-typedef struct DIR DIR;

-

-struct dirent

-{

-    char *d_name;

-};

-

-DIR           *opendir(const char *);

-int           closedir(DIR *);

-struct dirent *readdir(DIR *);

-void          rewinddir(DIR *);

-

-#endif

+/*
+
+    Declaration of POSIX directory browsing functions and types for Win32.
+
+    Kevlin Henney (mailto:kevlin@acm.org), March 1997.
+
+    Copyright Kevlin Henney, 1997. All rights reserved.
+
+    Permission to use, copy, modify, and distribute this software and its
+    documentation for any purpose is hereby granted without fee, provided
+    that this copyright and permissions notice appear in all copies and
+    derivatives, and that no charge may be made for the software and its
+    documentation except to cover cost of distribution.
+    
+*/
+
+#ifndef DIRENT_INCLUDED
+#define DIRENT_INCLUDED
+
+typedef struct DIR DIR;
+
+struct dirent
+{
+    unsigned short d_reclen;
+    char *d_name;
+};
+
+DIR           *opendir(const char *);
+int           closedir(DIR *);
+struct dirent *readdir(DIR *);
+void          rewinddir(DIR *);
+
+#endif