From e56756e94e46c42446ac8352f43fb7b51f899d2e Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Mon, 26 Jun 2006 12:59:44 +0000
Subject: Use Unix line endings instead of DOS ones, per Magnus.

---
 src/port/dirent.c | 216 +++++++++++++++++++++++++++---------------------------
 1 file changed, 108 insertions(+), 108 deletions(-)

(limited to 'src/port/dirent.c')

diff --git a/src/port/dirent.c b/src/port/dirent.c
index 3722db862d5..18e8d84f698 100644
--- a/src/port/dirent.c
+++ b/src/port/dirent.c
@@ -1,108 +1,108 @@
-/*-------------------------------------------------------------------------
- *
- * dirent.c
- *	  opendir/readdir/closedir for win32/msvc
- *
- * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group
- * Portions Copyright (c) 1994, Regents of the University of California
- *
- *
- * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/port/dirent.c,v 1.1 2006/06/07 22:24:46 momjian Exp $
- *
- *-------------------------------------------------------------------------
- */
-
-#include "postgres.h"
-#include <dirent.h>
-
-
-struct DIR {
-	char *dirname;
-	struct dirent ret; /* Used to return to caller */
-	HANDLE handle;
-};
-
-DIR* opendir(const char *dirname)
-{
-	DWORD attr;
-	DIR *d;
-
-	/* Make sure it is a directory */
-	attr = GetFileAttributes(dirname);
-	if (attr == INVALID_FILE_ATTRIBUTES) 
-	{
-		errno = ENOENT;
-		return NULL;
-	}
-	if ((attr & FILE_ATTRIBUTE_DIRECTORY) != FILE_ATTRIBUTE_DIRECTORY)
-	{
-		errno = ENOTDIR;
-		return NULL;
-	}
-
-	d = malloc(sizeof(DIR));
-	if (!d)
-	{
-		errno = ENOMEM;
-		return NULL;
-	}
-	d->dirname = malloc(strlen(dirname)+4);
-	if (!d->dirname)
-	{
-		errno = ENOMEM;
-		free(d);
-		return NULL;
-	}
-	strcpy(d->dirname, dirname);
-	if (d->dirname[strlen(d->dirname)-1] != '/' &&
-	    d->dirname[strlen(d->dirname)-1] != '\\')
-		strcat(d->dirname,"\\"); /* Append backslash if not already there */
-	strcat(d->dirname,"*");          /* Search for entries named anything */
-	d->handle = INVALID_HANDLE_VALUE;
-	d->ret.d_ino = 0; /* no inodes on win32 */
-	d->ret.d_reclen =  0; /* not used on win32 */
-
-	return d;
-}
-
-struct dirent* readdir(DIR * d)
-{
-	WIN32_FIND_DATA fd;
-
-	if (d->handle == INVALID_HANDLE_VALUE)
-	{
-		d->handle = FindFirstFile(d->dirname, &fd);
-		if (d->handle == INVALID_HANDLE_VALUE)
-		{
-			errno = ENOENT;
-			return NULL;
-		}
-	}
-	else 
-	{
-		if (!FindNextFile(d->handle, &fd))
-		{
-			if (GetLastError() == ERROR_NO_MORE_FILES)
-			{
-				/* No more files, force errno=0 (unlike mingw) */
-				errno = 0;
-				return NULL;
-			}
-			_dosmaperr(GetLastError());
-			return NULL;
-		}
-	}
-	strcpy(d->ret.d_name, fd.cFileName); /* Both strings are MAX_PATH long */
-	d->ret.d_namlen = strlen(d->ret.d_name);
-	return &d->ret;
-}
-
-int closedir(DIR *d)
-{
-	if (d->handle != INVALID_HANDLE_VALUE)
-		FindClose(d->handle);
-	free(d->dirname);
-	free(d);
-	return 0;
-}
+/*-------------------------------------------------------------------------
+ *
+ * dirent.c
+ *	  opendir/readdir/closedir for win32/msvc
+ *
+ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1994, Regents of the University of California
+ *
+ *
+ * IDENTIFICATION
+ *	  $PostgreSQL: pgsql/src/port/dirent.c,v 1.2 2006/06/26 12:58:17 momjian Exp $
+ *
+ *-------------------------------------------------------------------------
+ */
+
+#include "postgres.h"
+#include <dirent.h>
+
+
+struct DIR {
+	char *dirname;
+	struct dirent ret; /* Used to return to caller */
+	HANDLE handle;
+};
+
+DIR* opendir(const char *dirname)
+{
+	DWORD attr;
+	DIR *d;
+
+	/* Make sure it is a directory */
+	attr = GetFileAttributes(dirname);
+	if (attr == INVALID_FILE_ATTRIBUTES) 
+	{
+		errno = ENOENT;
+		return NULL;
+	}
+	if ((attr & FILE_ATTRIBUTE_DIRECTORY) != FILE_ATTRIBUTE_DIRECTORY)
+	{
+		errno = ENOTDIR;
+		return NULL;
+	}
+
+	d = malloc(sizeof(DIR));
+	if (!d)
+	{
+		errno = ENOMEM;
+		return NULL;
+	}
+	d->dirname = malloc(strlen(dirname)+4);
+	if (!d->dirname)
+	{
+		errno = ENOMEM;
+		free(d);
+		return NULL;
+	}
+	strcpy(d->dirname, dirname);
+	if (d->dirname[strlen(d->dirname)-1] != '/' &&
+	    d->dirname[strlen(d->dirname)-1] != '\\')
+		strcat(d->dirname,"\\"); /* Append backslash if not already there */
+	strcat(d->dirname,"*");          /* Search for entries named anything */
+	d->handle = INVALID_HANDLE_VALUE;
+	d->ret.d_ino = 0; /* no inodes on win32 */
+	d->ret.d_reclen =  0; /* not used on win32 */
+
+	return d;
+}
+
+struct dirent* readdir(DIR * d)
+{
+	WIN32_FIND_DATA fd;
+
+	if (d->handle == INVALID_HANDLE_VALUE)
+	{
+		d->handle = FindFirstFile(d->dirname, &fd);
+		if (d->handle == INVALID_HANDLE_VALUE)
+		{
+			errno = ENOENT;
+			return NULL;
+		}
+	}
+	else 
+	{
+		if (!FindNextFile(d->handle, &fd))
+		{
+			if (GetLastError() == ERROR_NO_MORE_FILES)
+			{
+				/* No more files, force errno=0 (unlike mingw) */
+				errno = 0;
+				return NULL;
+			}
+			_dosmaperr(GetLastError());
+			return NULL;
+		}
+	}
+	strcpy(d->ret.d_name, fd.cFileName); /* Both strings are MAX_PATH long */
+	d->ret.d_namlen = strlen(d->ret.d_name);
+	return &d->ret;
+}
+
+int closedir(DIR *d)
+{
+	if (d->handle != INVALID_HANDLE_VALUE)
+		FindClose(d->handle);
+	free(d->dirname);
+	free(d);
+	return 0;
+}
-- 
cgit v1.2.3