///////////////////////////////////////////////////////////////////////////////
-// Name: common/cmdline.cpp
+// Name: src/common/cmdline.cpp
// Purpose: wxCmdLineParser implementation
// Author: Vadim Zeitlin
// Modified by:
// Created: 05.01.00
// RCS-ID: $Id$
// Copyright: (c) 2000 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence: wxWindows license
+// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
// ============================================================================
// headers
// ----------------------------------------------------------------------------
-#ifdef __GNUG__
- #pragma implementation "cmdline.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#pragma hdrstop
#endif
-#include "wx/cmdline.h"
-
-#if wxUSE_CMDLINE_PARSER
-
#ifndef WX_PRECOMP
+ #include "wx/dynarray.h"
#include "wx/string.h"
#include "wx/log.h"
#include "wx/intl.h"
#include "wx/app.h"
- #include "wx/dynarray.h"
- #include "wx/filefn.h"
#endif //WX_PRECOMP
+#include "wx/cmdline.h"
+
+#if wxUSE_CMDLINE_PARSER
+
#include <ctype.h>
#include "wx/datetime.h"
#include "wx/msgout.h"
+#include "wx/filename.h"
+#include "wx/apptrait.h"
// ----------------------------------------------------------------------------
// private functions
static wxString GetTypeName(wxCmdLineParamType type);
-static wxString GetOptionName(const wxChar *p, const wxChar *allowedChars);
+static wxString GetOptionName(wxString::const_iterator p,
+ wxString::const_iterator end,
+ const wxChar *allowedChars);
-static wxString GetShortOptionName(const wxChar *p);
+static wxString GetShortOptionName(wxString::const_iterator p,
+ wxString::const_iterator end);
-static wxString GetLongOptionName(const wxChar *p);
+static wxString GetLongOptionName(wxString::const_iterator p,
+ wxString::const_iterator end);
// ----------------------------------------------------------------------------
// private structs
_T("option should have at least one name") );
wxASSERT_MSG
- (
- GetShortOptionName(shrt).Len() == shrt.Len(),
- wxT("Short option contains invalid characters")
- );
+ (
+ GetShortOptionName(shrt.begin(), shrt.end()).Len() == shrt.Len(),
+ wxT("Short option contains invalid characters")
+ );
wxASSERT_MSG
- (
- GetLongOptionName(lng).Len() == lng.Len(),
- wxT("Long option contains invalid characters")
- );
-
+ (
+ GetLongOptionName(lng.begin(), lng.end()).Len() == lng.Len(),
+ wxT("Long option contains invalid characters")
+ );
+
kind = k;
type = typ;
flags = fl;
- m_hasVal = FALSE;
+ m_hasVal = false;
}
// can't use union easily here, so just store all possible data fields, we
{ Check(wxCMD_LINE_VAL_NUMBER); return m_longVal; }
const wxString& GetStrVal() const
{ Check(wxCMD_LINE_VAL_STRING); return m_strVal; }
+#if wxUSE_DATETIME
const wxDateTime& GetDateVal() const
{ Check(wxCMD_LINE_VAL_DATE); return m_dateVal; }
+#endif // wxUSE_DATETIME
void SetLongVal(long val)
- { Check(wxCMD_LINE_VAL_NUMBER); m_longVal = val; m_hasVal = TRUE; }
+ { Check(wxCMD_LINE_VAL_NUMBER); m_longVal = val; m_hasVal = true; }
void SetStrVal(const wxString& val)
- { Check(wxCMD_LINE_VAL_STRING); m_strVal = val; m_hasVal = TRUE; }
- void SetDateVal(const wxDateTime val)
- { Check(wxCMD_LINE_VAL_DATE); m_dateVal = val; m_hasVal = TRUE; }
+ { Check(wxCMD_LINE_VAL_STRING); m_strVal = val; m_hasVal = true; }
+#if wxUSE_DATETIME
+ void SetDateVal(const wxDateTime& val)
+ { Check(wxCMD_LINE_VAL_DATE); m_dateVal = val; m_hasVal = true; }
+#endif // wxUSE_DATETIME
- void SetHasValue(bool hasValue = TRUE) { m_hasVal = hasValue; }
+ void SetHasValue(bool hasValue = true) { m_hasVal = hasValue; }
bool HasValue() const { return m_hasVal; }
public:
long m_longVal;
wxString m_strVal;
+#if wxUSE_DATETIME
wxDateTime m_dateVal;
+#endif // wxUSE_DATETIME
};
struct wxCmdLineParam
#include "wx/arrimpl.cpp"
-WX_DEFINE_OBJARRAY(wxArrayOptions);
-WX_DEFINE_OBJARRAY(wxArrayParams);
+WX_DEFINE_OBJARRAY(wxArrayOptions)
+WX_DEFINE_OBJARRAY(wxArrayParams)
// the parser internal state
struct wxCmdLineParserData
{
// options
wxString m_switchChars; // characters which may start an option
- bool m_enableLongOptions; // TRUE if long options are enabled
+ bool m_enableLongOptions; // true if long options are enabled
wxString m_logo; // some extra text to show in Usage()
// cmd line data
wxArrayString m_arguments; // == argv, argc == m_arguments.GetCount()
- wxArrayOptions m_options; // all possible options and switchrs
+ wxArrayOptions m_options; // all possible options and switches
wxArrayParams m_paramDesc; // description of all possible params
wxArrayString m_parameters; // all params found
// methods
wxCmdLineParserData();
+ void SetArguments(int argc, char **argv);
+#if wxUSE_UNICODE
void SetArguments(int argc, wxChar **argv);
+ void SetArguments(int argc, const wxCmdLineArgsArray& argv);
+#endif // wxUSE_UNICODE
void SetArguments(const wxString& cmdline);
int FindOption(const wxString& name);
wxCmdLineParserData::wxCmdLineParserData()
{
- m_enableLongOptions = TRUE;
+ m_enableLongOptions = true;
#ifdef __UNIX_LIKE__
m_switchChars = _T("-");
#else // !Unix
#endif
}
+void wxCmdLineParserData::SetArguments(int argc, char **argv)
+{
+ m_arguments.clear();
+
+ for ( int n = 0; n < argc; n++ )
+ {
+ m_arguments.push_back(wxString::FromAscii(argv[n]));
+ }
+}
+
+#if wxUSE_UNICODE
+
void wxCmdLineParserData::SetArguments(int argc, wxChar **argv)
{
- m_arguments.Empty();
+ m_arguments.clear();
for ( int n = 0; n < argc; n++ )
{
- m_arguments.Add(argv[n]);
+ m_arguments.push_back(argv[n]);
}
}
+void wxCmdLineParserData::SetArguments(int WXUNUSED(argc),
+ const wxCmdLineArgsArray& argv)
+{
+ m_arguments = argv.GetArguments();
+}
+
+#endif // wxUSE_UNICODE
+
void wxCmdLineParserData::SetArguments(const wxString& cmdLine)
{
- m_arguments.Empty();
+ m_arguments.clear();
- m_arguments.Add(wxTheApp->GetAppName());
+ if(wxTheApp && wxTheApp->argc > 0)
+ m_arguments.push_back(wxTheApp->argv[0]);
+ else
+ m_arguments.push_back(wxEmptyString);
wxArrayString args = wxCmdLineParser::ConvertStringToArgs(cmdLine);
m_data = new wxCmdLineParserData;
}
+void wxCmdLineParser::SetCmdLine(int argc, char **argv)
+{
+ m_data->SetArguments(argc, argv);
+}
+
+#if wxUSE_UNICODE
+
void wxCmdLineParser::SetCmdLine(int argc, wxChar **argv)
{
m_data->SetArguments(argc, argv);
}
+void wxCmdLineParser::SetCmdLine(int argc, const wxCmdLineArgsArray& argv)
+{
+ m_data->SetArguments(argc, argv);
+}
+
+#endif // wxUSE_UNICODE
+
void wxCmdLineParser::SetCmdLine(const wxString& cmdline)
{
m_data->SetArguments(cmdline);
switch ( desc->kind )
{
case wxCMD_LINE_SWITCH:
- AddSwitch(desc->shortName, desc->longName, desc->description,
+ AddSwitch(desc->shortName, desc->longName,
+ wxGetTranslation(desc->description),
desc->flags);
break;
case wxCMD_LINE_OPTION:
- AddOption(desc->shortName, desc->longName, desc->description,
+ AddOption(desc->shortName, desc->longName,
+ wxGetTranslation(desc->description),
desc->type, desc->flags);
break;
case wxCMD_LINE_PARAM:
- AddParam(desc->description, desc->type, desc->flags);
+ AddParam(wxGetTranslation(desc->description),
+ desc->type, desc->flags);
break;
default:
if ( i == wxNOT_FOUND )
i = m_data->FindOptionByLongName(name);
- wxCHECK_MSG( i != wxNOT_FOUND, FALSE, _T("unknown switch") );
+ wxCHECK_MSG( i != wxNOT_FOUND, false, _T("unknown switch") );
wxCmdLineOption& opt = m_data->m_options[(size_t)i];
if ( !opt.HasValue() )
- return FALSE;
+ return false;
- return TRUE;
+ return true;
}
bool wxCmdLineParser::Found(const wxString& name, wxString *value) const
if ( i == wxNOT_FOUND )
i = m_data->FindOptionByLongName(name);
- wxCHECK_MSG( i != wxNOT_FOUND, FALSE, _T("unknown option") );
+ wxCHECK_MSG( i != wxNOT_FOUND, false, _T("unknown option") );
wxCmdLineOption& opt = m_data->m_options[(size_t)i];
if ( !opt.HasValue() )
- return FALSE;
+ return false;
- wxCHECK_MSG( value, FALSE, _T("NULL pointer in wxCmdLineOption::Found") );
+ wxCHECK_MSG( value, false, _T("NULL pointer in wxCmdLineOption::Found") );
*value = opt.GetStrVal();
- return TRUE;
+ return true;
}
bool wxCmdLineParser::Found(const wxString& name, long *value) const
if ( i == wxNOT_FOUND )
i = m_data->FindOptionByLongName(name);
- wxCHECK_MSG( i != wxNOT_FOUND, FALSE, _T("unknown option") );
+ wxCHECK_MSG( i != wxNOT_FOUND, false, _T("unknown option") );
wxCmdLineOption& opt = m_data->m_options[(size_t)i];
if ( !opt.HasValue() )
- return FALSE;
+ return false;
- wxCHECK_MSG( value, FALSE, _T("NULL pointer in wxCmdLineOption::Found") );
+ wxCHECK_MSG( value, false, _T("NULL pointer in wxCmdLineOption::Found") );
*value = opt.GetLongVal();
- return TRUE;
+ return true;
}
+#if wxUSE_DATETIME
bool wxCmdLineParser::Found(const wxString& name, wxDateTime *value) const
{
int i = m_data->FindOption(name);
if ( i == wxNOT_FOUND )
i = m_data->FindOptionByLongName(name);
- wxCHECK_MSG( i != wxNOT_FOUND, FALSE, _T("unknown option") );
+ wxCHECK_MSG( i != wxNOT_FOUND, false, _T("unknown option") );
wxCmdLineOption& opt = m_data->m_options[(size_t)i];
if ( !opt.HasValue() )
- return FALSE;
+ return false;
- wxCHECK_MSG( value, FALSE, _T("NULL pointer in wxCmdLineOption::Found") );
+ wxCHECK_MSG( value, false, _T("NULL pointer in wxCmdLineOption::Found") );
*value = opt.GetDateVal();
- return TRUE;
+ return true;
}
+#endif // wxUSE_DATETIME
size_t wxCmdLineParser::GetParamCount() const
{
- return m_data->m_parameters.GetCount();
+ return m_data->m_parameters.size();
}
wxString wxCmdLineParser::GetParam(size_t n) const
// Resets switches and options
void wxCmdLineParser::Reset()
{
- for ( size_t i = 0; i < m_data->m_options.Count(); i++ )
+ for ( size_t i = 0; i < m_data->m_options.GetCount(); i++ )
{
wxCmdLineOption& opt = m_data->m_options[i];
- opt.SetHasValue(FALSE);
+ opt.SetHasValue(false);
}
}
int wxCmdLineParser::Parse(bool showUsage)
{
- bool maybeOption = TRUE; // can the following arg be an option?
- bool ok = TRUE; // TRUE until an error is detected
- bool helpRequested = FALSE; // TRUE if "-h" was given
- bool hadRepeatableParam = FALSE; // TRUE if found param with MULTIPLE flag
+ bool maybeOption = true; // can the following arg be an option?
+ bool ok = true; // true until an error is detected
+ bool helpRequested = false; // true if "-h" was given
+ bool hadRepeatableParam = false; // true if found param with MULTIPLE flag
size_t currentParam = 0; // the index in m_paramDesc
// parse everything
wxString arg;
- size_t count = m_data->m_arguments.GetCount();
+ size_t count = m_data->m_arguments.size();
for ( size_t n = 1; ok && (n < count); n++ ) // 0 is program name
{
arg = m_data->m_arguments[n];
// not like options (this is POSIX-like)
if ( arg == _T("--") )
{
- maybeOption = FALSE;
+ maybeOption = false;
continue;
}
// empty argument or just '-' is not an option but a parameter
if ( maybeOption && arg.length() > 1 &&
- wxStrchr(m_data->m_switchChars, arg[0u]) )
+ // FIXME-UTF8: use wc_str() after removing ANSI build
+ wxStrchr(m_data->m_switchChars.c_str(), arg[0u]) )
{
bool isLong;
wxString name;
int optInd = wxNOT_FOUND; // init to suppress warnings
// an option or a switch: find whether it's a long or a short one
- if ( arg[0u] == _T('-') && arg[1u] == _T('-') )
+ if ( arg.length() >= 3 && arg[0u] == _T('-') && arg[1u] == _T('-') )
{
// a long one
- isLong = TRUE;
+ isLong = true;
// Skip leading "--"
- const wxChar *p = arg.c_str() + 2;
+ wxString::const_iterator p = arg.begin() + 2;
bool longOptionsEnabled = AreLongOptionsEnabled();
- name = GetLongOptionName(p);
+ name = GetLongOptionName(p, arg.end());
if (longOptionsEnabled)
{
optInd = m_data->FindOptionByLongName(name);
if ( optInd == wxNOT_FOUND )
{
- errorMsg << wxString::Format(_("Unknown long option '%s'"), name.c_str()) << wxT("\n");
+ errorMsg << wxString::Format(_("Unknown long option '%s'"), name.c_str())
+ << _T('\n');
}
}
else
// Print the argument including leading "--"
name.Prepend( wxT("--") );
- errorMsg << wxString::Format(_("Unknown option '%s'"), name.c_str()) << wxT("\n");
+ errorMsg << wxString::Format(_("Unknown option '%s'"), name.c_str())
+ << _T('\n');
}
}
- else
+ else // not a long option
{
- isLong = FALSE;
+ isLong = false;
// 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;
+ wxString::const_iterator p = arg.begin() + 1;
- name = GetShortOptionName(p);
+ name = GetShortOptionName(p, arg.end());
size_t len = name.length();
do
{
// we couldn't find a valid option name in the
// beginning of this string
- errorMsg << wxString::Format(_("Unknown option '%s'"), name.c_str()) << wxT("\n");
+ errorMsg << wxString::Format(_("Unknown option '%s'"), name.c_str())
+ << _T('\n');
break;
}
wxString arg2 = arg[0u];
arg2 += arg.Mid(len + 1); // +1 for leading '-'
- m_data->m_arguments.Insert(arg2, n + 1);
+ m_data->m_arguments.insert
+ (m_data->m_arguments.begin() + n + 1, arg2);
count++;
}
//else: it's our value, we'll deal with it below
if ( optInd == wxNOT_FOUND )
{
- ok = FALSE;
+ ok = false;
continue; // will break, in fact
}
+ // look at what follows:
+
+ // +1 for leading '-'
+ wxString::const_iterator p = arg.begin() + 1 + name.length();
+ wxString::const_iterator end = arg.end();
+
+ if ( isLong )
+ ++p; // for another leading '-'
+
wxCmdLineOption& opt = m_data->m_options[(size_t)optInd];
if ( opt.kind == wxCMD_LINE_SWITCH )
{
- // nothing more to do
- opt.SetHasValue();
-
- if ( opt.flags & wxCMD_LINE_OPTION_HELP )
+ // we must check that there is no value following the switch
+ if ( p != arg.end() )
{
- helpRequested = TRUE;
-
- // it's not an error, but we still stop here
- ok = FALSE;
+ errorMsg << wxString::Format(_("Unexpected characters following option '%s'."), name.c_str())
+ << _T('\n');
+ ok = false;
}
- }
- else
- {
- // get the value
-
- // +1 for leading '-'
- const wxChar *p = arg.c_str() + 1 + name.length();
- if ( isLong )
+ else // no value, as expected
{
- p++; // for another leading '-'
+ // nothing more to do
+ opt.SetHasValue();
- if ( *p++ != _T('=') )
+ if ( opt.flags & wxCMD_LINE_OPTION_HELP )
{
- errorMsg << wxString::Format(_("Option '%s' requires a value, '=' expected."), name.c_str()) << wxT("\n");
+ helpRequested = true;
- ok = FALSE;
+ // it's not an error, but we still stop here
+ ok = false;
}
}
- else
+ }
+ else // it's an option. not a switch
+ {
+ switch ( (*p).GetValue() )
{
- switch ( *p )
- {
- case _T('='):
- case _T(':'):
- // the value follows
- p++;
- break;
-
- case 0:
- // the value is in the next argument
- if ( ++n == count )
- {
- // ... but there is none
- errorMsg << wxString::Format(_("Option '%s' requires a value."),
- name.c_str()) << wxT("\n");
-
- ok = FALSE;
- }
- else
- {
- // ... take it from there
- p = m_data->m_arguments[n].c_str();
- }
- break;
+ case _T('='):
+ case _T(':'):
+ // the value follows
+ ++p;
+ break;
- default:
- // the value is right here: this may be legal or
- // not depending on the option style
- if ( opt.flags & wxCMD_LINE_NEEDS_SEPARATOR )
- {
- errorMsg << wxString::Format(_("Separator expected after the option '%s'."),
- name.c_str()) << wxT("\n");
+ case 0:
+ // the value is in the next argument
+ if ( ++n == count )
+ {
+ // ... but there is none
+ errorMsg << wxString::Format(_("Option '%s' requires a value."),
+ name.c_str())
+ << _T('\n');
+
+ ok = false;
+ }
+ else
+ {
+ // ... take it from there
+ p = m_data->m_arguments[n].begin();
+ end = m_data->m_arguments[n].end();
+ }
+ break;
- ok = FALSE;
- }
- }
+ default:
+ // the value is right here: this may be legal or
+ // not depending on the option style
+ if ( opt.flags & wxCMD_LINE_NEEDS_SEPARATOR )
+ {
+ errorMsg << wxString::Format(_("Separator expected after the option '%s'."),
+ name.c_str())
+ << _T('\n');
+
+ ok = false;
+ }
}
if ( ok )
{
- wxString value = p;
+ wxString value(p, end);
switch ( opt.type )
{
default:
else
{
errorMsg << wxString::Format(_("'%s' is not a correct numeric value for option '%s'."),
- value.c_str(), name.c_str()) << wxT("\n");
+ value.c_str(), name.c_str())
+ << _T('\n');
- ok = FALSE;
+ ok = false;
}
}
break;
+#if wxUSE_DATETIME
case wxCMD_LINE_VAL_DATE:
{
wxDateTime dt;
- const wxChar *res = dt.ParseDate(value);
+ const char *res = dt.ParseDate(value);
if ( !res || *res )
{
errorMsg << wxString::Format(_("Option '%s': '%s' cannot be converted to a date."),
- name.c_str(), value.c_str()) << wxT("\n");
+ name.c_str(), value.c_str())
+ << _T('\n');
- ok = FALSE;
+ ok = false;
}
else
{
}
}
break;
+#endif // wxUSE_DATETIME
}
}
}
}
- else
+ else // not an option, must be a parameter
{
- // a parameter
if ( currentParam < countParam )
{
wxCmdLineParam& param = m_data->m_paramDesc[currentParam];
// TODO check the param type
- m_data->m_parameters.Add(arg);
+ m_data->m_parameters.push_back(arg);
if ( !(param.flags & wxCMD_LINE_PARAM_MULTIPLE) )
{
_T("all parameters after the one with wxCMD_LINE_PARAM_MULTIPLE style are ignored") );
// remember that we did have this last repeatable parameter
- hadRepeatableParam = TRUE;
+ hadRepeatableParam = true;
}
}
else
{
- errorMsg << wxString::Format(_("Unexpected parameter '%s'"), arg.c_str()) << wxT("\n");
+ errorMsg << wxString::Format(_("Unexpected parameter '%s'"), arg.c_str())
+ << _T('\n');
- ok = FALSE;
+ ok = false;
}
}
}
}
errorMsg << wxString::Format(_("The value for the option '%s' must be specified."),
- optName.c_str()) << wxT("\n");
+ optName.c_str())
+ << _T('\n');
- ok = FALSE;
+ ok = false;
}
}
if ( !(param.flags & wxCMD_LINE_PARAM_OPTIONAL) )
{
errorMsg << wxString::Format(_("The required parameter '%s' was not specified."),
- param.description.c_str()) << wxT("\n");
+ param.description.c_str())
+ << _T('\n');
- ok = FALSE;
+ ok = false;
}
}
}
wxString wxCmdLineParser::GetUsageString()
{
- wxString appname = wxTheApp->GetAppName();
- if ( !appname )
+ wxString appname;
+ if ( m_data->m_arguments.empty() )
{
- wxCHECK_MSG( !m_data->m_arguments.IsEmpty(), wxEmptyString,
- _T("no program name") );
-
- appname = wxFileNameFromPath(m_data->m_arguments[0]);
- wxStripExtension(appname);
+ if ( wxTheApp )
+ appname = wxTheApp->GetAppName();
+ }
+ else // use argv[0]
+ {
+ appname = wxFileName(m_data->m_arguments[0]).GetName();
}
// we construct the brief cmd line desc on the fly, but not the detailed
if (!opt.longName.empty())
{
wxFAIL_MSG( wxT("option with only a long name while long ")
- wxT("options are disabled") );
+ wxT("options are disabled") );
}
else
{
usage << _T(']');
}
- namesOptions.Add(option);
- descOptions.Add(opt.description);
+ namesOptions.push_back(option);
+ descOptions.push_back(opt.description);
}
count = m_data->m_paramDesc.GetCount();
usage << _T('\n');
+ // set to number of our own options, not counting the standard ones
+ count = namesOptions.size();
+
+ // get option names & descriptions for standard options, if any:
+ wxAppTraits *traits = wxTheApp ? wxTheApp->GetTraits() : NULL;
+ wxString stdDesc;
+ if ( traits )
+ stdDesc = traits->GetStandardCmdLineOptions(namesOptions, descOptions);
+
// now construct the detailed help message
size_t len, lenMax = 0;
- count = namesOptions.GetCount();
- for ( n = 0; n < count; n++ )
+ for ( n = 0; n < namesOptions.size(); n++ )
{
len = namesOptions[n].length();
if ( len > lenMax )
lenMax = len;
}
- for ( n = 0; n < count; n++ )
+ for ( n = 0; n < namesOptions.size(); n++ )
{
+ if ( n == count )
+ usage << _T('\n') << stdDesc;
+
len = namesOptions[n].length();
usage << namesOptions[n]
<< wxString(_T(' '), lenMax - len) << _T('\t')
For example, if p points to "abcde-@-_", and allowedChars is "-_",
this function returns "abcde-".
*/
-static wxString GetOptionName(const wxChar *p,
- const wxChar *allowedChars)
+static wxString GetOptionName(wxString::const_iterator p,
+ wxString::const_iterator end,
+ const wxChar *allowedChars)
{
wxString argName;
- while ( *p && (wxIsalnum(*p) || wxStrchr(allowedChars, *p)) )
+ while ( p != end && (wxIsalnum(*p) || wxStrchr(allowedChars, *p)) )
{
argName += *p++;
}
#define wxCMD_LINE_CHARS_ALLOWED_BY_LONG_OPTION \
wxCMD_LINE_CHARS_ALLOWED_BY_SHORT_OPTION wxT("-")
-static wxString GetShortOptionName(const wxChar *p)
+static wxString GetShortOptionName(wxString::const_iterator p,
+ wxString::const_iterator end)
{
- return GetOptionName(p, wxCMD_LINE_CHARS_ALLOWED_BY_SHORT_OPTION);
+ return GetOptionName(p, end, wxCMD_LINE_CHARS_ALLOWED_BY_SHORT_OPTION);
}
-static wxString GetLongOptionName(const wxChar *p)
+static wxString GetLongOptionName(wxString::const_iterator p,
+ wxString::const_iterator end)
{
- return GetOptionName(p, wxCMD_LINE_CHARS_ALLOWED_BY_LONG_OPTION);
+ return GetOptionName(p, end, wxCMD_LINE_CHARS_ALLOWED_BY_LONG_OPTION);
}
#endif // wxUSE_CMDLINE_PARSER
/*
This function is mainly used under Windows (as under Unix we always get 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.
-
- In particular, to pass a single argument containing a space to the program
- it should be quoted:
-
- myprog.exe foo bar -> argc = 3, argv[1] = "foo", argv[2] = "bar"
- myprog.exe "foo bar" -> argc = 2, argv[1] = "foo bar"
-
- To pass an argument containing spaces and quotes, the latter should be
- escaped with a backslash:
-
- myprog.exe "foo \"bar\"" -> argc = 2, argv[1] = "foo "bar""
-
- This hopefully matches the conventions used by Explorer/command line
- interpreter under Windows. If not, this function should be fixed.
+ command line arguments as argc/argv anyhow) and so it tries to follow
+ Windows conventions for the command line handling, not Unix ones. For
+ instance, backslash is not special except when it precedes double quote when
+ it does quote it.
*/
/* static */
-wxArrayString wxCmdLineParser::ConvertStringToArgs(const wxChar *p)
+wxArrayString wxCmdLineParser::ConvertStringToArgs(const wxString& cmdline)
{
wxArrayString args;
wxString arg;
arg.reserve(1024);
- bool isInsideQuotes = FALSE;
+ bool isInsideQuotes = false;
+
+ wxString::const_iterator p = cmdline.begin();
+
for ( ;; )
{
// skip white space
- while ( *p == _T(' ') || *p == _T('\t') )
- p++;
+ while ( p != cmdline.end() && (*p == _T(' ') || *p == _T('\t')) )
+ ++p;
// anything left?
- if ( *p == _T('\0') )
+ if ( p == cmdline.end() )
break;
// parse this parameter
- arg.clear();
- for ( ;; p++ )
+ bool endParam = false;
+ bool lastBS = false;
+ for ( arg.clear(); !endParam; p++ )
{
- // do we have a (lone) backslash?
- bool isQuotedByBS = FALSE;
- while ( *p == _T('\\') )
- {
- p++;
-
- // if we have 2 backslashes in a row, output one
- // unless it looks like a UNC path \\machine\dir\file.ext
- if ( isQuotedByBS || arg.Len() == 0 )
- {
- arg += _T('\\');
- isQuotedByBS = FALSE;
- }
- else // the next char is quoted
- {
- isQuotedByBS = TRUE;
- }
- }
-
- bool skipChar = FALSE,
- endParam = FALSE;
- switch ( *p )
+ switch ( (*p).GetValue() )
{
case _T('"'):
- if ( !isQuotedByBS )
+ if ( !lastBS )
{
- // don't put the quote itself in the arg
- skipChar = TRUE;
-
isInsideQuotes = !isInsideQuotes;
- }
- //else: insert a literal quote
+ // don't put quote in arg
+ continue;
+ }
+ //else: quote has no special meaning but the backslash
+ // still remains -- makes no sense but this is what
+ // Windows does
break;
case _T(' '):
case _T('\t'):
- // we intentionally don't check for preceding backslash
- // here as if we allowed it to be used to escape spaces the
- // cmd line of the form "foo.exe a:\ c:\bar" wouldn't be
- // parsed correctly
+ // backslash does *not* quote the space, only quotes do
if ( isInsideQuotes )
{
- // preserve it, skip endParam below
+ // skip assignment below
break;
}
- //else: fall through
+ // fall through
case _T('\0'):
- endParam = TRUE;
- break;
+ endParam = true;
- default:
- if ( isQuotedByBS )
- {
- // ignore backslash before an ordinary character - this
- // is needed to properly handle the file names under
- // Windows appearing in the command line
- arg += _T('\\');
- }
+ break;
}
- // end of argument?
if ( endParam )
- break;
-
- // otherwise copy this char to arg
- if ( !skipChar )
{
- arg += *p;
+ break;
}
+
+ lastBS = *p == _T('\\');
+
+ arg += *p;
}
- args.Add(arg);
+ args.push_back(arg);
}
return args;
}
-
projects / wxWidgets.git / blobdiff