#pragma hdrstop
#endif
+#include "wx/cmdline.h"
+
#if wxUSE_CMDLINE_PARSER
#ifndef WX_PRECOMP
#include <ctype.h>
#include "wx/datetime.h"
-#include "wx/cmdline.h"
// ----------------------------------------------------------------------------
// private functions
public:
wxCmdLineEntryType kind;
- wxString shortName, longName, description;
+ wxString shortName,
+ longName,
+ description;
wxCmdLineParamType type;
int flags;
// methods
wxCmdLineParserData();
- void SetArguments(int argc, char **argv);
+ void SetArguments(int argc, wxChar **argv);
void SetArguments(const wxString& cmdline);
int FindOption(const wxString& name);
#endif
}
-void wxCmdLineParserData::SetArguments(int argc, char **argv)
+void wxCmdLineParserData::SetArguments(int argc, wxChar **argv)
{
m_arguments.Empty();
m_arguments.Add(wxTheApp->GetAppName());
- // Break up string
- // Treat strings enclosed in double-quotes as single arguments
- int i = 0;
- int len = cmdLine.Length();
- while (i < len)
- {
- // Skip whitespace
- while ((i < len) && wxIsspace(cmdLine.GetChar(i)))
- i ++;
+ wxArrayString args = wxCmdLineParser::ConvertStringToArgs(cmdLine);
- if (i < len)
- {
- if (cmdLine.GetChar(i) == wxT('"')) // We found the start of a string
- {
- i ++;
- int first = i;
- while ((i < len) && (cmdLine.GetChar(i) != wxT('"')))
- i ++;
-
- wxString arg(cmdLine.Mid(first, (i - first)));
-
- m_arguments.Add(arg);
-
- if (i < len)
- i ++; // Skip past 2nd quote
- }
- else // Unquoted argument
- {
- int first = i;
- while ((i < len) && !wxIsspace(cmdLine.GetChar(i)))
- i ++;
-
- wxString arg(cmdLine.Mid(first, (i - first)));
-
- m_arguments.Add(arg);
- }
- }
- }
+ WX_APPEND_ARRAY(m_arguments, args);
}
int wxCmdLineParserData::FindOption(const wxString& name)
m_data = new wxCmdLineParserData;
}
-void wxCmdLineParser::SetCmdLine(int argc, char **argv)
+void wxCmdLineParser::SetCmdLine(int argc, wxChar **argv)
{
m_data->SetArguments(argc, argv);
}
wxString wxCmdLineParser::GetParam(size_t n) const
{
+ wxCHECK_MSG( n < GetParamCount(), wxEmptyString, _T("invalid param index") );
+
return m_data->m_parameters[n];
}
// the real work is done here
// ----------------------------------------------------------------------------
-int wxCmdLineParser::Parse()
+int wxCmdLineParser::Parse(bool showUsage)
{
bool maybeOption = TRUE; // can the following arg be an option?
bool ok = TRUE; // TRUE until an error is detected
}
}
- if ( !ok )
+ if ( !ok && showUsage )
{
Usage();
}
brief << _T('[');
}
- brief << chSwitch << opt.shortName;
+ if ( !opt.shortName.empty() )
+ {
+ brief << chSwitch << opt.shortName;
+ }
+ else if ( !opt.longName.empty() )
+ {
+ brief << _T("--") << opt.longName;
+ }
+ else
+ {
+ wxFAIL_MSG( _T("option without neither short nor long name?") );
+ }
wxString option;
- option << _T(" ") << chSwitch << opt.shortName;
- if ( !!opt.longName )
+
+ if ( !opt.shortName.empty() )
{
- option << _T(" --") << opt.longName;
+ option << _T(" ") << chSwitch << opt.shortName;
+ }
+
+ if ( !opt.longName.empty() )
+ {
+ option << (option.empty() ? _T(" ") : _T(", "))
+ << _T("--") << opt.longName;
}
if ( opt.kind != wxCMD_LINE_SWITCH )
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
// now construct the detailed help message
size_t len, lenMax = 0;
}
wxLogMessage(detailed);
+
+ // do it now if not done above
+#if wxUSE_GUI
+ wxLogMessage(brief);
+#endif // wxUSE_GUI
}
// ----------------------------------------------------------------------------
-// global functions
+// private functions
// ----------------------------------------------------------------------------
static wxString GetTypeName(wxCmdLineParamType type)
}
#endif // wxUSE_CMDLINE_PARSER
+
+// ----------------------------------------------------------------------------
+// global functions
+// ----------------------------------------------------------------------------
+
+/*
+ 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
+ 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.
+ */
+
+/* static */
+wxArrayString wxCmdLineParser::ConvertStringToArgs(const wxChar *p)
+{
+ wxArrayString args;
+
+ wxString arg;
+ arg.reserve(1024);
+
+ bool isInsideQuotes = FALSE;
+ for ( ;; )
+ {
+ // skip white space
+ while ( *p == _T(' ') || *p == _T('\t') )
+ p++;
+
+ // anything left?
+ if ( *p == _T('\0') )
+ break;
+
+ // parse this parameter
+ arg.clear();
+ for ( ;; p++ )
+ {
+ // do we have a (lone) backslash?
+ bool isQuotedByBS = FALSE;
+ while ( *p == _T('\\') )
+ {
+ p++;
+
+ // if we have 2 backslashes in a row, output one
+ if ( isQuotedByBS )
+ {
+ arg += _T('\\');
+ isQuotedByBS = FALSE;
+ }
+ else // the next char is quoted
+ {
+ isQuotedByBS = TRUE;
+ }
+ }
+
+ bool skipChar = FALSE,
+ endParam = FALSE;
+ switch ( *p )
+ {
+ case _T('"'):
+ if ( !isQuotedByBS )
+ {
+ // don't put the quote itself in the arg
+ skipChar = TRUE;
+
+ isInsideQuotes = !isInsideQuotes;
+ }
+ //else: insert a literal quote
+
+ 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
+ if ( isInsideQuotes )
+ {
+ // preserve it, skip endParam below
+ break;
+ }
+ //else: fall through
+
+ case _T('\0'):
+ endParam = TRUE;
+ break;
+
+ 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('\\');
+ }
+ }
+
+ // end of argument?
+ if ( endParam )
+ break;
+
+ // otherwise copy this char to arg
+ if ( !skipChar )
+ {
+ arg += *p;
+ }
+ }
+
+ args.Add(arg);
+ }
+
+ return args;
+}
+
projects / wxWidgets.git / blobdiff