- Fixing TAB to 2 spaces

- Fixing line endings from "\r\n" to "\n"

1 files changed, 232 insertions, 232 deletions

diff --git a/storage/connect/osutil.c b/storage/connect/osutil.c
index 435ea58b8c9..5b32f0f5a3b 100644
--- a/storage/connect/osutil.c
+++ b/storage/connect/osutil.c
@@ -1,232 +1,232 @@
-#include "my_global.h"

-#include <stdlib.h>

-#include <string.h>

-#include <stdio.h>

-#include "osutil.h"

-

-#ifdef WIN32

-my_bool CloseFileHandle(HANDLE h) 

-	{

-	return !CloseHandle(h);

-	} /* end of CloseFileHandle */

-

-#else	/* UNIX */

-/* code to handle Linux and Solaris */

-#include <unistd.h>

-#include <sys/stat.h>

-//#include <ctype.h>

-#include <fcntl.h>

-

-#define DWORD int

-extern FILE *debug;

-

-/***********************************************************************/

-/*  Define some functions not existing in the UNIX library.            */

-/***********************************************************************/

-PSZ strupr(PSZ p)

-  {

-  register int i;

-

-  for (i = 0; p[i]; i++)

-    p[i] = toupper(p[i]);

-

-  return (p);

-  } /* end of strupr */

-

-PSZ strlwr(PSZ p)

-  {

-  register int i;

-

-  for (i = 0; p[i]; i++)

-    p[i] = tolower(p[i]);

-

-  return (p);

-  } /* end of strlwr */

-

-#if defined(NOT_USED) /*&& !defined(sun) && !defined(LINUX) && !defined(AIX)*/

-/***********************************************************************/

-/*  Define stricmp function not existing in some UNIX libraries.       */

-/***********************************************************************/

-int stricmp(char *str1, char *str2)

-  {

-  register int i;

-  int  n;

-  char c;

-  char *sup1 = malloc(strlen(str1) + 1);

-  char *sup2 = malloc(strlen(str2) + 1);

-

-  for (i = 0; c = str1[i]; i++)

-    sup1[i] = toupper(c);

-

-  sup1[i] = 0;

-

-  for (i = 0; c = str2[i]; i++)

-   sup2[i] = toupper(c);

-

-  sup2[i] = 0;

-  n = strcmp(sup1, sup2);

-  free(sup1);

-  free(sup2);

-  return (n);

-  } /* end of stricmp */

-#endif   /* sun */

-

-/***********************************************************************/

-/*  Define the splitpath function not existing in the UNIX library.    */

-/***********************************************************************/

-void _splitpath(LPCSTR name, LPSTR drive, LPSTR dir, LPSTR fn, LPSTR ft)

-  {

-  LPCSTR p2, p = name;

-

-#ifdef DEBTRACE

- fprintf(debug,"SplitPath: name=%s [%s (%d)]\n",

-	XSTR(name), XSTR(__FILE__), __LINE__);

-#endif

-

-  if (drive) *drive = '\0';

-  if (dir) *dir = '\0';

-  if (fn) *fn = '\0';

-  if (ft) *ft = '\0';

-

-  if ((p2 = strrchr(p, '/'))) {

-    p2++;

-    if (dir) strncat(dir, p, p2 - p);

-    p = p2;

-    } /* endif p2 */

-

-  if ((p2 = strrchr(p, '.'))) {

-    if (fn) strncat(fn, p, p2 - p);

-    if (ft) strcpy(ft, p2);

-  } else

-    if (fn) strcpy(fn, p);

-

-#ifdef DEBTRACE

- fprintf(debug,"SplitPath: name=%s drive=%s dir=%s filename=%s type=%s [%s(%d)]\n",

-	XSTR(name), XSTR(drive), XSTR(dir), XSTR(fn), XSTR(ft), __FILE__, __LINE__);

-#endif

-  } /* end of _splitpath */

-

-/***********************************************************************/

-/*  Define the makepath function not existing in the UNIX library.     */

-/***********************************************************************/

-void _makepath(LPSTR name, LPCSTR drive, LPCSTR dir, LPCSTR fn, LPCSTR ft)

-	{

-	int n;

-

-	if (!name)

-		return;

-	else

-		*name = '\0';

-

-	if (dir && (n = strlen(dir)) > 0) {

-		strcpy(name, dir);

-

-		if (name[n-1] != '/')

-		  strcat(name, "/");

-

-		}	/* endif dir */

-

-	if (fn)

-		strcat(name, fn);

-

-	if (ft && strlen(ft)) {

-		if (*ft != '.')

-			strcat(name, ".");

-

-		strcat(name, ft);

-		} /* endif ft */

-

-	} /* end of _makepath */

-

