X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/926ce9e3ac32e1a33cc43420f76876fac8868436..f5766910b6731eb03e82371416e9778203396ce7:/src/unix/mimetype.cpp diff --git a/src/unix/mimetype.cpp b/src/unix/mimetype.cpp index ec6d47e5cb..0c3768dd46 100644 --- a/src/unix/mimetype.cpp +++ b/src/unix/mimetype.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: unix/mimetype.cpp +// Name: src/unix/mimetype.cpp // Purpose: classes and functions to manage MIME types // Author: Vadim Zeitlin // Modified by: @@ -33,112 +33,41 @@ #include "wx/wxprec.h" #ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#ifndef WX_PRECOMP - #include "wx/defs.h" + #pragma hdrstop #endif #if wxUSE_MIMETYPE && wxUSE_FILE && wxUSE_TEXTFILE +#include "wx/unix/mimetype.h" + #ifndef WX_PRECOMP - #include "wx/string.h" + #include "wx/dynarray.h" + #include "wx/string.h" + #include "wx/intl.h" + #include "wx/log.h" + #include "wx/utils.h" #endif -#include "wx/log.h" #include "wx/file.h" -#include "wx/intl.h" -#include "wx/dynarray.h" #include "wx/confbase.h" #include "wx/ffile.h" #include "wx/textfile.h" #include "wx/dir.h" -#include "wx/utils.h" #include "wx/tokenzr.h" #include "wx/iconloc.h" #include "wx/filename.h" +#include "wx/app.h" +#include "wx/apptrait.h" -#include "wx/unix/mimetype.h" +#if wxUSE_LIBGNOMEVFS + // Not GUI dependent + #include "wx/gtk/gnome/gvfs.h" +#endif // other standard headers #include -#ifdef __VMS -/* silence warnings for comparing unsigned int's <0 */ -# pragma message disable unscomzer -#endif - -// wxMimeTypeCommands stores the verbs defined for the given MIME type with -// their values -class wxMimeTypeCommands -{ -public: - wxMimeTypeCommands() {} - - wxMimeTypeCommands(const wxArrayString& verbs, - const wxArrayString& commands) - : m_verbs(verbs), - m_commands(commands) - { - } - - // add a new verb with the command or replace the old value - void AddOrReplaceVerb(const wxString& verb, const wxString& cmd) - { - int n = m_verbs.Index(verb, false /* ignore case */); - if ( n == wxNOT_FOUND ) - { - m_verbs.Add(verb); - m_commands.Add(cmd); - } - else - { - m_commands[n] = cmd; - } - } - - void Add(const wxString& s) - { - m_verbs.Add(s.BeforeFirst(wxT('='))); - m_commands.Add(s.AfterFirst(wxT('='))); - } - - // access the commands - size_t GetCount() const { return m_verbs.GetCount(); } - const wxString& GetVerb(size_t n) const { return m_verbs[n]; } - const wxString& GetCmd(size_t n) const { return m_commands[n]; } - - bool HasVerb(const wxString& verb) const - { return m_verbs.Index(verb) != wxNOT_FOUND; } - - wxString GetCommandForVerb(const wxString& verb, size_t *idx = NULL) const - { - wxString s; - - int n = m_verbs.Index(verb); - if ( n != wxNOT_FOUND ) - { - s = m_commands[(size_t)n]; - if ( idx ) - *idx = n; - } - - return s; - } - - // get a "verb=command" string - wxString GetVerbCmd(size_t n) const - { - return m_verbs[n] + wxT('=') + m_commands[n]; - } - -private: - wxArrayString m_verbs; - wxArrayString m_commands; -}; - // this class extends wxTextFile // // VZ: ??? @@ -344,206 +273,16 @@ static bool IsKnownUnimportantField(const wxString& field); // 1. xxx.keys files under /usr/share/mime-info // 2. xxx.keys files under ~/.gnome/mime-info // -// The format of xxx.keys file is the following: -// -// mimetype/subtype: -// field=value -// -// with blank lines separating the entries and indented lines starting with -// TABs. We're interested in the field icon-filename whose value is the path -// containing the icon. -// // Update (Chris Elliott): apparently there may be an optional "[lang]" prefix // just before the field name. -bool wxMimeTypesManagerImpl::CheckGnomeDirsExist() -{ - wxString gnomedir; - wxGetHomeDir( &gnomedir ); - wxString sTmp = gnomedir; - sTmp = sTmp + wxT("/.gnome"); - if (! wxDir::Exists( sTmp ) ) - { - if (!wxMkdir( sTmp )) - { - wxLogError(wxT("Failed to create directory %s/.gnome."), sTmp.c_str()); - return false; - } - } - - sTmp = sTmp + wxT("/mime-info"); - if (! wxDir::Exists( sTmp ) ) - { - if (!wxMkdir( sTmp )) - { - wxLogError(wxT("Failed to create directory %s/mime-info."), sTmp.c_str()); - return false; - } - } - - return true; -} - -bool wxMimeTypesManagerImpl::WriteGnomeKeyFile(int index, bool delete_index) -{ - wxString gnomedir; - wxGetHomeDir( &gnomedir ); - - wxMimeTextFile outfile( gnomedir + wxT("/.gnome/mime-info/user.keys")); - // if this fails probably Gnome is not installed ?? - // create it anyway as a private mime store - -#if defined(__WXGTK20__) && wxUSE_UNICODE - if (! outfile.Open( wxConvUTF8) ) -#else - if (! outfile.Open() ) -#endif - { - if (delete_index) - return false; - if (!CheckGnomeDirsExist() ) - return false; - - outfile.Create(); - } - - wxString sTmp, strType = m_aTypes[index]; - int nIndex = outfile.pIndexOf(strType); - if ( nIndex == wxNOT_FOUND ) - { - outfile.AddLine( strType + wxT(':') ); - // see file:/usr/doc/gnome-libs-devel-1.0.40/devel-docs/mime-type-handling.txt - // as this does not deal with internationalisation - // wxT( "\t[en_US]") + verb + wxT ('=') + cmd + wxT(" %f"); - wxMimeTypeCommands * entries = m_aEntries[index]; - size_t count = entries->GetCount(); - for ( size_t i = 0; i < count; i++ ) - { - sTmp = entries->GetVerbCmd( i ); - sTmp.Replace( wxT("%s"), wxT("%f") ); - sTmp = wxT( "\t") + sTmp; - outfile.AddLine( sTmp ); - } - - //for international use do something like this - //outfile.AddLine( wxString( "\t[en_US]icon-filename=") + cmd ); - outfile.AddLine( wxT( "\ticon-filename=") + m_aIcons[index] ); - } - else - { - if (delete_index) - outfile.CommentLine(nIndex); - - wxMimeTypeCommands sOld; - size_t nOld = nIndex + 1; - bool oldEntryEnd = false; - while ( (nOld < outfile.GetLineCount() ) && !oldEntryEnd) - { - sTmp = outfile.GetLine(nOld); - if ( (sTmp[0u] == wxT('\t')) || (sTmp[0u] == wxT('#')) ) - { - // we have another line to deal with - outfile.CommentLine(nOld); - nOld++; - - // add the line to our store - if ((!delete_index) && (sTmp[0u] == wxT('\t'))) - sOld.Add(sTmp); - } - // next mimetpye ?? or blank line - else - oldEntryEnd = true; - } - - // list of entries in our data; these should all be in sOld, - // though sOld may also contain other entries , eg flags - if (!delete_index) - { - wxMimeTypeCommands * entries = m_aEntries[index]; - size_t i; - for (i=0; i < entries->GetCount(); i++) - { - // replace any entries in sold that match verbs we know - sOld.AddOrReplaceVerb( entries->GetVerb(i), entries->GetCmd(i) ); - } - - //sOld should also contain the icon - if ( !m_aIcons[index].empty() ) - sOld.AddOrReplaceVerb( wxT("icon-filename"), m_aIcons[index] ); - - for (i=0; i < sOld.GetCount(); i++) - { - sTmp = sOld.GetVerbCmd( i ); - sTmp.Replace( wxT("%s"), wxT("%f") ); - sTmp = wxT("\t") + sTmp; - nIndex++; - outfile.InsertLine( sTmp, nIndex ); - } - } - } - - bool bTmp = outfile.Write(); - return bTmp; -} - -bool wxMimeTypesManagerImpl::WriteGnomeMimeFile(int index, bool delete_index) -{ - wxString gnomedir; - wxGetHomeDir( &gnomedir ); - - wxMimeTextFile outfile( gnomedir + wxT("/.gnome/mime-info/user.mime") ); - // if this fails probably Gnome is not installed ?? - // create it anyway as a private mime store - if (! outfile.Open() ) - { - if (delete_index) - return false; - if (!CheckGnomeDirsExist() ) - return false; - - outfile.Create(); - } - - wxString strType = m_aTypes[index]; - int nIndex = outfile.pIndexOf(strType); - if ( nIndex == wxNOT_FOUND ) - { - outfile.AddLine( strType ); - outfile.AddLine( wxT("\text:") + m_aExtensions.Item(index) ); - } - else - { - if (delete_index) - { - outfile.CommentLine(nIndex); - outfile.CommentLine(nIndex + 1); - } - else - { - // check for next line being the right one to replace ?? - wxString sOld = outfile.GetLine(nIndex + 1); - if (sOld.Contains( wxT("\text: ") )) - { - outfile.GetLine(nIndex + 1) = wxT("\text: ") + m_aExtensions.Item(index); - } - else - { - outfile.InsertLine( wxT("\text: ") + m_aExtensions.Item(index), nIndex + 1 ); - } - } - } - - bool bTmp = outfile.Write(); - return bTmp; -} - void wxMimeTypesManagerImpl::LoadGnomeDataFromKeyFile(const wxString& filename, const wxArrayString& dirs) { wxTextFile textfile(filename); #if defined(__WXGTK20__) && wxUSE_UNICODE - if ( !textfile.Open(wxConvUTF8) ) + if ( !textfile.Open(wxMBConvUTF8(wxMBConvUTF8::MAP_INVALID_UTF8_TO_OCTAL)) ) #else if ( !textfile.Open() ) #endif @@ -552,11 +291,12 @@ void wxMimeTypesManagerImpl::LoadGnomeDataFromKeyFile(const wxString& filename, wxLogTrace(TRACE_MIME, wxT("--- Opened Gnome file %s ---"), filename.c_str()); + wxArrayString search_dirs( dirs ); + // values for the entry being parsed wxString curMimeType, curIconFile; wxMimeTypeCommands * entry = new wxMimeTypeCommands; - // these are always empty in this file wxArrayString strExtensions; wxString strDesc; @@ -572,52 +312,82 @@ void wxMimeTypesManagerImpl::LoadGnomeDataFromKeyFile(const wxString& filename, wxLogTrace(TRACE_MIME, wxT("--- Reading from Gnome file %s '%s' ---"), filename.c_str(), pc); + // trim trailing space and tab + while ((*pc == wxT(' ')) || (*pc == wxT('\t'))) + pc++; + wxString sTmp(pc); - if (sTmp.Contains(wxT("=")) ) + int equal_pos = sTmp.Find( wxT('=') ); + if (equal_pos > 0) { - if (sTmp.Contains( wxT("icon-filename=") ) ) - { - // GNOME 1: - curIconFile = sTmp.AfterFirst(wxT('=')); - } - else if (sTmp.Contains( wxT("icon_filename=") ) ) + wxString left_of_equal = sTmp.Left( equal_pos ); + const wxChar *right_of_equal = pc; + right_of_equal += equal_pos+1; + + if (left_of_equal == wxT("icon_filename")) { // GNOME 2: - curIconFile = sTmp.AfterFirst(wxT('=')); + curIconFile = right_of_equal; - if (!wxFileExists(curIconFile)) + wxFileName newFile( curIconFile ); + if (newFile.IsRelative() || newFile.FileExists()) { - size_t nDirs = dirs.GetCount(); + size_t nDirs = search_dirs.GetCount(); + for (size_t nDir = 0; nDir < nDirs; nDir++) { - wxFileName newFile( curIconFile ); - newFile.SetPath( dirs[nDir] ); + newFile.SetPath( search_dirs[nDir] ); newFile.AppendDir( wxT("pixmaps") ); newFile.AppendDir( wxT("document-icons") ); newFile.SetExt( wxT("png") ); if (newFile.FileExists()) + { curIconFile = newFile.GetFullPath(); + // reorder search_dirs for speedup (fewer + // calls to FileExist() required) + if (nDir != 0) + { + const wxString &tmp = search_dirs[nDir]; + search_dirs.RemoveAt( nDir ); + search_dirs.Insert( tmp, 0 ); + } + break; + } } } } - else //: some other field, + else if (left_of_equal == wxT("open")) + { + sTmp = right_of_equal; + sTmp.Replace( wxT("%f"), wxT("%s") ); + sTmp.Prepend( wxT("open=") ); + entry->Add(sTmp); + } + else if (left_of_equal == wxT("view")) + { + sTmp = right_of_equal; + sTmp.Replace( wxT("%f"), wxT("%s") ); + sTmp.Prepend( wxT("view=") ); + entry->Add(sTmp); + } + else if (left_of_equal == wxT("print")) + { + sTmp = right_of_equal; + sTmp.Replace( wxT("%f"), wxT("%s") ); + sTmp.Prepend( wxT("print=") ); + entry->Add(sTmp); + } + else if (left_of_equal == wxT("description")) + { + strDesc = right_of_equal; + } + else if (left_of_equal == wxT("short_list_application_ids_for_novice_user_level")) { - //may contain lines like this (RH7) - // \t[lang]open.tex."TeX this file"=tex %f - // \tflags.tex.flags=needsterminal - // \topen.latex."LaTeX this file"=latex %f - // \tflags.latex.flags=needsterminal - - // \topen=xdvi %f - // \tview=xdvi %f - // \topen.convert.Convert file to Postscript=dvips %f -o `basename %f .dvi`.ps - - // for now ignore lines with flags in...FIX - sTmp = sTmp.AfterLast(wxT(']')); - sTmp = sTmp.AfterLast(wxT('\t')); - sTmp.Trim(false).Trim(); - if (0 == sTmp.Replace( wxT("%f"), wxT("%s") )) - sTmp = sTmp + wxT(" %s"); + sTmp = right_of_equal; + if (sTmp.Contains( wxT(",") )) + sTmp = sTmp.BeforeFirst( wxT(',') ); + sTmp.Prepend( wxT("open=") ); + sTmp.Append( wxT(" %s") ); entry->Add(sTmp); } @@ -646,7 +416,9 @@ void wxMimeTypesManagerImpl::LoadGnomeDataFromKeyFile(const wxString& filename, nLine++; } // end of while, save any data - if (! curMimeType.empty()) + if ( curMimeType.empty() ) + delete entry; + else AddToMimeData( curMimeType, curIconFile, entry, strExtensions, strDesc); } @@ -960,7 +732,7 @@ bool wxMimeTypesManagerImpl::WriteKDEMimeFile(int index, bool delete_index) { // holds an extension; need to change it to *.ext; wxString e = wxT("*.") + tokenizer.GetNextToken() + wxT(";"); - sTmp = sTmp + e; + sTmp += e; } if (!delete_index) @@ -1127,7 +899,7 @@ void wxMimeTypesManagerImpl::LoadKDELinksForMimeSubtype(const wxString& dirbase, // we expect %f; others including %F and %U and %u are possible wxString sTmp = file.GetCmd(nIndex); if (0 == sTmp.Replace( wxT("%f"), wxT("%s") )) - sTmp = sTmp + wxT(" %s"); + sTmp += wxT(" %s"); entry->AddOrReplaceVerb(wxString(wxT("open")), sTmp ); } @@ -1237,8 +1009,8 @@ void wxMimeTypesManagerImpl::GetKDEMimeInfo(const wxString& sExtraDir) // Check for entry wxString theme(wxT("default.kde")); - size_t cnt = config.GetLineCount(); - for (size_t i = 0; i < cnt; i++) + size_t nCount = config.GetLineCount(); + for (size_t i = 0; i < nCount; i++) { if (config[i].StartsWith(wxT("Theme="), &theme/*rest*/)) break; @@ -1365,7 +1137,8 @@ bool wxFileTypeImpl::GetIcon(wxIconLocation *iconLoc) const bool wxFileTypeImpl::GetMimeTypes(wxArrayString& mimeTypes) const { mimeTypes.Clear(); - for (size_t i = 0; i < m_index.GetCount(); i++) + size_t nCount = m_index.GetCount(); + for (size_t i = 0; i < nCount; i++) mimeTypes.Add(m_manager->m_aTypes[m_index[i]]); return true; @@ -1398,13 +1171,17 @@ size_t wxFileTypeImpl::GetAllCommands(wxArrayString *verbs, count++; if ( vrb.IsSameAs(wxT("open"))) { - verbs->Insert(vrb, 0u); - commands ->Insert(cmd, 0u); + if ( verbs ) + verbs->Insert(vrb, 0u); + if ( commands ) + commands ->Insert(cmd, 0u); } else { - verbs->Add(vrb); - commands->Add(cmd); + if ( verbs ) + verbs->Add(vrb); + if ( commands ) + commands->Add(cmd); } } } @@ -1474,7 +1251,8 @@ wxFileTypeImpl::SetCommand(const wxString& cmd, entry->Add(verb + wxT("=") + cmd + wxT(" %s ")); bool ok = true; - for ( size_t i = 0; i < strTypes.GetCount(); i++ ) + size_t nCount = strTypes.GetCount(); + for ( size_t i = 0; i < nCount; i++ ) { if (!m_manager->DoAssociation(strTypes[i], strIcon, entry, strExtensions, strDesc)) ok = false; @@ -1483,7 +1261,7 @@ wxFileTypeImpl::SetCommand(const wxString& cmd, return ok; } -// ignore index on the grouds that we only have one icon in a Unix file +// ignore index on the grounds that we only have one icon in a Unix file bool wxFileTypeImpl::SetDefaultIcon(const wxString& strIcon, int WXUNUSED(index)) { if (strIcon.empty()) @@ -1499,7 +1277,8 @@ bool wxFileTypeImpl::SetDefaultIcon(const wxString& strIcon, int WXUNUSED(index) wxMimeTypeCommands *entry = new wxMimeTypeCommands(); bool ok = true; - for ( size_t i = 0; i < strTypes.GetCount(); i++ ) + size_t nCount = strTypes.GetCount(); + for ( size_t i = 0; i < nCount; i++ ) { if ( !m_manager->DoAssociation ( @@ -1533,19 +1312,15 @@ void wxMimeTypesManagerImpl::InitIfNeeded() { // set the flag first to prevent recursion m_initialized = true; - -#if 1 - Initialize(); -#else - wxString wm = wxGetenv( wxT("WINDOWMANAGER") ); - - if (wm.Find( wxT("kde") ) != wxNOT_FOUND) - Initialize( wxMAILCAP_KDE | wxMAILCAP_STANDARD ); - else if (wm.Find( wxT("gnome") ) != wxNOT_FOUND) - Initialize( wxMAILCAP_GNOME | wxMAILCAP_STANDARD ); - else - Initialize(); -#endif + + wxString wm = wxTheApp->GetTraits()->GetDesktopEnvironment(); + + if (wm == wxT("KDE")) + Initialize( wxMAILCAP_KDE ); + else if (wm == wxT("GNOME")) + Initialize( wxMAILCAP_GNOME ); + else + Initialize(); } } @@ -1615,20 +1390,21 @@ void wxMimeTypesManagerImpl::GetMimeInfo(const wxString& sExtraDir) if (!sExtraDir.empty()) dirs.Add( sExtraDir + wxT("/") ); + wxString file; size_t nDirs = dirs.GetCount(); for ( size_t nDir = 0; nDir < nDirs; nDir++ ) { - wxString file = dirs[nDir] + wxT("mailcap"); + file = dirs[nDir]; + file += wxT("mailcap"); if ( wxFile::Exists(file) ) { ReadMailcap(file); } - file = dirs[nDir] + wxT("mime.types"); + file = dirs[nDir]; + file += wxT("mime.types"); if ( wxFile::Exists(file) ) - { ReadMimeTypes(file); - } } } @@ -1664,7 +1440,7 @@ bool wxMimeTypesManagerImpl::WriteToMimeTypes(int index, bool delete_index) nIndex = file.pIndexOf(wxT("#--Netscape")); if (nIndex != wxNOT_FOUND) { - wxASSERT_MSG(false,wxT("Error in .mime.types \nTrying to mix Netscape and Metamail formats\nFile not modiifed")); + wxFAIL_MSG(wxT("Error in .mime.types\nTrying to mix Netscape and Metamail formats\nFile not modified")); return false; } @@ -1681,7 +1457,7 @@ bool wxMimeTypesManagerImpl::WriteToMimeTypes(int index, bool delete_index) { // add the new entries in wxString sTmp = strType.Append( wxT(' '), 40 - strType.Len() ); - sTmp = sTmp + m_aExtensions[index]; + sTmp += m_aExtensions[index]; file.AddLine(sTmp); } @@ -1731,7 +1507,7 @@ bool wxMimeTypesManagerImpl::WriteToNSMimeTypes(int index, bool delete_index) // metamail entreies if (file.GetLineCount() > 0) { - wxASSERT_MSG(false, wxT(".mime.types File not in Netscape format\nNo entries written to\n.mime.types or to .mailcap")); + wxFAIL_MSG(wxT(".mime.types File not in Netscape format\nNo entries written to\n.mime.types or to .mailcap")); return false; } @@ -1850,7 +1626,7 @@ bool wxMimeTypesManagerImpl::WriteToMailCap(int index, bool delete_index) file.GetLineCount()) file.CommentLine(nIndex); } - sTmp = sTmp + wxT(";") + sCmd; //includes wxT(" %s "); + sTmp += wxT(";") + sCmd; //includes wxT(" %s "); // write it in the format that Netscape uses (default) if (! ( m_mailcapStylesInited & wxMAILCAP_STANDARD ) ) @@ -1888,7 +1664,8 @@ bool wxMimeTypesManagerImpl::WriteToMailCap(int index, bool delete_index) bKnownToken = true; size_t i; - for (i=0; i < entries->GetCount(); i++) + size_t nCount = entries->GetCount(); + for (i=0; i < nCount; i++) { if (s.Contains(entries->GetVerb(i))) bKnownToken = true; @@ -1896,7 +1673,7 @@ bool wxMimeTypesManagerImpl::WriteToMailCap(int index, bool delete_index) if (!bKnownToken) { - sTmp = sTmp + wxT("; \\"); + sTmp += wxT("; \\"); file.InsertLine(sTmp, nIndex); sTmp = s; } @@ -1907,7 +1684,7 @@ bool wxMimeTypesManagerImpl::WriteToMailCap(int index, bool delete_index) if (! m_aDescriptions[index].empty() ) { - sTmp = sTmp + wxT("; \\"); + sTmp += wxT("; \\"); file.InsertLine(sTmp, nIndex); nIndex++; sTmp = wxT(" description=\"") + m_aDescriptions[index] + wxT("\""); @@ -1915,7 +1692,7 @@ bool wxMimeTypesManagerImpl::WriteToMailCap(int index, bool delete_index) if (! m_aIcons[index].empty() ) { - sTmp = sTmp + wxT("; \\"); + sTmp += wxT("; \\"); file.InsertLine(sTmp, nIndex); nIndex++; sTmp = wxT(" x11-bitmap=\"") + m_aIcons[index] + wxT("\""); @@ -1927,7 +1704,7 @@ bool wxMimeTypesManagerImpl::WriteToMailCap(int index, bool delete_index) for (i=0; i < entries->GetCount(); i++) if ( i != iOpen ) { - sTmp = sTmp + wxT("; \\"); + sTmp += wxT("; \\"); file.InsertLine(sTmp, nIndex); nIndex++; sTmp = wxT(" ") + entries->GetVerbCmd(i); @@ -1964,14 +1741,16 @@ wxFileType * wxMimeTypesManagerImpl::Associate(const wxFileTypeInfo& ftInfo) wxArrayString sA_Exts = ftInfo.GetExtensions(); wxString sExt, sExtStore; size_t i, nIndex; - for (i=0; i < sA_Exts.GetCount(); i++) + size_t nExtCount = sA_Exts.GetCount(); + for (i=0; i < nExtCount; i++) { sExt = sA_Exts.Item(i); // clean up to just a space before and after sExt.Trim().Trim(false); sExt = wxT(' ') + sExt + wxT(' '); - for (nIndex = 0; nIndex < m_aExtensions.GetCount(); nIndex++) + size_t nCount = m_aExtensions.GetCount(); + for (nIndex = 0; nIndex < nCount; nIndex++) { sExtStore = m_aExtensions.Item(nIndex); if (sExtStore.Replace(sExt, wxT(" ") ) > 0) @@ -2019,13 +1798,8 @@ bool wxMimeTypesManagerImpl::WriteMimeInfo(int nIndex, bool delete_mime ) ok = false; } - if (m_mailcapStylesInited & wxMAILCAP_GNOME) - { - // write in Gnome format; - if (WriteGnomeMimeFile(nIndex, delete_mime) ) - if (WriteGnomeKeyFile(nIndex, delete_mime) ) - ok = false; - } + // Don't write GNOME files here as this is not + // allowed and simply doesn't work if (m_mailcapStylesInited & wxMAILCAP_KDE) { @@ -2118,10 +1892,12 @@ int wxMimeTypesManagerImpl::AddToMimeData(const wxString& strType, wxString& exts = m_aExtensions[nIndex]; // add all extensions we don't have yet + wxString ext; size_t count = strExtensions.GetCount(); for ( size_t i = 0; i < count; i++ ) { - wxString ext = strExtensions[i] + wxT(' '); + ext = strExtensions[i]; + ext += wxT(' '); if ( exts.Find(ext) == wxNOT_FOUND ) { @@ -2222,7 +1998,8 @@ wxString wxMimeTypesManagerImpl::GetCommand(const wxString & verb, size_t nIndex wxMimeTypeCommands * sPairs = m_aEntries [nIndex]; size_t i; - for ( i = 0; i < sPairs->GetCount (); i++ ) + size_t nCount = sPairs->GetCount(); + for ( i = 0; i < nCount; i++ ) { sTmp = sPairs->GetVerbCmd (i); if ( sTmp.Contains(sV) ) @@ -2384,8 +2161,8 @@ bool wxMimeTypesManagerImpl::ReadMimeTypes(const wxString& strFileName) pEnd = wxStrchr(++pc, wxT('"')); if ( pEnd == NULL ) { - wxLogWarning(wxT("Mime.types file %s, line %d: unterminated quoted string."), - strFileName.c_str(), nLine + 1); + wxLogWarning(wxT("Mime.types file %s, line %lu: unterminated quoted string."), + strFileName.c_str(), nLine + 1L); } } else @@ -2442,8 +2219,8 @@ bool wxMimeTypesManagerImpl::ReadMimeTypes(const wxString& strFileName) // unregistered extensions according to the standard practice, // but it may be worth telling the user about other junk in // his mime.types file - wxLogWarning(wxT("Unknown field in file %s, line %d: '%s'."), - strFileName.c_str(), nLine + 1, strLHS.c_str()); + wxLogWarning(wxT("Unknown field in file %s, line %lu: '%s'."), + strFileName.c_str(), nLine + 1L, strLHS.c_str()); } if ( !entryEnded ) @@ -2618,6 +2395,10 @@ bool wxMimeTypesManagerImpl::ReadMailcap(const wxString& strFileName, wxString curField; curField.reserve(1024); + const wxChar *pPagerEnv = wxGetenv(wxT("PAGER")); + + const wxArrayString empty_extensions_list; + size_t nLineCount = file.GetLineCount(); for ( size_t nLine = 0; nLine < nLineCount; nLine++ ) { @@ -2669,7 +2450,7 @@ bool wxMimeTypesManagerImpl::ReadMailcap(const wxString& strFileName, wxLogDebug(wxT("Mailcap file %s, line %lu: '\\' on the end of the last line ignored."), strFileName.c_str(), - (unsigned long)nLine + 1); + nLine + 1L); } else { @@ -2733,7 +2514,7 @@ bool wxMimeTypesManagerImpl::ReadMailcap(const wxString& strFileName, ( wxT("Mailcap file %s, line %lu: unknown field '%s' for the MIME type '%s' ignored."), strFileName.c_str(), - (unsigned long)nLine + 1, + nLine + 1L, curField.c_str(), data.type.c_str() ); @@ -2770,8 +2551,8 @@ bool wxMimeTypesManagerImpl::ReadMailcap(const wxString& strFileName, // check that we really read something reasonable if ( currentToken < Field_Other ) { - wxLogWarning(wxT("Mailcap file %s, line %d: incomplete entry ignored."), - strFileName.c_str(), nLine + 1); + wxLogWarning(wxT("Mailcap file %s, line %lu: incomplete entry ignored."), + strFileName.c_str(), nLine + 1L); continue; } @@ -2792,13 +2573,12 @@ bool wxMimeTypesManagerImpl::ReadMailcap(const wxString& strFileName, // is a bad idea (FIXME) if ( data.copiousoutput ) { - const wxChar *p = wxGetenv(wxT("PAGER")); - data.cmdOpen << wxT(" | ") << (p ? p : wxT("more")); + data.cmdOpen << wxT(" | ") << (pPagerEnv ? pPagerEnv : wxT("more")); } if ( data.needsterminal ) { - data.cmdOpen = wxString::Format(wxT("xterm -e sh -c '%s'"), + data.cmdOpen.Printf(wxT("xterm -e sh -c '%s'"), data.cmdOpen.c_str()); } @@ -2837,7 +2617,7 @@ bool wxMimeTypesManagerImpl::ReadMailcap(const wxString& strFileName, data.type, data.icon, new wxMimeTypeCommands(data.verbs, data.commands), - wxArrayString() /* extensions */, + empty_extensions_list, data.desc, overwrite ); @@ -2857,12 +2637,11 @@ size_t wxMimeTypesManagerImpl::EnumAllFileTypes(wxArrayString& mimetypes) mimetypes.Empty(); - wxString type; size_t count = m_aTypes.GetCount(); for ( size_t n = 0; n < count; n++ ) { // don't return template types from here (i.e. anything containg '*') - type = m_aTypes[n]; + const wxString &type = m_aTypes[n]; if ( type.Find(wxT('*')) == wxNOT_FOUND ) { mimetypes.Add(type); @@ -2878,14 +2657,16 @@ size_t wxMimeTypesManagerImpl::EnumAllFileTypes(wxArrayString& mimetypes) bool wxMimeTypesManagerImpl::Unassociate(wxFileType *ft) { + InitIfNeeded(); + wxArrayString sMimeTypes; ft->GetMimeTypes(sMimeTypes); - wxString sMime; size_t i; - for (i = 0; i < sMimeTypes.GetCount(); i ++) + size_t nCount = sMimeTypes.GetCount(); + for (i = 0; i < nCount; i ++) { - sMime = sMimeTypes.Item(i); + const wxString &sMime = sMimeTypes.Item(i); int nIndex = m_aTypes.Index(sMime); if ( nIndex == wxNOT_FOUND) { @@ -2917,7 +2698,7 @@ bool wxMimeTypesManagerImpl::Unassociate(wxFileType *ft) static bool IsKnownUnimportantField(const wxString& fieldAll) { - static const wxChar *knownFields[] = + static const wxChar * const knownFields[] = { wxT("x-mozilla-flags"), wxT("nametemplate"), @@ -2936,4 +2717,3 @@ static bool IsKnownUnimportantField(const wxString& fieldAll) #endif // wxUSE_MIMETYPE && wxUSE_FILE && wxUSE_TEXTFILE -