X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8c9892c2a8c2d0e06e1823e375bdec6ec58fe828..229653c99e1d679aab15772a4a25909ca52c4d94:/src/common/cmdline.cpp diff --git a/src/common/cmdline.cpp b/src/common/cmdline.cpp index 2c5ea56421..1c74dfdb5e 100644 --- a/src/common/cmdline.cpp +++ b/src/common/cmdline.cpp @@ -44,6 +44,7 @@ #include #include "wx/datetime.h" +#include "wx/msgout.h" // ---------------------------------------------------------------------------- // private functions @@ -51,8 +52,14 @@ static wxString GetTypeName(wxCmdLineParamType type); +static wxString GetOptionName(const wxChar *p, const wxChar *allowedChars); + +static wxString GetShortOptionName(const wxChar *p); + +static wxString GetLongOptionName(const wxChar *p); + // ---------------------------------------------------------------------------- -// private classes +// private structs // ---------------------------------------------------------------------------- // an internal representation of an option @@ -68,6 +75,18 @@ struct wxCmdLineOption wxASSERT_MSG( !shrt.empty() || !lng.empty(), _T("option should have at least one name") ); + wxASSERT_MSG + ( + GetShortOptionName(shrt).Len() == shrt.Len(), + wxT("Short option contains invalid characters") + ); + + wxASSERT_MSG + ( + GetLongOptionName(lng).Len() == lng.Len(), + wxT("Long option contains invalid characters") + ); + kind = k; shortName = shrt; @@ -280,6 +299,11 @@ void wxCmdLineParser::EnableLongOptions(bool enable) m_data->m_enableLongOptions = enable; } +bool wxCmdLineParser::AreLongOptionsEnabled() +{ + return m_data->m_enableLongOptions; +} + void wxCmdLineParser::SetLogo(const wxString& logo) { m_data->m_logo = logo; @@ -490,6 +514,7 @@ int wxCmdLineParser::Parse(bool showUsage) size_t currentParam = 0; // the index in m_paramDesc size_t countParam = m_data->m_paramDesc.GetCount(); + wxString errorMsg; Reset(); @@ -519,23 +544,35 @@ int wxCmdLineParser::Parse(bool showUsage) int optInd = wxNOT_FOUND; // init to suppress warnings // an option or a switch: find whether it's a long or a short one - if ( m_data->m_enableLongOptions && - arg[0u] == _T('-') && arg[1u] == _T('-') ) + if ( arg[0u] == _T('-') && arg[1u] == _T('-') ) { // a long one isLong = TRUE; + // Skip leading "--" const wxChar *p = arg.c_str() + 2; - while ( wxIsalnum(*p) || (*p == _T('_')) || (*p == _T('-')) ) + + bool longOptionsEnabled = AreLongOptionsEnabled(); + + name = GetLongOptionName(p); + + if (longOptionsEnabled) { - name += *p++; + optInd = m_data->FindOptionByLongName(name); + if ( optInd == wxNOT_FOUND ) + { + errorMsg << wxString::Format(_("Unknown long option '%s'"), name.c_str()) << "\n"; + } } - - optInd = m_data->FindOptionByLongName(name); - if ( optInd == wxNOT_FOUND ) + else { - wxLogError(_("Unknown long option '%s'"), name.c_str()); + optInd = wxNOT_FOUND; // Sanity check + + // Print the argument including leading "--" + name.Prepend( wxT("--") ); + errorMsg << wxString::Format(_("Unknown option '%s'"), name.c_str()) << "\n"; } + } else { @@ -544,10 +581,8 @@ int wxCmdLineParser::Parse(bool showUsage) // a short one: as they can be cumulated, we try to find the // longest substring which is a valid option const wxChar *p = arg.c_str() + 1; - while ( wxIsalnum(*p) || (*p == _T('_')) ) - { - name += *p++; - } + + name = GetShortOptionName(p); size_t len = name.length(); do @@ -556,7 +591,7 @@ int wxCmdLineParser::Parse(bool showUsage) { // we couldn't find a valid option name in the // beginning of this string - wxLogError(_("Unknown option '%s'"), name.c_str()); + errorMsg << wxString::Format(_("Unknown option '%s'"), name.c_str()) << "\n"; break; } @@ -628,7 +663,7 @@ int wxCmdLineParser::Parse(bool showUsage) if ( *p++ != _T('=') ) { - wxLogError(_("Option '%s' requires a value, '=' expected."), name.c_str()); + errorMsg << wxString::Format(_("Option '%s' requires a value, '=' expected."), name.c_str()) << "\n"; ok = FALSE; } @@ -648,8 +683,8 @@ int wxCmdLineParser::Parse(bool showUsage) if ( ++n == count ) { // ... but there is none - wxLogError(_("Option '%s' requires a value."), - name.c_str()); + errorMsg << wxString::Format(_("Option '%s' requires a value."), + name.c_str()) << "\n"; ok = FALSE; } @@ -665,8 +700,8 @@ int wxCmdLineParser::Parse(bool showUsage) // not depending on the option style if ( opt.flags & wxCMD_LINE_NEEDS_SEPARATOR ) { - wxLogError(_("Separator expected after the option '%s'."), - name.c_str()); + errorMsg << wxString::Format(_("Separator expected after the option '%s'."), + name.c_str()) << "\n"; ok = FALSE; } @@ -695,8 +730,8 @@ int wxCmdLineParser::Parse(bool showUsage) } else { - wxLogError(_("'%s' is not a correct numeric value for option '%s'."), - value.c_str(), name.c_str()); + errorMsg << wxString::Format(_("'%s' is not a correct numeric value for option '%s'."), + value.c_str(), name.c_str()) << "\n"; ok = FALSE; } @@ -709,8 +744,8 @@ int wxCmdLineParser::Parse(bool showUsage) const wxChar *res = dt.ParseDate(value); if ( !res || *res ) { - wxLogError(_("Option '%s': '%s' cannot be converted to a date."), - name.c_str(), value.c_str()); + errorMsg << wxString::Format(_("Option '%s': '%s' cannot be converted to a date."), + name.c_str(), value.c_str()) << "\n"; ok = FALSE; } @@ -750,7 +785,7 @@ int wxCmdLineParser::Parse(bool showUsage) } else { - wxLogError(_("Unexpected parameter '%s'"), arg.c_str()); + errorMsg << wxString::Format(_("Unexpected parameter '%s'"), arg.c_str()) << "\n"; ok = FALSE; } @@ -778,8 +813,8 @@ int wxCmdLineParser::Parse(bool showUsage) opt.longName.c_str()); } - wxLogError(_("The value for the option '%s' must be specified."), - optName.c_str()); + errorMsg << wxString::Format(_("The value for the option '%s' must be specified."), + optName.c_str()) << "\n"; ok = FALSE; } @@ -799,17 +834,21 @@ int wxCmdLineParser::Parse(bool showUsage) if ( !(param.flags & wxCMD_LINE_PARAM_OPTIONAL) ) { - wxLogError(_("The required parameter '%s' was not specified."), - param.description.c_str()); + errorMsg << wxString::Format(_("The required parameter '%s' was not specified."), + param.description.c_str()) << "\n"; ok = FALSE; } } } - if ( !ok && showUsage ) + if ( !ok && errorMsg.length() != 0 ) { - Usage(); + wxString usage; + wxMessageOutput* msgOut = wxMessageOutput::Get(); + if ( showUsage ) usage = GetUsageString(); + if ( msgOut ) + msgOut->Printf( wxT("%s%s"), usage.c_str(), errorMsg.c_str() ); } return ok ? 0 : helpRequested ? -1 : 1; @@ -820,11 +859,20 @@ int wxCmdLineParser::Parse(bool showUsage) // ---------------------------------------------------------------------------- void wxCmdLineParser::Usage() +{ + wxString usage = GetUsageString(); + wxMessageOutput* msgOut = wxMessageOutput::Get(); + if ( msgOut ) + msgOut->Printf( wxT("%s"), usage.c_str() ); +} + +wxString wxCmdLineParser::GetUsageString() { wxString appname = wxTheApp->GetAppName(); if ( !appname ) { - wxCHECK_RET( !m_data->m_arguments.IsEmpty(), _T("no program name") ); + wxCHECK_MSG( !m_data->m_arguments.IsEmpty(), wxEmptyString, + _T("no program name") ); appname = wxFileNameFromPath(m_data->m_arguments[0]); wxStripExtension(appname); @@ -833,37 +881,52 @@ void wxCmdLineParser::Usage() // we construct the brief cmd line desc on the fly, but not the detailed // help message below because we want to align the options descriptions // and for this we must first know the longest one of them - wxString brief; + wxString usage; wxArrayString namesOptions, descOptions; - brief.Printf(_("Usage: %s"), appname.c_str()); + + if ( !!m_data->m_logo ) + { + usage << m_data->m_logo << _T('\n'); + } + + usage << wxString::Format(_("Usage: %s"), appname.c_str()); // the switch char is usually '-' but this can be changed with // SetSwitchChars() and then the first one of possible chars is used wxChar chSwitch = !m_data->m_switchChars ? _T('-') : m_data->m_switchChars[0u]; + bool areLongOptionsEnabled = AreLongOptionsEnabled(); size_t n, count = m_data->m_options.GetCount(); for ( n = 0; n < count; n++ ) { wxCmdLineOption& opt = m_data->m_options[n]; - brief << _T(' '); + usage << _T(' '); if ( !(opt.flags & wxCMD_LINE_OPTION_MANDATORY) ) { - brief << _T('['); + usage << _T('['); } if ( !opt.shortName.empty() ) { - brief << chSwitch << opt.shortName; + usage << chSwitch << opt.shortName; } - else if ( !opt.longName.empty() ) + else if ( areLongOptionsEnabled && !opt.longName.empty() ) { - brief << _T("--") << opt.longName; + usage << _T("--") << opt.longName; } else { - wxFAIL_MSG( _T("option without neither short nor long name?") ); + if (!opt.longName.empty()) + { + wxFAIL_MSG( wxT("option with only a long name while long ") + wxT("options are disabled") ); + } + else + { + wxFAIL_MSG( _T("option without neither short nor long name") ); + } } wxString option; @@ -873,7 +936,7 @@ void wxCmdLineParser::Usage() option << _T(" ") << chSwitch << opt.shortName; } - if ( !opt.longName.empty() ) + if ( areLongOptionsEnabled && !opt.longName.empty() ) { option << (option.empty() ? _T(" ") : _T(", ")) << _T("--") << opt.longName; @@ -883,13 +946,13 @@ void wxCmdLineParser::Usage() { wxString val; val << _T('<') << GetTypeName(opt.type) << _T('>'); - brief << _T(' ') << val; + usage << _T(' ') << val; option << (!opt.longName ? _T(':') : _T('=')) << val; } if ( !(opt.flags & wxCMD_LINE_OPTION_MANDATORY) ) { - brief << _T(']'); + usage << _T(']'); } namesOptions.Add(option); @@ -901,37 +964,26 @@ void wxCmdLineParser::Usage() { wxCmdLineParam& param = m_data->m_paramDesc[n]; - brief << _T(' '); + usage << _T(' '); if ( param.flags & wxCMD_LINE_PARAM_OPTIONAL ) { - brief << _T('['); + usage << _T('['); } - brief << param.description; + usage << param.description; if ( param.flags & wxCMD_LINE_PARAM_MULTIPLE ) { - brief << _T("..."); + usage << _T("..."); } if ( param.flags & wxCMD_LINE_PARAM_OPTIONAL ) { - brief << _T(']'); + usage << _T(']'); } } - if ( !!m_data->m_logo ) - { - wxLogMessage(m_data->m_logo); - } - - // in console mode we want to show the brief usage message first, then the - // detailed one but in GUI build we give the details first and then the - // summary - like this, the brief message appears in the wxLogGui dialog, - // as expected -#if !wxUSE_GUI - wxLogMessage(brief); -#endif // !wxUSE_GUI + usage << _T('\n'); // now construct the detailed help message size_t len, lenMax = 0; @@ -943,22 +995,16 @@ void wxCmdLineParser::Usage() lenMax = len; } - wxString detailed; for ( n = 0; n < count; n++ ) { len = namesOptions[n].length(); - detailed << namesOptions[n] - << wxString(_T(' '), lenMax - len) << _T('\t') - << descOptions[n] - << _T('\n'); + usage << namesOptions[n] + << wxString(_T(' '), lenMax - len) << _T('\t') + << descOptions[n] + << _T('\n'); } - wxLogMessage(detailed); - - // do it now if not done above -#if wxUSE_GUI - wxLogMessage(brief); -#endif // wxUSE_GUI + return usage; } // ---------------------------------------------------------------------------- @@ -982,6 +1028,48 @@ static wxString GetTypeName(wxCmdLineParamType type) return s; } +/* +Returns a string which is equal to the string pointed to by p, but up to the +point where p contains an character that's not allowed. +Allowable characters are letters and numbers, and characters pointed to by +the parameter allowedChars. + +For example, if p points to "abcde-@-_", and allowedChars is "-_", +this function returns "abcde-". +*/ +static wxString GetOptionName(const wxChar *p, + const wxChar *allowedChars) +{ + wxString argName; + + while ( *p && (wxIsalnum(*p) || wxStrchr(allowedChars, *p)) ) + { + argName += *p++; + } + + return argName; +} + +// Besides alphanumeric characters, short and long options can +// have other characters. + +// A short option additionally can have these +#define wxCMD_LINE_CHARS_ALLOWED_BY_SHORT_OPTION wxT("_?") + +// A long option can have the same characters as a short option and a '-'. +#define wxCMD_LINE_CHARS_ALLOWED_BY_LONG_OPTION \ + wxCMD_LINE_CHARS_ALLOWED_BY_SHORT_OPTION wxT("-") + +static wxString GetShortOptionName(const wxChar *p) +{ + return GetOptionName(p, wxCMD_LINE_CHARS_ALLOWED_BY_SHORT_OPTION); +} + +static wxString GetLongOptionName(const wxChar *p) +{ + return GetOptionName(p, wxCMD_LINE_CHARS_ALLOWED_BY_LONG_OPTION); +} + #endif // wxUSE_CMDLINE_PARSER // ---------------------------------------------------------------------------- @@ -990,7 +1078,7 @@ static wxString GetTypeName(wxCmdLineParamType type) /* This function is mainly used under Windows (as under Unix we always get the - command line arguments as agrc/argv anyhow) and so it tries to handle the + command line arguments as argc/argv anyhow) and so it tries to handle the Windows path names (separated by backslashes) correctly. For this it only considers that a backslash may be used to escape another backslash (but normally this is _not_ needed) or a quote but nothing else. @@ -1040,7 +1128,8 @@ wxArrayString wxCmdLineParser::ConvertStringToArgs(const wxChar *p) p++; // if we have 2 backslashes in a row, output one - if ( isQuotedByBS ) + // unless it looks like a UNC path \\machine\dir\file.ext + if ( isQuotedByBS || arg.Len() == 0 ) { arg += _T('\\'); isQuotedByBS = FALSE;