Removed fstream include which seemed unnecessary, and gave errors for BC++ 5.5 anyway.

[wxWidgets.git] / src / common / filefn.cpp

diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp
index b8ceb922f1455ff259f559ccddcc40c555e0bca9..109cb88311584d8351b5b9ec86ab7c728b7387cc 100644 (file)
--- a/src/common/filefn.cpp
+++ b/src/common/filefn.cpp
@@ -78,6 +78,7 @@
 #endif // native Win compiler
 
 #ifdef __GNUWIN32__
 #endif // native Win compiler
 
 #ifdef __GNUWIN32__

+    #include <wchar.h>

     #ifndef __TWIN32__
         #include <sys/unistd.h>
     #endif
     #ifndef __TWIN32__
         #include <sys/unistd.h>
     #endif


@@ -142,11 +143,7 @@ const off_t wxInvalidOffset = (off_t)-1;
 // ----------------------------------------------------------------------------
 
 // we need to translate Mac filenames before passing them to OS functions
 // ----------------------------------------------------------------------------
 
 // we need to translate Mac filenames before passing them to OS functions

-#ifdef __MAC__
-    #define OS_FILENAME(s) (wxUnix2MacFilename(s))
-#else

     #define OS_FILENAME(s) (s.fn_str())
     #define OS_FILENAME(s) (s.fn_str())

-#endif

 
 // ============================================================================
 // implementation
 
 // ============================================================================
 // implementation