-my_bool CloseFileHandle(HANDLE h) 

-	{

-	return (close(h)) ? TRUE : FALSE;

-	}	/* end of CloseFileHandle */

-

-void Sleep(DWORD time) 

-	{

-	//FIXME: TODO

-	}	/* end of Sleep */

-

-int GetLastError() 

-	{

-	return errno;

-	}	/* end of GetLastError */

-

-unsigned long _filelength(int fd) 

-	{

-	struct stat st;

-

-	if (fd == -1)

-		return 0;

-

-	if (fstat(fd, &st) != 0)

-		return 0;

-

-	return st.st_size;

-	}	/* end of _filelength */

-

-char *_fullpath(char *absPath, const char *relPath, size_t maxLength)

-	{

-	// Fixme

-	char *p;

-

-	if( *relPath == '\\' || *relPath == '/' ) {

-		strncpy(absPath, relPath, maxLength);

-	} else if(*relPath == '~') {

-		// get the path to the home directory

-		// Fixme

-		strncpy(absPath, relPath, maxLength);

-	}	else {

-		char buff[2*_MAX_PATH];

-

-		getcwd(buff, _MAX_PATH);

-		strcat(buff,"/");

-		strcat(buff, relPath);

-		strncpy(absPath, buff, maxLength);

-	}	/* endif's relPath */

-

-	p = absPath;

-

-	for(; *p; p++)

-		if (*p == '\\')

-			*p = '/';

-

-	return absPath;

-	}	/* end of _fullpath */

-

-bool MessageBeep(uint i)

-	{

-	// Fixme

-	return TRUE;

-	} /* end of MessageBeep */

-

-LPSTR _strerror(int errn) 

-	{

-  static char buff[256];

-

-  sprintf(buff,"error: %d", errn);

-  return buff;

-	}	/* end of _strerror */

-

-int _isatty(int fileNo) 

-	{

-	return isatty(fileNo);

-	}	/* end of _isatty */

-

-/* This function is ridiculous and should be revisited */

-DWORD FormatMessage(DWORD dwFlags, LPCVOID lpSource, DWORD dwMessageId,

-	                  DWORD dwLanguageId, LPSTR lpBuffer, DWORD nSize, ...)

-	{

-	char buff[32];

-	int n;

-

-//if (dwFlags & FORMAT_MESSAGE_ALLOCATE_BUFFER)

-//	return 0;												 /* means error */

-

-	n = sprintf(buff, "Error code: %d", dwMessageId);

-	strncpy(lpBuffer, buff, nSize);

-	return min(n, nSize);

-	}	/* end of FormatMessage */

-

-#endif	// UNIX

