[DEVELOPMENT ENVIRONMENT]
* NEW: Files including a '\r' character are not considered as binary files anymore. [GB.FORM] * BUG: ColorPalette: Default background is now transparent. [GB.DB.SQLITE3] * BUG: Use the official standard quoting character. git-svn-id: svn://localhost/gambas/trunk@6881 867c0c6c-44f3-4631-809d-bfa615b0a4ec
This commit is contained in:
parent
4262bbeb98
commit
ccc9af006a
4 changed files with 9 additions and 10 deletions
|
@ -1964,7 +1964,7 @@ Public Sub IsTextFile(sPath As String) As Boolean
|
|||
iCode = Asc(sCar)
|
||||
If iCode = &HFE Then Return False
|
||||
If iCode = &HFF Then Return False
|
||||
If iCode < 32 And If iCode <> 10 And If iCode <> 9 Then Return False
|
||||
If iCode < 32 And If iCode <> 10 And If iCode <> 13 And If iCode <> 9 Then Return False
|
||||
Else If sStr Then
|
||||
Try sTest = Conv(sCar, "UTF-8", "UCS-4LE")
|
||||
If Error Then Return False
|
||||
|
|
|
@ -39,7 +39,7 @@ Public Sub _new()
|
|||
$hView.ScrollBar = Scroll.None
|
||||
$hView.Tracking = True
|
||||
$hView.Mouse = Mouse.Pointing
|
||||
Me.Background = Color.TextBackground
|
||||
'Me.Background = Color.TextBackground
|
||||
|
||||
End
|
||||
|
||||
|
|
|
@ -468,7 +468,7 @@ static char *FindDatabase(const char *name, const char *hostName)
|
|||
|
||||
#if 0
|
||||
/* Now check for database in current working directory */
|
||||
if (getcwd(cwd, MAX_PATH) == NULL)
|
||||
if (getcwd(cwd, PATH_MAX) == NULL)
|
||||
{
|
||||
GB.Error("Unable to get databases: &1", "Can't find current directory");
|
||||
return NULL;
|
||||
|
@ -496,7 +496,7 @@ static char *GetDatabaseHome()
|
|||
char *env = NULL;
|
||||
char *dbhome = NULL;
|
||||
|
||||
GB.Alloc(POINTER(&dbhome), MAX_PATH);
|
||||
GB.Alloc(POINTER(&dbhome), PATH_MAX);
|
||||
|
||||
/* Check for Environment variable */
|
||||
|
||||
|
@ -506,7 +506,7 @@ static char *GetDatabaseHome()
|
|||
if (env == NULL)
|
||||
{
|
||||
/*
|
||||
if (getcwd(dbhome, MAX_PATH) == NULL){
|
||||
if (getcwd(dbhome, PATH_MAX) == NULL){
|
||||
GB.Error("Unable to get databases: &1", "Can't find current directory");
|
||||
GB.Free((void **)&dbhome);
|
||||
return NULL;
|
||||
|
@ -532,12 +532,12 @@ static int WalkDirectory(const char *dir, char ***databases)
|
|||
DIR *dp;
|
||||
struct dirent *entry;
|
||||
struct stat statbuf;
|
||||
char cwd[MAX_PATH];
|
||||
char cwd[PATH_MAX];
|
||||
|
||||
if ((dp = opendir(dir)) == NULL)
|
||||
return -1;
|
||||
|
||||
if (getcwd(cwd, MAX_PATH) == NULL)
|
||||
if (getcwd(cwd, PATH_MAX) == NULL)
|
||||
{
|
||||
fprintf(stderr, "gb.db.sqlite3: warning: getcwd: %s\n", strerror(errno));
|
||||
return -1;
|
||||
|
@ -2309,7 +2309,7 @@ static int database_list(DB_DATABASE * db, char ***databases)
|
|||
GB.Free(POINTER(&dbhome));
|
||||
}
|
||||
|
||||
/*if (getcwd(cwd, MAX_PATH) != NULL){
|
||||
/*if (getcwd(cwd, PATH_MAX) != NULL){
|
||||
if (strcmp(cwd, dbhome) != 0){
|
||||
WalkDirectory( cwd, databases );
|
||||
}
|
||||
|
|
|
@ -36,9 +36,8 @@ extern "C"
|
|||
#endif
|
||||
}
|
||||
|
||||
#define QUOTE_STRING "'"
|
||||
#define QUOTE_STRING "\""
|
||||
|
||||
#define MAX_PATH 132 /* MAX LENGTH OF FILNAME PATH */
|
||||
#define TRUE 1
|
||||
#define FALSE 0
|
||||
|
||||
|
|
Loading…
Reference in a new issue