@@ -289,6 +286,14 @@ wxFileExists (const wxString& filename)
 bool
 wxIsAbsolutePath (const wxString& filename)
 {
 bool
 wxIsAbsolutePath (const wxString& filename)
 {

+#ifdef __WXMAC__
+  if (filename != wxT(""))
+  {
+    if( filename.Find(':') != wxNOT_FOUND && filename[0] != ':' )
+      return TRUE ;
+  }
+  return FALSE ;
+#else

   if (filename != wxT(""))
     {
       if (filename[0] == wxT('/')
   if (filename != wxT(""))
     {
       if (filename[0] == wxT('/')


@@ -303,6 +308,7 @@ wxIsAbsolutePath (const wxString& filename)
         return TRUE;
     }
   return FALSE;
         return TRUE;
     }
   return FALSE;

+#endif

 }
 
 /*
 }
 
 /*


@@ -444,7 +450,7 @@ wxChar *wxExpandPath(wxChar *buf, const wxChar *name)
 {
     register wxChar *d, *s, *nm;
     wxChar          lnm[_MAXPATHLEN];
 {
     register wxChar *d, *s, *nm;
     wxChar          lnm[_MAXPATHLEN];

-    int                                q;
+    int             q;

 
     // Some compilers don't like this line.
 //    const wxChar    trimchars[] = wxT("\n \t");
 
     // Some compilers don't like this line.
 //    const wxChar    trimchars[] = wxT("\n \t");


@@ -500,7 +506,7 @@ wxChar *wxExpandPath(wxChar *buf, const wxChar *name)
       }
       else
 #else
       }
       else
 #else

-    while ((*d++ = *s)) {
+    while ((*d++ = *s) != 0) {

 #  ifndef __WXMSW__
         if (*s == wxT('\\')) {
             if ((*(d - 1) = *++s)) {
 #  ifndef __WXMSW__
         if (*s == wxT('\\')) {
             if ((*(d - 1) = *++s)) {


@@ -520,13 +526,7 @@ wxChar *wxExpandPath(wxChar *buf, const wxChar *name)
             register wxChar  *start = d;
             register int     braces = (*s == wxT('{') || *s == wxT('('));
             register wxChar  *value;
             register wxChar  *start = d;
             register int     braces = (*s == wxT('{') || *s == wxT('('));
             register wxChar  *value;

-#ifdef __VISAGECPP__
-    // VA gives assignment in logical expr warning
-            while (*d)
-               *d++ = *s;
-#else
-            while ((*d++ = *s))
-#endif
+            while ((*d++ = *s) != 0)

                 if (braces ? (*s == wxT('}') || *s == wxT(')')) : !(wxIsalnum(*s) || *s == wxT('_')) )
                     break;
                 else
                 if (braces ? (*s == wxT('}') || *s == wxT(')')) : !(wxIsalnum(*s) || *s == wxT('_')) )
                     break;
                 else


@@ -534,12 +534,7 @@ wxChar *wxExpandPath(wxChar *buf, const wxChar *name)
             *--d = 0;
             value = wxGetenv(braces ? start + 1 : start);
             if (value) {
             *--d = 0;
             value = wxGetenv(braces ? start + 1 : start);
             if (value) {

-#ifdef __VISAGECPP__
-    // VA gives assignment in logical expr warning
-                for ((d = start - 1); (*d); *d++ = *value++);
-#else
-                for ((d = start - 1); (*d++ = *value++););
-#endif
+                for ((d = start - 1); (*d++ = *value++) != 0;);

                 d--;
                 if (braces && *s)
                     s++;
                 d--;
                 if (braces && *s)
                     s++;


@@ -591,13 +586,7 @@ wxChar *wxExpandPath(wxChar *buf, const wxChar *name)
           *(d - 1) = SEP;
     }
     s = nm;
           *(d - 1) = SEP;
     }
     s = nm;

-#ifdef __VISAGECPP__
-    // VA gives assignment in logical expr warning
-    while (*d)
-       *d++ = *s++;
-#else
-    while ((*d++ = *s++));
-#endif
+    while ((*d++ = *s++) != 0);

     delete[] nm_tmp; // clean up alloc
     /* Now clean up the buffer */
     return wxRealPath(buf);
     delete[] nm_tmp; // clean up alloc
     /* Now clean up the buffer */
     return wxRealPath(buf);


@@ -669,11 +658,15 @@ wxChar *wxFileNameFromPath (wxChar *path)
       tcp = path + wxStrlen (path);
       while (--tcp >= path)
         {
       tcp = path + wxStrlen (path);
       while (--tcp >= path)
         {

+#ifdef __WXMAC__
+          if (*tcp == wxT(':') )
+#else

           if (*tcp == wxT('/') || *tcp == wxT('\\')
 #ifdef __VMS__
      || *tcp == wxT(':') || *tcp == wxT(']'))
 #else
      )
           if (*tcp == wxT('/') || *tcp == wxT('\\')
 #ifdef __VMS__
      || *tcp == wxT(':') || *tcp == wxT(']'))
 #else
      )

+#endif

 #endif
             return tcp + 1;
         }                        /* while */
 #endif
             return tcp + 1;
         }                        /* while */


@@ -696,11 +689,15 @@ wxString wxFileNameFromPath (const wxString& path1)
       tcp = path + wxStrlen (path);
       while (--tcp >= path)
           {
       tcp = path + wxStrlen (path);
       while (--tcp >= path)
           {

+#ifdef __WXMAC__
+           if (*tcp == wxT(':') )
+#else

             if (*tcp == wxT('/') || *tcp == wxT('\\')
 #ifdef __VMS__
         || *tcp == wxT(':') || *tcp == wxT(']'))
 #else
         )
             if (*tcp == wxT('/') || *tcp == wxT('\\')
 #ifdef __VMS__
         || *tcp == wxT(':') || *tcp == wxT(']'))
 #else
         )

+#endif

 #endif
                 return wxString(tcp + 1);
             }                        /* while */
 #endif
                 return wxString(tcp + 1);
             }                        /* while */


