fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

*** empty log message ***

Browse Source
This commit is contained in:
Viktor Szakats
1999-06-06 19:44:24 +00:00
parent 034408e794
commit efcf8fb52a
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
harbour/ChangeLog
View File

@@ -1,3 +1,10 @@
19990606-20:20 CET Victor Szel
* source/rtl/dir.c -
HB_CHARUPPER() parameters were wrong.
HB_CHARUPPER() converted to toupper()
The attribute parameter conversion to uppercase was buggy.
19990606-15:20 CET Eddie Runia
* source/compiler/harbour.y
- <object>:<data> <assignment> <value> is now functioning !

13
harbour/source/rtl/dir.c
View File

@@ -6,8 +6,6 @@
#include <string.h>
#include <itemapi.h>
#define HB_CHARUPPER(c) ((c)>='a'&&(c)<='z'?(c)-32:(c))
#if defined(__GNUC__) || defined(__DJGPP__)
#include <sys/types.h>
#include <sys/stat.h>
@@ -309,10 +307,11 @@ HARBOUR DIRECTORY( void )
/* TODO: attribute match rtn */
pos = 0;
if( arg2_it )
if( arg2_it && _parclen(2) >= 1)
{
strcpy(string, _parc(2));
pos = strchr(HB_CHARUPPER(string),*aatrib);
while (string[pos]) string[pos] = toupper(string[pos]);
pos = strchr(string,*aatrib);
}
else
pos = 1;
@@ -368,12 +367,12 @@ static BOOL hb_strMatchDOS (char *pszString, char *pszMask)
pszString++;
else
{
while (HB_CHARUPPER(pszString) != HB_CHARUPPER(pszMask))
while (toupper(*pszString) != toupper(*pszMask))
{
if (!(*(++pszString)))
return (FALSE);
}
while (HB_CHARUPPER(pszString) == HB_CHARUPPER(pszMask))
while (toupper(*pszString) == toupper(*pszMask))
{
if (!(*(++pszString)))
break;
@@ -382,7 +381,7 @@ static BOOL hb_strMatchDOS (char *pszString, char *pszMask)
}
}
else
if (HB_CHARUPPER(pszMask) != HB_CHARUPPER(pszString) && *pszMask != '?')
if (toupper(*pszMask) != toupper(*pszString) && *pszMask != '?')
return (FALSE);
else
{