Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reuse wxTempFile and wxFile in wxConcatFiles.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34579 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2005-06-07 18:46:10 +00:00
parent cb9eed05d6
commit b0c5cd0ff3
1 changed files with 36 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
src/common/filefn.cpp
View File

@@ -189,7 +189,7 @@ void wxPathList::AddEnvList (const wxString& envVariable)
wxT(" :;"); wxT(" :;");
#endif #endif
wxString val ; wxString val ;
if (wxGetEnv (WXSTRINGCAST envVariable, &val)) if (wxGetEnv (WXSTRINGCAST envVariable, &val))
{ {
wxChar *s = MYcopystring (val); wxChar *s = MYcopystring (val);
@@ -360,17 +360,17 @@ wxIsAbsolutePath (const wxString& filename)
void wxStripExtension(wxChar *buffer) void wxStripExtension(wxChar *buffer)
{ {
int len = wxStrlen(buffer); int len = wxStrlen(buffer);
int i = len-1; int i = len-1;
while (i > 0) while (i > 0)
{
if (buffer[i] == wxT('.'))
{ {
buffer[i] = 0; if (buffer[i] == wxT('.'))
break; {
buffer[i] = 0;
break;
}
i --;
} }
i --;
}
} }
void wxStripExtension(wxString& buffer) void wxStripExtension(wxString& buffer)
@@ -959,39 +959,38 @@ wxUnix2DosFilename (wxChar *WXUNUSED(s) )
bool bool
wxConcatFiles (const wxString& file1, const wxString& file2, const wxString& file3) wxConcatFiles (const wxString& file1, const wxString& file2, const wxString& file3)
{ {
wxString outfile; #if wxUSE_FILE
if ( !wxGetTempFileName( wxT("cat"), outfile) )
return false;
FILE *fp1 wxDUMMY_INITIALIZE(NULL); wxFile in1(file1), in2(file2);
FILE *fp2 = NULL; wxTempFile out(file3);
FILE *fp3 = NULL;
// Open the inputs and outputs if ( !in1.IsOpened() || !in2.IsOpened() || !out.IsOpened() )
if ((fp1 = wxFopen ( file1, wxT("rb"))) == NULL || return false;
(fp2 = wxFopen ( file2, wxT("rb"))) == NULL ||
(fp3 = wxFopen ( outfile, wxT("wb"))) == NULL) ssize_t ofs;
unsigned char buf[1024];
for( int i=0; i<2; i++)
{ {
if (fp1) wxFile *in = i==0 ? &in1 : &in2;
fclose (fp1); do{
if (fp2) if ( (ofs = in->Read(buf,WXSIZEOF(buf))) == wxInvalidOffset ) return false;
fclose (fp2); if ( ofs > 0 )
if (fp3) if ( !out.Write(buf,ofs) )
fclose (fp3); return false;
return false; } while ( ofs == (ssize_t)WXSIZEOF(buf) );
} }
int ch; return out.Commit();
while ((ch = getc (fp1)) != EOF)
(void) putc (ch, fp3);
fclose (fp1);
while ((ch = getc (fp2)) != EOF) #else
(void) putc (ch, fp3);
fclose (fp2);
fclose (fp3); wxUnusedVar(file1);
bool result = wxRenameFile(outfile, file3); wxUnusedVar(file2);
return result; wxUnusedVar(file3);
return false;
#endif
} }
// Copy files // Copy files