// Created: 29/01/98
// RCS-ID: $Id$
// Copyright: (c) 1998 Julian Smart
-// Licence: wxWindows license
+// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__
#include <wx/intl.h>
// there are just too many of those...
-#ifdef _MSC_VER
+#ifdef __VISUALC__
#pragma warning(disable:4706) // assignment within conditional expression
#endif // VC++
#include <stdlib.h>
#include <string.h>
#if !defined(__WATCOMC__)
-#if !(defined(_MSC_VER) && (_MSC_VER > 800))
-#include <errno.h>
-#endif
+ #if !(defined(_MSC_VER) && (_MSC_VER > 800))
+ #include <errno.h>
+ #endif
#endif
+
#include <time.h>
+
#ifndef __MWERKS__
#include <sys/types.h>
#include <sys/stat.h>
#endif
#ifdef __WINDOWS__
-#if !defined( __GNUWIN32__ ) && !defined( __MWERKS__ )
+#if !defined( __GNUWIN32__ ) && !defined( __MWERKS__ ) && !defined(__SALFORDC__)
#include <direct.h>
#include <dos.h>
#endif
#endif
#ifdef __GNUWIN32__
+#ifndef __TWIN32__
#include <sys/unistd.h>
+#endif
+
#define stricmp strcasecmp
#endif
#include <dir.h>
#endif
+#ifdef __SALFORDC__
+#include <dir.h>
+#include <unix.h>
+#endif
+
#include "wx/setup.h"
+#include "wx/log.h"
// No, Cygwin doesn't appear to have fnmatch.h after all.
#if defined(HAVE_FNMATCH_H)
#define _MAXPATHLEN 500
extern char *wxBuffer;
+#ifdef __WXMAC__
+extern char gwxMacFileName[] ;
+extern char gwxMacFileName2[] ;
+extern char gwxMacFileName3[] ;
+#endif
#if !USE_SHARED_LIBRARIES
IMPLEMENT_DYNAMIC_CLASS(wxPathList, wxStringList)
{
static const char PATH_TOKS[] =
#ifdef __WINDOWS__
- " ;"; // Don't seperate with colon in DOS (used for drive)
+ " ;"; // Don't seperate with colon in DOS (used for drive)
#else
- " :;";
+ " :;";
#endif
char *val = getenv (WXSTRINGCAST envVariable);
char *token = strtok (s, PATH_TOKS);
if (token)
- {
- Add (copystring (token));
- while (token)
- {
- if ((token = strtok ((char *) NULL, PATH_TOKS)) != NULL)
- Add (wxString(token));
- }
- }
+ {
+ Add (copystring (token));
+ while (token)
+ {
+ if ((token = strtok ((char *) NULL, PATH_TOKS)) != NULL)
+ Add (wxString(token));
+ }
+ }
delete[]s;
}
}
if (path_only)
{
if (!Member (wxString(path_only)))
- Add (wxString(path_only));
+ Add (wxString(path_only));
}
}
{
wxString path2((char *) node->Data ());
if (
-#if defined(__WINDOWS__) || defined(__VMS__)
+#if defined(__WINDOWS__) || defined(__VMS__) || defined (__WXMAC__)
// Case INDEPENDENT
- path.CompareTo (path2, wxString::ignoreCase) == 0
+ path.CompareTo (path2, wxString::ignoreCase) == 0
#else
- // Case sensitive File System
- path.CompareTo (path2) == 0
+ // Case sensitive File System
+ path.CompareTo (path2) == 0
#endif
- )
- return TRUE;
+ )
+ return TRUE;
}
return FALSE;
}
char buf[_MAXPATHLEN];
strcpy(buf, wxBuffer);
- char *filename = IsAbsolutePath (buf) ? wxFileNameFromPath (buf) : (char *)buf;
+ char *filename = (char*) NULL; /* shut up buggy egcs warning */
+ filename = IsAbsolutePath (buf) ? wxFileNameFromPath (buf) : (char *)buf;
for (wxNode * node = First (); node; node = node->Next ())
{
#endif
if (wxFileExists (wxBuffer))
{
- return wxString(wxBuffer); // Found!
+ return wxString(wxBuffer); // Found!
}
- } // for()
+ } // for()
- return wxString(""); // Not found
+ return wxString(""); // Not found
}
wxString wxPathList::FindAbsoluteValidPath (const wxString& file)
}
}
-bool
+bool
wxFileExists (const wxString& filename)
{
#ifdef __GNUWIN32__ // (fix a B20 bug)
return FALSE;
else
return TRUE;
+#elif defined(__WXMAC__)
+ struct stat stbuf;
+ strcpy( gwxMacFileName , filename ) ;
+ wxUnix2MacFilename( gwxMacFileName ) ;
+ if (gwxMacFileName && stat ((char *)(const char *)gwxMacFileName, &stbuf) == 0)
+ return TRUE;
+ return FALSE ;
+#else
+
+#ifdef __SALFORDC__
+ struct _stat stbuf;
#else
struct stat stbuf;
+#endif
- if (filename && stat ((char *)(const char *)filename, &stbuf) == 0)
+ if ((filename != "") && stat ((char *)(const char *)filename, &stbuf) == 0)
return TRUE;
return FALSE;
#endif
}
*/
-bool
+bool
wxIsAbsolutePath (const wxString& filename)
{
if (filename != "")
/* MSDOS */
|| filename[0] == '\\' || (isalpha (filename[0]) && filename[1] == ':')
#endif
- )
- return TRUE;
+ )
+ return TRUE;
}
return FALSE;
}
* IF one exists. Inserts zero into buffer.
*
*/
-
+
void wxStripExtension(char *buffer)
{
int len = strlen(buffer);
p = &path[2];
for (; *p; p++)
{
- if (*p == SEP)
- {
- if (p[1] == '.' && p[2] == '.' && (p[3] == SEP || p[3] == '\0'))
- {
+ if (*p == SEP)
+ {
+ if (p[1] == '.' && p[2] == '.' && (p[3] == SEP || p[3] == '\0'))
+ {
char *q;
- for (q = p - 1; q >= path && *q != SEP; q--);
- if (q[0] == SEP && (q[1] != '.' || q[2] != '.' || q[3] != SEP)
- && (q - 1 <= path || q[-1] != SEP))
- {
- strcpy (q, p + 3);
- if (path[0] == '\0')
- {
- path[0] = SEP;
- path[1] = '\0';
- }
+ for (q = p - 1; q >= path && *q != SEP; q--);
+ if (q[0] == SEP && (q[1] != '.' || q[2] != '.' || q[3] != SEP)
+ && (q - 1 <= path || q[-1] != SEP))
+ {
+ strcpy (q, p + 3);
+ if (path[0] == '\0')
+ {
+ path[0] = SEP;
+ path[1] = '\0';
+ }
#ifdef __WXMSW__
- /* Check that path[2] is NULL! */
- else if (path[1] == ':' && !path[2])
- {
- path[2] = SEP;
- path[3] = '\0';
- }
-#endif
- p = q - 1;
- }
- }
- else if (p[1] == '.' && (p[2] == SEP || p[2] == '\0'))
- strcpy (p, p + 2);
- }
+ /* Check that path[2] is NULL! */
+ else if (path[1] == ':' && !path[2])
+ {
+ path[2] = SEP;
+ path[3] = '\0';
+ }
+#endif
+ p = q - 1;
+ }
+ }
+ else if (p[1] == '.' && (p[2] == SEP || p[2] == '\0'))
+ strcpy (p, p + 2);
+ }
}
}
return path;
char ch = buf[strlen(buf) - 1];
#ifdef __WXMSW__
if (ch != '\\' && ch != '/')
- strcat(buf, "\\");
+ strcat(buf, "\\");
#else
if (ch != '/')
- strcat(buf, "/");
+ strcat(buf, "/");
#endif
strcat(buf, wxBuffer);
return copystring( wxRealPath(buf) );
~user/ => user's home dir
If the environment variable a = "foo" and b = "bar" then:
Unix:
- $a => foo
- $a$b => foobar
- $a.c => foo.c
- xxx$a => xxxfoo
- ${a}! => foo!
- $(b)! => bar!
- \$a => \$a
+ $a => foo
+ $a$b => foobar
+ $a.c => foo.c
+ xxx$a => xxxfoo
+ ${a}! => foo!
+ $(b)! => bar!
+ \$a => \$a
MSDOS:
- $a ==> $a
- $(a) ==> foo
- $(a)$b ==> foo$b
- $(a)$(b)==> foobar
- test.$$ ==> test.$$
+ $a ==> $a
+ $(a) ==> foo
+ $(a)$b ==> foo$b
+ $(a)$(b)==> foobar
+ test.$$ ==> test.$$
*/
/* input name in name, pathname output to buf. */
{
register char *d, *s, *nm;
char lnm[_MAXPATHLEN];
- int q;
+ int q;
// Some compilers don't like this line.
// const char trimchars[] = "\n \t";
#endif
buf[0] = '\0';
if (name == NULL || *name == '\0')
- return buf;
+ return buf;
nm = copystring(name); // Make a scratch copy
char *nm_tmp = nm;
/* Skip leading whitespace and cr */
while (strchr((char *)trimchars, *nm) != NULL)
- nm++;
+ nm++;
/* And strip off trailing whitespace and cr */
s = nm + (q = strlen(nm)) - 1;
while (q-- && strchr((char *)trimchars, *s) != NULL)
- *s = '\0';
+ *s = '\0';
s = nm;
d = lnm;
/* Expand inline environment variables */
while ((*d++ = *s)) {
#ifndef __WXMSW__
- if (*s == '\\') {
- if ((*(d - 1) = *++s)) {
- s++;
- continue;
- } else
- break;
- } else
+ if (*s == '\\') {
+ if ((*(d - 1) = *++s)) {
+ s++;
+ continue;
+ } else
+ break;
+ } else
#endif
#ifdef __WXMSW__
- if (*s++ == '$' && (*s == '{' || *s == ')'))
+ if (*s++ == '$' && (*s == '{' || *s == ')'))
#else
- if (*s++ == '$')
-#endif
- {
- register char *start = d;
- register int braces = (*s == '{' || *s == '(');
- register char *value;
- while ((*d++ = *s))
- if (braces ? (*s == '}' || *s == ')') : !(isalnum(*s) || *s == '_') )
- break;
- else
- s++;
- *--d = 0;
- value = getenv(braces ? start + 1 : start);
- if (value) {
- for ((d = start - 1); (*d++ = *value++););
- d--;
- if (braces && *s)
- s++;
- }
- }
+ if (*s++ == '$')
+#endif
+ {
+ register char *start = d;
+ register int braces = (*s == '{' || *s == '(');
+ register char *value;
+ while ((*d++ = *s))
+ if (braces ? (*s == '}' || *s == ')') : !(isalnum(*s) || *s == '_') )
+ break;
+ else
+ s++;
+ *--d = 0;
+ value = getenv(braces ? start + 1 : start);
+ if (value) {
+ for ((d = start - 1); (*d++ = *value++););
+ d--;
+ if (braces && *s)
+ s++;
+ }
+ }
}
/* Expand ~ and ~user */
s = "";
if (nm[0] == '~' && !q)
{
- /* prefix ~ */
- if (nm[1] == SEP || nm[1] == 0)
- { /* ~/filename */
- if ((s = wxGetUserHome("")) != NULL) {
- if (*++nm)
- nm++;
- }
+ /* prefix ~ */
+ if (nm[1] == SEP || nm[1] == 0)
+ { /* ~/filename */
+ if ((s = wxGetUserHome("")) != NULL) {
+ if (*++nm)
+ nm++;
+ }
} else
- { /* ~user/filename */
- register char *nnm;
- register char *home;
- for (s = nm; *s && *s != SEP; s++);
- int was_sep; /* MATTHEW: Was there a separator, or NULL? */
+ { /* ~user/filename */
+ register char *nnm;
+ register char *home;
+ for (s = nm; *s && *s != SEP; s++);
+ int was_sep; /* MATTHEW: Was there a separator, or NULL? */
was_sep = (*s == SEP);
- nnm = *s ? s + 1 : s;
- *s = 0;
- if ((home = wxGetUserHome(wxString(nm + 1))) == NULL) {
+ nnm = *s ? s + 1 : s;
+ *s = 0;
+ if ((home = wxGetUserHome(wxString(nm + 1))) == NULL) {
if (was_sep) /* replace only if it was there: */
- *s = SEP;
- s = "";
- } else {
- nm = nnm;
- s = home;
- }
- }
+ *s = SEP;
+ s = "";
+ } else {
+ nm = nnm;
+ s = home;
+ }
+ }
}
d = buf;
if (s && *s) { /* MATTHEW: s could be NULL if user '~' didn't exist */
- /* Copy home dir */
- while ('\0' != (*d++ = *s++))
- /* loop */;
- // Handle root home
- if (d - 1 > buf && *(d - 2) != SEP)
- *(d - 1) = SEP;
+ /* Copy home dir */
+ while ('\0' != (*d++ = *s++))
+ /* loop */;
+ // Handle root home
+ if (d - 1 > buf && *(d - 2) != SEP)
+ *(d - 1) = SEP;
}
s = nm;
while ((*d++ = *s++));
strncmp(dest, val, len) == 0)
{
strcpy(wxBuffer, "~");
- if (user && *user)
- strcat(wxBuffer, user);
+ if (user != "")
+ strcat(wxBuffer, (const char*) user);
#ifdef __WXMSW__
// strcat(wxBuffer, "\\");
#else
tcp = path + strlen (path);
while (--tcp >= path)
- {
- if (*tcp == '/' || *tcp == '\\'
+ {
+ if (*tcp == '/' || *tcp == '\\'
#ifdef __VMS__
|| *tcp == ':' || *tcp == ']')
#else
)
#endif
- return tcp + 1;
- } /* while */
+ return tcp + 1;
+ } /* while */
#ifdef __WXMSW__
if (isalpha (*path) && *(path + 1) == ':')
- return path + 2;
+ return path + 2;
#endif
}
return path;
tcp = path + strlen (path);
while (--tcp >= path)
- {
- if (*tcp == '/' || *tcp == '\\'
+ {
+ if (*tcp == '/' || *tcp == '\\'
#ifdef __VMS__
|| *tcp == ':' || *tcp == ']')
#else
)
#endif
- return wxString(tcp + 1);
- } /* while */
+ return wxString(tcp + 1);
+ } /* while */
#ifdef __WXMSW__
if (isalpha (*path) && *(path + 1) == ':')
- return wxString(path + 2);
+ return wxString(path + 2);
#endif
}
- return wxString("");
+ // Yes, this should return the path, not an empty string, otherwise
+ // we get "thing.txt" -> "".
+ return path1;
}
// Return just the directory, or NULL if no directory
#ifdef __WXMSW__
// Try Drive specifier
if (isalpha (buf[0]) && buf[1] == ':')
- {
- // A:junk --> A:. (since A:.\junk Not A:\junk)
- buf[2] = '.';
- buf[3] = '\0';
- return buf;
- }
+ {
+ // A:junk --> A:. (since A:.\junk Not A:\junk)
+ buf[2] = '.';
+ buf[3] = '\0';
+ return buf;
+ }
#endif
}
#ifdef __WXMSW__
// Try Drive specifier
if (isalpha (buf[0]) && buf[1] == ':')
- {
- // A:junk --> A:. (since A:.\junk Not A:\junk)
- buf[2] = '.';
- buf[3] = '\0';
- return wxString(buf);
- }
+ {
+ // A:junk --> A:. (since A:.\junk Not A:\junk)
+ buf[2] = '.';
+ buf[3] = '\0';
+ return wxString(buf);
+ }
#endif
}
// and back again - or we get nasty problems with delimiters.
// Also, convert to lower case, since case is significant in UNIX.
-void
+#ifdef __WXMAC__
+void
+wxMac2UnixFilename (char *s)
+{
+ if (s)
+ {
+ memmove( s+1 , s ,strlen( s ) + 1) ;
+ if ( *s == ':' )
+ *s = '.' ;
+ else
+ *s = '/' ;
+
+ while (*s)
+ {
+ if (*s == ':')
+ *s = '/';
+ else
+ *s = wxToLower (*s); // Case INDEPENDENT
+ s++;
+ }
+ }
+}
+
+void
+wxUnix2MacFilename (char *s)
+{
+ if (s)
+ {
+ if ( *s == '.' )
+ {
+ // relative path , since it goes on with slash which is translated to a :
+ memmove( s , s+1 ,strlen( s ) ) ;
+ }
+ else if ( *s == '/' )
+ {
+ // absolute path -> on mac just start with the drive name
+ memmove( s , s+1 ,strlen( s ) ) ;
+ }
+ else
+ {
+ wxASSERT_MSG( 1 , "unkown path beginning" ) ;
+ }
+ while (*s)
+ {
+ if (*s == '/' || *s == '\\')
+ *s = ':';
+
+ s++ ;
+ }
+ }
+}
+#endif
+void
wxDos2UnixFilename (char *s)
{
if (s)
while (*s)
{
- if (*s == '\\')
- *s = '/';
+ if (*s == '\\')
+ *s = '/';
#ifdef __WXMSW__
- else
- *s = wxToLower (*s); // Case INDEPENDENT
+ else
+ *s = wxToLower (*s); // Case INDEPENDENT
#endif
- s++;
+ s++;
}
}
-void
+void
#ifdef __WXMSW__
wxUnix2DosFilename (char *s)
#else
if (s)
while (*s)
{
- if (*s == '/')
- *s = '\\';
- s++;
+ if (*s == '/')
+ *s = '\\';
+ s++;
}
#endif
}
// Concatenate two files to form third
-bool
+bool
wxConcatFiles (const wxString& file1, const wxString& file2, const wxString& file3)
{
char *outfile = wxGetTempFileName("cat");
FILE *fp2 = (FILE *) NULL;
FILE *fp3 = (FILE *) NULL;
// Open the inputs and outputs
+#ifdef __WXMAC__
+ strcpy( gwxMacFileName , file1 ) ;
+ wxUnix2MacFilename( gwxMacFileName ) ;
+ strcpy( gwxMacFileName2 , file2) ;
+ wxUnix2MacFilename( gwxMacFileName2 ) ;
+ strcpy( gwxMacFileName3 , outfile) ;
+ wxUnix2MacFilename( gwxMacFileName3 ) ;
+
+ if ((fp1 = fopen (gwxMacFileName, "rb")) == NULL ||
+ (fp2 = fopen (gwxMacFileName2, "rb")) == NULL ||
+ (fp3 = fopen (gwxMacFileName3, "wb")) == NULL)
+#else
if ((fp1 = fopen (WXSTRINGCAST file1, "rb")) == NULL ||
(fp2 = fopen (WXSTRINGCAST file2, "rb")) == NULL ||
(fp3 = fopen (outfile, "wb")) == NULL)
+#endif
{
if (fp1)
- fclose (fp1);
+ fclose (fp1);
if (fp2)
- fclose (fp2);
+ fclose (fp2);
if (fp3)
- fclose (fp3);
+ fclose (fp3);
return FALSE;
}
}
// Copy files
-bool
+bool
wxCopyFile (const wxString& file1, const wxString& file2)
{
FILE *fd1;
FILE *fd2;
int ch;
+#ifdef __WXMAC__
+ strcpy( gwxMacFileName , file1 ) ;
+ wxUnix2MacFilename( gwxMacFileName ) ;
+ strcpy( gwxMacFileName2 , file2) ;
+ wxUnix2MacFilename( gwxMacFileName2 ) ;
+
+ if ((fd1 = fopen (gwxMacFileName, "rb")) == NULL)
+ return FALSE;
+ if ((fd2 = fopen (gwxMacFileName2, "wb")) == NULL)
+#else
if ((fd1 = fopen (WXSTRINGCAST file1, "rb")) == NULL)
return FALSE;
if ((fd2 = fopen (WXSTRINGCAST file2, "wb")) == NULL)
+#endif
{
fclose (fd1);
return FALSE;
return TRUE;
}
-bool
+bool
wxRenameFile (const wxString& file1, const wxString& file2)
{
+#ifdef __WXMAC__
+ strcpy( gwxMacFileName , file1 ) ;
+ wxUnix2MacFilename( gwxMacFileName ) ;
+ strcpy( gwxMacFileName2 , file2) ;
+ wxUnix2MacFilename( gwxMacFileName2 ) ;
+
+ if (0 == rename (gwxMacFileName, gwxMacFileName2))
+ return TRUE;
+#else
// Normal system call
if (0 == rename (WXSTRINGCAST file1, WXSTRINGCAST file2))
return TRUE;
+#endif
// Try to copy
if (wxCopyFile(file1, file2)) {
wxRemoveFile(file1);
bool wxRemoveFile(const wxString& file)
{
-#if defined(_MSC_VER) || defined(__BORLANDC__) || defined(__WATCOMC__)
+#if defined(__VISUALC__) || defined(__BORLANDC__) || defined(__WATCOMC__)
int flag = remove(WXSTRINGCAST file);
+#elif defined( __WXMAC__ )
+ strcpy( gwxMacFileName , file ) ;
+ wxUnix2MacFilename( gwxMacFileName ) ;
+ int flag = unlink(gwxMacFileName);
#else
int flag = unlink(WXSTRINGCAST file);
#endif
#if defined(__WXSTUBS__)
return FALSE;
#elif defined(__VMS__)
- return FALSE;
+ return FALSE;
+#elif defined( __WXMAC__ )
+ strcpy( gwxMacFileName , dir ) ;
+ wxUnix2MacFilename( gwxMacFileName ) ;
+ return (mkdir(gwxMacFileName , 0 ) == 0);
#elif (defined(__GNUWIN32__) && !defined(__MINGW32__)) || !defined(__WXMSW__)
return (mkdir (WXSTRINGCAST dir, S_IRUSR | S_IWUSR | S_IXUSR | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH) == 0);
#else
{
#ifdef __VMS__
return FALSE;
+#elif defined( __WXMAC__ )
+ strcpy( gwxMacFileName , dir ) ;
+ wxUnix2MacFilename( gwxMacFileName ) ;
+ return (rmdir(WXSTRINGCAST gwxMacFileName) == 0);
+#else
+
+#ifdef __SALFORDC__
+ return FALSE; // What to do?
#else
return (rmdir(WXSTRINGCAST dir) == 0);
#endif
+
+#endif
}
#if 0
#endif
#if defined(__WIN32__)
- HANDLE h = FindFirstFile((LPTSTR) WXSTRINGCAST dir,(LPWIN32_FIND_DATA)&fileInfo);
-
- if (h==INVALID_HANDLE_VALUE)
- return FALSE;
- else {
- FindClose(h);
- return ((fileInfo.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) == FILE_ATTRIBUTE_DIRECTORY);
- }
+ HANDLE h = FindFirstFile((LPTSTR) WXSTRINGCAST dir,(LPWIN32_FIND_DATA)&fileInfo);
+
+ if (h==INVALID_HANDLE_VALUE)
+ return FALSE;
+ else {
+ FindClose(h);
+ return ((fileInfo.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) == FILE_ATTRIBUTE_DIRECTORY);
+ }
#else
// In Borland findfirst has a different argument
// ordering from _dos_findfirst. But _dos_findfirst
if ( wxEndsWithPathSeparator(pszPathName) && pszPathName[1] != '\0' )
strPath.Last() = '\0';
+#ifdef __SALFORDC__
+ struct _stat st;
+#else
struct stat st;
- return stat(strPath, &st) == 0 && (st.st_mode & S_IFDIR);
+#endif
+
+ return stat((char*) (const char*) strPath, &st) == 0 && (st.st_mode & S_IFDIR);
}
// Get a temporary filename, opening and closing the file.
{
#ifdef __WINDOWS__
-#ifndef __WIN32__
+#ifndef __WIN32__
char tmp[144];
::GetTempFileName(0, WXSTRINGCAST prefix, 0, tmp);
#else
return buf;
#else
- static short last_temp = 0; // cache last to speed things a bit
+ static short last_temp = 0; // cache last to speed things a bit
// At most 1000 temp files to a process! We use a ring count.
char tmp[100]; // FIXME static buffer
{
sprintf (tmp, "/tmp/%s%d.%03x", WXSTRINGCAST prefix, (int) getpid (), (int) suffix);
if (!wxFileExists( tmp ))
- {
- // Touch the file to create it (reserve name)
- FILE *fd = fopen (tmp, "w");
- if (fd)
- fclose (fd);
- last_temp = suffix;
+ {
+ // Touch the file to create it (reserve name)
+ FILE *fd = fopen (tmp, "w");
+ if (fd)
+ fclose (fd);
+ last_temp = suffix;
if (buf)
- strcpy( buf, tmp);
- else
- buf = copystring( tmp );
- return buf;
- }
+ strcpy( buf, tmp);
+ else
+ buf = copystring( tmp );
+ return buf;
+ }
}
- cerr << _("wxWindows: error finding temporary file name.\n");
+ wxLogError( _("wxWindows: error finding temporary file name.\n") );
if (buf) buf[0] = 0;
return (char *) NULL;
#endif
/* MATTHEW: p is NULL => Local directory */
if (!p)
p = ".";
-
+
if ((wxDirStream=opendir(p))==NULL)
return (char *) NULL;
strcat(buf, nextDir->d_name);
if ((strcmp(nextDir->d_name, ".") == 0) ||
- (strcmp(nextDir->d_name, "..") == 0)) {
- if (wxFindFileFlags && !(wxFindFileFlags & wxDIR))
- continue;
- isdir = TRUE;
+ (strcmp(nextDir->d_name, "..") == 0)) {
+ if (wxFindFileFlags && !(wxFindFileFlags & wxDIR))
+ continue;
+ isdir = TRUE;
} else
- isdir = wxDirExists(buf);
-
+ isdir = wxDirExists(buf);
+
if (!wxFindFileFlags
- || ((wxFindFileFlags & wxDIR) && isdir)
- || ((wxFindFileFlags & wxFILE) && !isdir))
- return buf;
+ || ((wxFindFileFlags & wxDIR) && isdir)
+ || ((wxFindFileFlags & wxFILE) && !isdir))
+ return buf;
}
}
closedir(wxDirStream);
wxString path1(wxFileSpec);
char *p = wxPathOnly(WXSTRINGCAST path1);
if (p && (strlen(p) > 0))
- strcpy(wxBuffer, p);
+ strcpy(wxBuffer, p);
else
- wxBuffer[0] = 0;
+ wxBuffer[0] = 0;
#ifdef __WIN32__
if (wxFileStrucHandle != INVALID_HANDLE_VALUE)
- FindClose(wxFileStrucHandle);
+ FindClose(wxFileStrucHandle);
wxFileStrucHandle = ::FindFirstFile(WXSTRINGCAST spec, &wxFileStruc);
if (wxFileStrucHandle == INVALID_HANDLE_VALUE)
- return NULL;
+ return NULL;
bool isdir = !!(wxFileStruc.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY);
if (isdir && !(flags & wxDIR))
- return wxFindNextFile();
+ return wxFindNextFile();
else if (!isdir && flags && !(flags & wxFILE))
- return wxFindNextFile();
+ return wxFindNextFile();
if (wxBuffer[0] != 0)
- strcat(wxBuffer, "\\");
+ strcat(wxBuffer, "\\");
strcat(wxBuffer, wxFileStruc.cFileName);
return wxBuffer;
#else
if (attrib & _A_SUBDIR) {
if (!(wxFindFileFlags & wxDIR))
- return wxFindNextFile();
+ return wxFindNextFile();
} else if (wxFindFileFlags && !(wxFindFileFlags & wxFILE))
- return wxFindNextFile();
+ return wxFindNextFile();
- if (wxBuffer[0] != 0)
- strcat(wxBuffer, "\\");
+ if (wxBuffer[0] != 0)
+ strcat(wxBuffer, "\\");
#ifdef __BORLANDC__
- strcat(wxBuffer, wxFileStruc.ff_name);
+ strcat(wxBuffer, wxFileStruc.ff_name);
#else
- strcat(wxBuffer, wxFileStruc.name);
+ strcat(wxBuffer, wxFileStruc.name);
#endif
- return wxBuffer;
+ return wxBuffer;
}
else
return NULL;
wxString p2(wxFileSpec);
char *p = wxPathOnly(WXSTRINGCAST p2);
if (p && (strlen(p) > 0))
- strcpy(wxBuffer, p);
+ strcpy(wxBuffer, p);
else
- wxBuffer[0] = 0;
-
+ wxBuffer[0] = 0;
+
try_again:
#ifdef __WIN32__
if (wxFileStrucHandle == INVALID_HANDLE_VALUE)
- return NULL;
+ return NULL;
bool success = (FindNextFile(wxFileStrucHandle, &wxFileStruc) != 0);
if (!success) {
- FindClose(wxFileStrucHandle);
+ FindClose(wxFileStrucHandle);
wxFileStrucHandle = INVALID_HANDLE_VALUE;
- return NULL;
+ return NULL;
}
bool isdir = !!(wxFileStruc.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY);
if (isdir && !(wxFindFileFlags & wxDIR))
goto try_again;
else if (!isdir && wxFindFileFlags && !(wxFindFileFlags & wxFILE))
- goto try_again;
+ goto try_again;
if (wxBuffer[0] != 0)
strcat(wxBuffer, "\\");
strcat(wxBuffer, wxFileStruc.cFileName);
- return wxBuffer;
+ return wxBuffer;
#else
#ifdef __BORLANDC__
if (attrib & _A_SUBDIR) {
if (!(wxFindFileFlags & wxDIR))
- goto try_again;
+ goto try_again;
} else if (wxFindFileFlags && !(wxFindFileFlags & wxFILE))
goto try_again;
- if (wxBuffer[0] != 0)
+ if (wxBuffer[0] != 0)
strcat(wxBuffer, "\\");
#ifdef __BORLANDC__
- strcat(wxBuffer, wxFileStruc.ff_name);
+ strcat(wxBuffer, wxFileStruc.ff_name);
#else
- strcat(wxBuffer, wxFileStruc.name);
+ strcat(wxBuffer, wxFileStruc.name);
#endif
- return wxBuffer;
+ return wxBuffer;
}
else
return NULL;
{
if (!buf)
buf = new char[sz+1];
-#ifdef _MSC_VER
+#ifdef _MSC_VER
if (_getcwd(buf, sz) == NULL) {
#else
if (getcwd(buf, sz) == NULL) {
bool wxSetWorkingDirectory(const wxString& d)
{
-#ifdef __UNIX__
+#if defined( __UNIX__ ) || defined( __WXMAC__ )
return (chdir(d) == 0);
#elif defined(__WINDOWS__)
bool wxFindFileInPath(wxString *pStr, const char *pszPath, const char *pszFile)
{
// we assume that it's not empty
- wxCHECK_MSG( !IsEmpty(pszFile), FALSE,
+ wxCHECK_MSG( !IsEmpty(pszFile), FALSE,
_("empty file name in wxFindFileInPath"));
// skip path separator in the beginning of the file name if present
wxString *pstrName,
wxString *pstrExt)
{
- wxCHECK_RET( pszFileName, _("NULL file name in wxSplitPath") );
+ wxCHECK_RET( pszFileName, "NULL file name in wxSplitPath" );
const char *pDot = strrchr(pszFileName, FILE_SEP_EXT);
const char *pSepUnix = strrchr(pszFileName, FILE_SEP_PATH_UNIX);
const char *pSepDos = strrchr(pszFileName, FILE_SEP_PATH_DOS);
- // take the last of the two
+ // take the last of the two: nPosUnix containts the last slash in the
+ // filename
size_t nPosUnix = pSepUnix ? pSepUnix - pszFileName : 0;
size_t nPosDos = pSepDos ? pSepDos - pszFileName : 0;
if ( nPosDos > nPosUnix )
nPosUnix = nPosDos;
-// size_t nLen = Strlen(pszFileName);
if ( pstrPath )
*pstrPath = wxString(pszFileName, nPosUnix);
- if ( pDot ) {
- size_t nPosDot = pDot - pszFileName;
+
+ size_t nPosDot = 0;
+ if ( pDot )
+ nPosDot = pDot - pszFileName;
+
+ if ( nPosDot > nPosUnix ) {
+ // the file name looks like "path/name.ext"
if ( pstrName )
*pstrName = wxString(pszFileName + nPosUnix + 1, nPosDot - nPosUnix);
if ( pstrExt )
*pstrExt = wxString(pszFileName + nPosDot + 1);
}
else {
+ // there is either no dot at all or there is a '/' after it
if ( pstrName )
*pstrName = wxString(pszFileName + nPosUnix + 1);
if ( pstrExt )
wxString tmp = pattern;
char *pat = WXSTRINGCAST(tmp);
while (*pat) {
- switch (*pat++) {
- case '?': case '*': case '[': case '{':
- return TRUE;
- case '\\':
- if (!*pat++)
- return FALSE;
- }
+ switch (*pat++) {
+ case '?': case '*': case '[': case '{':
+ return TRUE;
+ case '\\':
+ if (!*pat++)
+ return FALSE;
+ }
}
return FALSE;
};
// dot_special means '.' only matches '.'
if (dot_special && *str == '.' && *pattern != *str)
- return FALSE;
+ return FALSE;
while ((*pattern != '\0') && (!done)
&& (((*str=='\0')&&((*pattern==OB)||(*pattern=='*')))||(*str!='\0'))) {
- switch (*pattern) {
- case '\\':
- pattern++;
- if (*pattern != '\0')
- pattern++;
- break;
- case '*':
- pattern++;
- ret_code = FALSE;
- while ((*str!='\0')
- && (!(ret_code=wxMatchWild(pattern, str++, FALSE))))
- /*loop*/;
- if (ret_code) {
- while (*str != '\0')
- str++;
- while (*pattern != '\0')
- pattern++;
- }
- break;
- case '[':
- pattern++;
- repeat:
- if ((*pattern == '\0') || (*pattern == ']')) {
- done = TRUE;
- break;
- }
- if (*pattern == '\\') {
- pattern++;
- if (*pattern == '\0') {
- done = TRUE;
- break;
- }
- }
- if (*(pattern + 1) == '-') {
- c = *pattern;
- pattern += 2;
- if (*pattern == ']') {
- done = TRUE;
- break;
- }
- if (*pattern == '\\') {
- pattern++;
- if (*pattern == '\0') {
- done = TRUE;
- break;
- }
- }
- if ((*str < c) || (*str > *pattern)) {
- pattern++;
- goto repeat;
- }
- } else if (*pattern != *str) {
- pattern++;
- goto repeat;
- }
- pattern++;
- while ((*pattern != ']') && (*pattern != '\0')) {
- if ((*pattern == '\\') && (*(pattern + 1) != '\0'))
- pattern++;
- pattern++;
- }
- if (*pattern != '\0') {
- pattern++, str++;
- }
- break;
- case '?':
- pattern++;
- str++;
- break;
- case OB:
- pattern++;
- while ((*pattern != CB) && (*pattern != '\0')) {
- cp = str;
- ok = TRUE;
- while (ok && (*cp != '\0') && (*pattern != '\0')
- && (*pattern != ',') && (*pattern != CB)) {
- if (*pattern == '\\')
- pattern++;
- ok = (*pattern++ == *cp++);
- }
- if (*pattern == '\0') {
- ok = FALSE;
- done = TRUE;
- break;
- } else if (ok) {
- str = cp;
- while ((*pattern != CB) && (*pattern != '\0')) {
- if (*++pattern == '\\') {
- if (*++pattern == CB)
- pattern++;
- }
- }
- } else {
- while (*pattern!=CB && *pattern!=',' && *pattern!='\0') {
- if (*++pattern == '\\') {
+ switch (*pattern) {
+ case '\\':
+ pattern++;
+ if (*pattern != '\0')
+ pattern++;
+ break;
+ case '*':
+ pattern++;
+ ret_code = FALSE;
+ while ((*str!='\0')
+ && (!(ret_code=wxMatchWild(pattern, str++, FALSE))))
+ /*loop*/;
+ if (ret_code) {
+ while (*str != '\0')
+ str++;
+ while (*pattern != '\0')
+ pattern++;
+ }
+ break;
+ case '[':
+ pattern++;
+ repeat:
+ if ((*pattern == '\0') || (*pattern == ']')) {
+ done = TRUE;
+ break;
+ }
+ if (*pattern == '\\') {
+ pattern++;
+ if (*pattern == '\0') {
+ done = TRUE;
+ break;
+ }
+ }
+ if (*(pattern + 1) == '-') {
+ c = *pattern;
+ pattern += 2;
+ if (*pattern == ']') {
+ done = TRUE;
+ break;
+ }
+ if (*pattern == '\\') {
+ pattern++;
+ if (*pattern == '\0') {
+ done = TRUE;
+ break;
+ }
+ }
+ if ((*str < c) || (*str > *pattern)) {
+ pattern++;
+ goto repeat;
+ }
+ } else if (*pattern != *str) {
+ pattern++;
+ goto repeat;
+ }
+ pattern++;
+ while ((*pattern != ']') && (*pattern != '\0')) {
+ if ((*pattern == '\\') && (*(pattern + 1) != '\0'))
+ pattern++;
+ pattern++;
+ }
+ if (*pattern != '\0') {
+ pattern++, str++;
+ }
+ break;
+ case '?':
+ pattern++;
+ str++;
+ break;
+ case OB:
+ pattern++;
+ while ((*pattern != CB) && (*pattern != '\0')) {
+ cp = str;
+ ok = TRUE;
+ while (ok && (*cp != '\0') && (*pattern != '\0')
+ && (*pattern != ',') && (*pattern != CB)) {
+ if (*pattern == '\\')
+ pattern++;
+ ok = (*pattern++ == *cp++);
+ }
+ if (*pattern == '\0') {
+ ok = FALSE;
+ done = TRUE;
+ break;
+ } else if (ok) {
+ str = cp;
+ while ((*pattern != CB) && (*pattern != '\0')) {
+ if (*++pattern == '\\') {
+ if (*++pattern == CB)
+ pattern++;
+ }
+ }
+ } else {
+ while (*pattern!=CB && *pattern!=',' && *pattern!='\0') {
+ if (*++pattern == '\\') {
if (*++pattern == CB || *pattern == ',')
- pattern++;
- }
- }
- }
- if (*pattern != '\0')
- pattern++;
- }
- break;
- default:
- if (*str == *pattern) {
- str++, pattern++;
- } else {
- done = TRUE;
- }
- }
+ pattern++;
+ }
+ }
+ }
+ if (*pattern != '\0')
+ pattern++;
+ }
+ break;
+ default:
+ if (*str == *pattern) {
+ str++, pattern++;
+ } else {
+ done = TRUE;
+ }
+ }
}
while (*pattern == '*')
- pattern++;
+ pattern++;
return ((*str == '\0') && (*pattern == '\0'));
};
#endif
-#ifdef _MSC_VER
+#ifdef __VISUALC__
#pragma warning(default:4706) // assignment within conditional expression
#endif // VC++
projects / wxWidgets.git / blobdiff