@@ -734,7 +731,11 @@ wxPathOnly (wxChar *path)
       while (!done && i > -1)
       {
         // ] is for VMS
       while (!done && i > -1)
       {
         // ] is for VMS

+#ifdef __WXMAC__
+        if (path[i] == wxT(':') )
+#else

         if (path[i] == wxT('/') || path[i] == wxT('\\') || path[i] == wxT(']'))
         if (path[i] == wxT('/') || path[i] == wxT('\\') || path[i] == wxT(']'))

+#endif

         {
           done = TRUE;
 #ifdef __VMS__
         {
           done = TRUE;
 #ifdef __VMS__


@@ -783,7 +784,11 @@ wxString wxPathOnly (const wxString& path)
       while (!done && i > -1)
       {
         // ] is for VMS
       while (!done && i > -1)
       {
         // ] is for VMS

+#ifdef __WXMAC__
+        if (path[i] == wxT(':') )
+#else

         if (path[i] == wxT('/') || path[i] == wxT('\\') || path[i] == wxT(']'))
         if (path[i] == wxT('/') || path[i] == wxT('\\') || path[i] == wxT(']'))

+#endif

         {
           done = TRUE;
 #ifdef __VMS__
         {
           done = TRUE;
 #ifdef __VMS__


@@ -818,6 +823,28 @@ wxString wxPathOnly (const wxString& path)
 // Also, convert to lower case, since case is significant in UNIX.
 
 #if defined(__WXMAC__) && !defined(__UNIX__)
 // Also, convert to lower case, since case is significant in UNIX.
 
 #if defined(__WXMAC__) && !defined(__UNIX__)

+wxString wxMacFSSpec2MacFilename( const FSSpec *spec )
+{
+    Handle    myPath ;
+    short     length ;
+
+    FSpGetFullPath( spec , &length , &myPath ) ;
+    ::SetHandleSize( myPath , length + 1 ) ;
+    ::HLock( myPath ) ;
+    (*myPath)[length] = 0 ;
+    if ( length > 0 && (*myPath)[length-1] ==':' )
+        (*myPath)[length-1] = 0 ;
+
+    wxString result(     (char*) *myPath ) ;
+    ::HUnlock( myPath ) ;
+    ::DisposeHandle( myPath ) ;
+    return result ;
+}
+
+void wxMacFilename2FSSpec( const char *path , FSSpec *spec )
+{
+    FSpLocationFromFullPath( strlen(path ) , path , spec ) ;
+}

 
 static char sMacFileNameConversion[ 1000 ] ;
 
 
 static char sMacFileNameConversion[ 1000 ] ;
 


@@ -885,34 +912,11 @@ wxString wxUnix2MacFilename (const char *str)
   return wxString (sMacFileNameConversion) ;
 }
 
   return wxString (sMacFileNameConversion) ;
 }
 

-wxString wxMacFSSpec2MacFilename( const FSSpec *spec )
-{
-    Handle    myPath ;
-    short     length ;
-
-    FSpGetFullPath( spec , &length , &myPath ) ;
-    ::SetHandleSize( myPath , length + 1 ) ;
-    ::HLock( myPath ) ;
-    (*myPath)[length] = 0 ;
-    if ( length > 0 && (*myPath)[length-1] ==':' )
-        (*myPath)[length-1] = 0 ;
-
-    wxString result(     (char*) *myPath ) ;
-    ::HUnlock( myPath ) ;
-    ::DisposeHandle( myPath ) ;
-    return result ;
-}
-

 wxString wxMacFSSpec2UnixFilename( const FSSpec *spec )
 {
     return wxMac2UnixFilename( wxMacFSSpec2MacFilename( spec) ) ;
 }
 
 wxString wxMacFSSpec2UnixFilename( const FSSpec *spec )
 {
     return wxMac2UnixFilename( wxMacFSSpec2MacFilename( spec) ) ;
 }
 

-void wxMacFilename2FSSpec( const char *path , FSSpec *spec )
-{
-    FSpLocationFromFullPath( strlen(path ) , path , spec ) ;
-}
-

 void wxUnixFilename2FSSpec( const char *path , FSSpec *spec )
 {
     wxString var = wxUnix2MacFilename( path ) ;
 void wxUnixFilename2FSSpec( const char *path , FSSpec *spec )
 {
     wxString var = wxUnix2MacFilename( path ) ;


@@ -967,9 +971,9 @@ wxConcatFiles (const wxString& file1, const wxString& file2, const wxString& fil
   FILE *fp2 = (FILE *) NULL;
   FILE *fp3 = (FILE *) NULL;
   // Open the inputs and outputs
   FILE *fp2 = (FILE *) NULL;
   FILE *fp3 = (FILE *) NULL;
   // Open the inputs and outputs

-  if ((fp1 = fopen (OS_FILENAME( file1 ), "rb")) == NULL ||
-      (fp2 = fopen (OS_FILENAME( file2 ), "rb")) == NULL ||
-      (fp3 = fopen (OS_FILENAME( outfile ), "wb")) == NULL)
+  if ((fp1 = wxFopen (OS_FILENAME( file1 ), wxT("rb"))) == NULL ||
+      (fp2 = wxFopen (OS_FILENAME( file2 ), wxT("rb"))) == NULL ||
+      (fp3 = wxFopen (OS_FILENAME( outfile ), wxT("wb"))) == NULL)

     {
       if (fp1)
         fclose (fp1);
     {
       if (fp1)
         fclose (fp1);


@@ -996,8 +1000,15 @@ wxConcatFiles (const wxString& file1, const wxString& file2, const wxString& fil
 
 // Copy files
 bool
 
 // Copy files
 bool

-wxCopyFile (const wxString& file1, const wxString& file2)
+wxCopyFile (const wxString& file1, const wxString& file2, bool overwrite)

 {
 {

+#if defined(__WIN32__)
+    // CopyFile() copies file attributes and modification time too, so use it
+    // instead of our code if available
+    //
+    // NB: 3rd parameter is bFailIfExists i.e. the inverse of overwrite
+    return ::CopyFile(file1, file2, !overwrite) != 0;
+#else // !Win32

     wxStructStat fbuf;
 
     // get permissions of file1
     wxStructStat fbuf;
 
     // get permissions of file1


@@ -1017,7 +1028,7 @@ wxCopyFile (const wxString& file1, const wxString& file2)
 
     // remove file2, if it exists. This is needed for creating
     // file2 with the correct permissions in the next step
 
     // remove file2, if it exists. This is needed for creating
     // file2 with the correct permissions in the next step

-    if ( wxFileExists(file2) && !wxRemoveFile(file2) )
+    if ( wxFileExists(file2)  && (!overwrite || !wxRemoveFile(file2)))

     {
         wxLogSysError(_("Impossible to overwrite the file '%s'"),
                       file2.c_str());
     {
         wxLogSysError(_("Impossible to overwrite the file '%s'"),
                       file2.c_str());


@@ -1033,7 +1044,7 @@ wxCopyFile (const wxString& file1, const wxString& file2)
     // create file2 with the same permissions than file1 and open it for
     // writing
     wxFile fileOut;
     // create file2 with the same permissions than file1 and open it for
     // writing
     wxFile fileOut;

-    if ( !fileOut.Create(file2, TRUE, fbuf.st_mode & 0777) )
+    if ( !fileOut.Create(file2, overwrite, fbuf.st_mode & 0777) )

         return FALSE;
 
 #ifdef __UNIX__
         return FALSE;
 
 #ifdef __UNIX__


@@ -1058,16 +1069,25 @@ wxCopyFile (const wxString& file1, const wxString& file2)
             return FALSE;
     }
 
             return FALSE;
     }
 

-#if !defined(__VISAGECPP__) && !defined(__WXMAC__)
-// no chmod in VA.  SHould be some permission API for HPFS386 partitions however
+    // we can expect fileIn to be closed successfully, but we should ensure
+    // that fileOut was closed as some write errors (disk full) might not be
+    // detected before doing this
+    if ( !fileIn.Close() || !fileOut.Close() )
+        return FALSE;
+
+#if !defined(__VISAGECPP__) && !defined(__WXMAC__) || defined(__UNIX__)
+    // no chmod in VA.  Should be some permission API for HPFS386 partitions
+    // however

     if ( chmod(OS_FILENAME(file2), fbuf.st_mode) != 0 )
     {
         wxLogSysError(_("Impossible to set permissions for the file '%s'"),
                       file2.c_str());
         return FALSE;
     }
     if ( chmod(OS_FILENAME(file2), fbuf.st_mode) != 0 )
     {
         wxLogSysError(_("Impossible to set permissions for the file '%s'"),
                       file2.c_str());
         return FALSE;
     }

-#endif
+#endif // OS/2 || Mac
+

     return TRUE;
     return TRUE;

+#endif // __WXMSW__ && __WIN32__

 }
 
 bool
 }
 
 bool


@@ -1088,7 +1108,10 @@ wxRenameFile (const wxString& file1, const wxString& file2)
 
 bool wxRemoveFile(const wxString& file)
 {
 
 bool wxRemoveFile(const wxString& file)
 {

-#if defined(__VISUALC__) || defined(__BORLANDC__) || defined(__WATCOMC__)
+#if defined(__VISUALC__) \
+ || defined(__BORLANDC__) \
+ || defined(__WATCOMC__) \
+ || defined(__GNUWIN32__)

   int res = wxRemove(file);
 #else
   int res = unlink(OS_FILENAME(file));
   int res = wxRemove(file);
 #else
   int res = unlink(OS_FILENAME(file));


@@ -1099,8 +1122,8 @@ bool wxRemoveFile(const wxString& file)
 
 bool wxMkdir(const wxString& dir, int perm)
 {
 
 bool wxMkdir(const wxString& dir, int perm)
 {

-#if defined( __WXMAC__ )
-  return (mkdir(wxUnix2MacFilename( dir ) , 0 ) == 0);
+#if defined(__WXMAC__) && !defined(__UNIX__)
+  return (mkdir( dir , 0 ) == 0);

 #else // !Mac
     const wxChar *dirname = dir.c_str();
 
 #else // !Mac
     const wxChar *dirname = dir.c_str();
 


@@ -1111,6 +1134,7 @@ bool wxMkdir(const wxString& dir, int perm)
 #elif defined(__WXPM__)
     if (::DosCreateDir((PSZ)dirname, NULL) != 0) // enhance for EAB's??
 #else  // !MSW and !OS/2 VAC++
 #elif defined(__WXPM__)
     if (::DosCreateDir((PSZ)dirname, NULL) != 0) // enhance for EAB's??
 #else  // !MSW and !OS/2 VAC++

+       (void)perm;

     if ( wxMkDir(wxFNSTRINGCAST wxFNCONV(dirname)) != 0 )
 #endif // !MSW/MSW
     {
     if ( wxMkDir(wxFNSTRINGCAST wxFNCONV(dirname)) != 0 )
 #endif // !MSW/MSW
     {


@@ -1395,7 +1419,7 @@ wxString wxFindFirstFile(const wxChar *spec, int flags)
 
     FSSpec fsspec ;
 
 
     FSSpec fsspec ;
 

-    wxUnixFilename2FSSpec( result , &fsspec ) ;
+    wxMacFilename2FSSpec( result , &fsspec ) ;

     g_iter.m_CPB.hFileInfo.ioVRefNum = fsspec.vRefNum ;
     g_iter.m_CPB.hFileInfo.ioNamePtr = g_iter.m_name ;
     g_iter.m_index = 0 ;
     g_iter.m_CPB.hFileInfo.ioVRefNum = fsspec.vRefNum ;
     g_iter.m_CPB.hFileInfo.ioNamePtr = g_iter.m_name ;
     g_iter.m_index = 0 ;


@@ -1443,7 +1467,7 @@ wxString wxFindNextFile()
                                    g_iter.m_name,
                                    &spec) ;
 
                                    g_iter.m_name,
                                    &spec) ;
 

-    return wxMacFSSpec2UnixFilename( &spec ) ;
+    return wxMacFSSpec2MacFilename( &spec ) ;

 }
 
 #elif defined(__WXMSW__)
 }
 
 #elif defined(__WXMSW__)


@@ -1664,7 +1688,7 @@ wxChar *wxGetWorkingDirectory(wxChar *buf, int sz)
   char *cbuf = new char[sz+1];
 #ifdef _MSC_VER
   if (_getcwd(cbuf, sz) == NULL) {
   char *cbuf = new char[sz+1];
 #ifdef _MSC_VER
   if (_getcwd(cbuf, sz) == NULL) {

-#elif defined( __WXMAC__)
+#elif defined(__WXMAC__) && !defined(__UNIX__)

     enum
     {
         SFSaveDisk = 0x214, CurDirStore = 0x398
     enum
     {
         SFSaveDisk = 0x214, CurDirStore = 0x398


@@ -1682,7 +1706,7 @@ wxChar *wxGetWorkingDirectory(wxChar *buf, int sz)
 #else // wxUnicode
 #ifdef _MSC_VER
   if (_getcwd(buf, sz) == NULL) {
 #else // wxUnicode
 #ifdef _MSC_VER
   if (_getcwd(buf, sz) == NULL) {

-#elif defined( __WXMAC__)
+#elif defined(__WXMAC__) && !defined(__UNIX__)

        FSSpec cwdSpec ;
        FCBPBRec pb;
        OSErr error;
        FSSpec cwdSpec ;
        FCBPBRec pb;
        OSErr error;


@@ -1692,12 +1716,12 @@ wxChar *wxGetWorkingDirectory(wxChar *buf, int sz)
        pb.ioRefNum = LMGetCurApRefNum();
        pb.ioFCBIndx = 0;
        error = PBGetFCBInfoSync(&pb);
        pb.ioRefNum = LMGetCurApRefNum();
        pb.ioFCBIndx = 0;
        error = PBGetFCBInfoSync(&pb);

-       if ( error == noErr ) 
+       if ( error == noErr )

        {
                cwdSpec.vRefNum = pb.ioFCBVRefNum;
                cwdSpec.parID = pb.ioFCBParID;
                cwdSpec.name[0] = 0 ;
        {
                cwdSpec.vRefNum = pb.ioFCBVRefNum;
                cwdSpec.parID = pb.ioFCBParID;
                cwdSpec.name[0] = 0 ;

-               wxString res = wxMacFSSpec2UnixFilename( &cwdSpec ) ;
+               wxString res = wxMacFSSpec2MacFilename( &cwdSpec ) ;

                
                strcpy( buf , res ) ;
                buf[res.length()-1]=0 ;
                
                strcpy( buf , res ) ;
                buf[res.length()-1]=0 ;


@@ -1706,9 +1730,9 @@ wxChar *wxGetWorkingDirectory(wxChar *buf, int sz)
                buf[0] = 0 ;
        /*
        this version will not always give back the application directory on mac
                buf[0] = 0 ;
        /*
        this version will not always give back the application directory on mac

-       enum 
-       { 
-               SFSaveDisk = 0x214, CurDirStore = 0x398 
+       enum
+       {
+               SFSaveDisk = 0x214, CurDirStore = 0x398

        };
        FSSpec cwdSpec ;
        
        };
        FSSpec cwdSpec ;
        


@@ -1936,7 +1960,7 @@ bool wxMatchWild( const wxString& pat, const wxString& text, bool dot_special )
             pattern++;
             ret_code = FALSE;
             while ((*str!=wxT('\0'))
             pattern++;
             ret_code = FALSE;
             while ((*str!=wxT('\0'))

-            && (!(ret_code=wxMatchWild(pattern, str++, FALSE))))
+            && ((ret_code=wxMatchWild(pattern, str++, FALSE)) == 0))

                 /*loop*/;
             if (ret_code) {
                 while (*str != wxT('\0'))
                 /*loop*/;
             if (ret_code) {
                 while (*str != wxT('\0'))