+#include "my_global.h"
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include "osutil.h"
+
+#ifdef WIN32
+my_bool CloseFileHandle(HANDLE h) 
+  {
+  return !CloseHandle(h);
+  } /* end of CloseFileHandle */
+
+#else  /* UNIX */
+/* code to handle Linux and Solaris */
+#include <unistd.h>
+#include <sys/stat.h>
+//#include <ctype.h>
+#include <fcntl.h>
+
+#define DWORD int
+extern FILE *debug;
+
+/***********************************************************************/
+/*  Define some functions not existing in the UNIX library.            */
+/***********************************************************************/
+PSZ strupr(PSZ p)
+  {
+  register int i;
+
+  for (i = 0; p[i]; i++)
+    p[i] = toupper(p[i]);
+
+  return (p);
+  } /* end of strupr */
+
+PSZ strlwr(PSZ p)
+  {
+  register int i;
+
+  for (i = 0; p[i]; i++)
+    p[i] = tolower(p[i]);
+
+  return (p);
+  } /* end of strlwr */
+
+#if defined(NOT_USED) /*&& !defined(sun) && !defined(LINUX) && !defined(AIX)*/
+/***********************************************************************/
+/*  Define stricmp function not existing in some UNIX libraries.       */
+/***********************************************************************/
+int stricmp(char *str1, char *str2)
+  {
+  register int i;
+  int  n;
+  char c;
+  char *sup1 = malloc(strlen(str1) + 1);
+  char *sup2 = malloc(strlen(str2) + 1);
+
+  for (i = 0; c = str1[i]; i++)
+    sup1[i] = toupper(c);
+
+  sup1[i] = 0;
+
+  for (i = 0; c = str2[i]; i++)
+   sup2[i] = toupper(c);
+
+  sup2[i] = 0;
+  n = strcmp(sup1, sup2);
+  free(sup1);
+  free(sup2);
+  return (n);
+  } /* end of stricmp */
+#endif   /* sun */
+
+/***********************************************************************/
+/*  Define the splitpath function not existing in the UNIX library.    */
+/***********************************************************************/
+void _splitpath(LPCSTR name, LPSTR drive, LPSTR dir, LPSTR fn, LPSTR ft)
+  {
+  LPCSTR p2, p = name;
+
+#ifdef DEBTRACE
+ fprintf(debug,"SplitPath: name=%s [%s (%d)]\n",
+  XSTR(name), XSTR(__FILE__), __LINE__);
+#endif
+
+  if (drive) *drive = '\0';
+  if (dir) *dir = '\0';
+  if (fn) *fn = '\0';
+  if (ft) *ft = '\0';
+
+  if ((p2 = strrchr(p, '/'))) {
+    p2++;
+    if (dir) strncat(dir, p, p2 - p);
+    p = p2;
+    } /* endif p2 */
+
+  if ((p2 = strrchr(p, '.'))) {
+    if (fn) strncat(fn, p, p2 - p);
+    if (ft) strcpy(ft, p2);
+  } else
+    if (fn) strcpy(fn, p);
+
+#ifdef DEBTRACE
+ fprintf(debug,"SplitPath: name=%s drive=%s dir=%s filename=%s type=%s [%s(%d)]\n",
+  XSTR(name), XSTR(drive), XSTR(dir), XSTR(fn), XSTR(ft), __FILE__, __LINE__);
+#endif
+  } /* end of _splitpath */
+
+/***********************************************************************/
+/*  Define the makepath function not existing in the UNIX library.     */
+/***********************************************************************/
+void _makepath(LPSTR name, LPCSTR drive, LPCSTR dir, LPCSTR fn, LPCSTR ft)
+  {
+  int n;
+
+  if (!name)
+    return;
+  else
+    *name = '\0';
+
+  if (dir && (n = strlen(dir)) > 0) {
+    strcpy(name, dir);
+
+    if (name[n-1] != '/')
+      strcat(name, "/");
+
+    }  /* endif dir */
+
+  if (fn)
+    strcat(name, fn);
+
+  if (ft && strlen(ft)) {
+    if (*ft != '.')
+      strcat(name, ".");
+
+    strcat(name, ft);
+    } /* endif ft */
+
+  } /* end of _makepath */
+
+my_bool CloseFileHandle(HANDLE h) 
+  {
+  return (close(h)) ? TRUE : FALSE;
+  }  /* end of CloseFileHandle */
+
+void Sleep(DWORD time) 
+  {
+  //FIXME: TODO
+  }  /* end of Sleep */
+
+int GetLastError() 
+  {
+  return errno;
+  }  /* end of GetLastError */
+
+unsigned long _filelength(int fd) 
+  {
+  struct stat st;
+
+  if (fd == -1)
+    return 0;
+
+  if (fstat(fd, &st) != 0)
+    return 0;
+
+  return st.st_size;
+  }  /* end of _filelength */
+
+char *_fullpath(char *absPath, const char *relPath, size_t maxLength)
+  {
+  // Fixme
+  char *p;
+
+  if( *relPath == '\\' || *relPath == '/' ) {
+    strncpy(absPath, relPath, maxLength);
+  } else if(*relPath == '~') {
+    // get the path to the home directory
+    // Fixme
+    strncpy(absPath, relPath, maxLength);
+  }  else {
+    char buff[2*_MAX_PATH];
+
+    getcwd(buff, _MAX_PATH);
+    strcat(buff,"/");
+    strcat(buff, relPath);
+    strncpy(absPath, buff, maxLength);
+  }  /* endif's relPath */
+
+  p = absPath;
+
+  for(; *p; p++)
+    if (*p == '\\')
+      *p = '/';
+
+  return absPath;
+  }  /* end of _fullpath */
+
+bool MessageBeep(uint i)
+  {
+  // Fixme
+  return TRUE;
+  } /* end of MessageBeep */
+
+LPSTR _strerror(int errn) 
+  {
+  static char buff[256];
+
+  sprintf(buff,"error: %d", errn);
+  return buff;
+  }  /* end of _strerror */
+
+int _isatty(int fileNo) 
+  {
+  return isatty(fileNo);
+  }  /* end of _isatty */
+
+/* This function is ridiculous and should be revisited */
+DWORD FormatMessage(DWORD dwFlags, LPCVOID lpSource, DWORD dwMessageId,
+                    DWORD dwLanguageId, LPSTR lpBuffer, DWORD nSize, ...)
+  {
+  char buff[32];
+  int n;
+
+//if (dwFlags & FORMAT_MESSAGE_ALLOCATE_BUFFER)
+//  return 0;                         /* means error */
+
+  n = sprintf(buff, "Error code: %d", dwMessageId);
+  strncpy(lpBuffer, buff, nSize);
+  return min(n, nSize);
+  }  /* end of FormatMessage */
+
+#endif  // UNIX