From b1f4fc7647a6c5eba2cf1bae27ca31d661e41a1a Mon Sep 17 00:00:00 2001
From: Gustavo Junior Alves <alves@users.sourceforge.net>
Date: Wed, 25 Sep 2002 16:17:06 +0000
Subject: [PATCH] Allow FILECASE, DIRCASE and DIRSEPARATOR to compile under
 MSVC

---
 harbour/source/rtl/file.c    |  2 +-
 harbour/source/rtl/filesys.c | 13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/harbour/source/rtl/file.c b/harbour/source/rtl/file.c
index 1a8407574a..9ad13c4ae4 100644
--- a/harbour/source/rtl/file.c
+++ b/harbour/source/rtl/file.c
@@ -59,7 +59,7 @@ BOOL hb_fsFile( BYTE * pFilename )
 
    HB_TRACE(HB_TR_DEBUG, ("hb_fsFile(%s)", (char*) pFilename));
    
-   pFilename = hb_filecase(strdup(pFilename));
+   pFilename = hb_filecase(hb_strdup(pFilename));
 
    if( ( ffind = hb_fsFindFirst( ( char * ) pFilename, HB_FA_ALL ) ) != NULL )
    {
diff --git a/harbour/source/rtl/filesys.c b/harbour/source/rtl/filesys.c
index 7cbc7d30ff..4ec4fe9c9f 100644
--- a/harbour/source/rtl/filesys.c
+++ b/harbour/source/rtl/filesys.c
@@ -92,6 +92,7 @@
 
 #define HB_OS_WIN_32_USED
 
+#include <string.h>
 #include <ctype.h>
 
 #include "hbapi.h"
@@ -401,16 +402,16 @@ char *hb_filecase(char *str) {
    // DIRCASE - define the case of path
    // DIRSEPARATOR - define separator of path (Ex. "/")
 
-   int a;
+   size_t a;
    char *filename;
    char *dirname=str;
-   int dirlen;
+   size_t dirlen;
 
    // Look for filename (Last "\" or DIRSEPARATOR)
    if( hb_set.HB_SET_DIRSEPARATOR[0]!='\\') {
       for(a=0;a<strlen(str);a++) if(str[a]=='\\') str[a]=hb_set.HB_SET_DIRSEPARATOR[0];
    }
-   if((filename=rindex( str, hb_set.HB_SET_DIRSEPARATOR[0] ))!=NULL) filename++; else filename=str;
+   if((filename=strrchr( str, hb_set.HB_SET_DIRSEPARATOR[0] ))!=NULL) filename++; else filename=str;
    dirlen=filename-str;
 
    // FILECASE
@@ -492,7 +493,7 @@ FHANDLE hb_fsOpen( BYTE * pFilename, USHORT uiFlags )
 
    HB_TRACE(HB_TR_DEBUG, ("hb_fsOpen(%p, %hu)", pFilename, uiFlags));
 
-   pFilename=hb_filecase(strdup(pFilename));
+   pFilename=hb_filecase(hb_strdup(pFilename));
 
 #if defined(X__WIN32__)
 
@@ -598,7 +599,7 @@ FHANDLE hb_fsCreate( BYTE * pFilename, USHORT uiAttr )
 
    HB_TRACE(HB_TR_DEBUG, ("hb_fsCreate(%p, %hu)", pFilename, uiAttr));
 
-   pFilename=hb_filecase(strdup(pFilename));
+   pFilename=hb_filecase(hb_strdup(pFilename));
    s_uiErrorLast = 0;
 
 #if defined(X__WIN32__)
@@ -665,7 +666,7 @@ FHANDLE hb_fsCreateEx( BYTE * pFilename, USHORT uiAttr, USHORT uiFlags )
 
    HB_TRACE(HB_TR_DEBUG, ("hb_fsCreateEx(%p, %hu, %hu)", pFilename, uiAttr, uiFlags));
 
-   pFilename=hb_filecase(strdup(pFilename));
+   pFilename=hb_filecase(hb_strdup(pFilename));
 
    s_uiErrorLast = 0;