OSDN > Finden Software > MUtilities > SCM > git > MUtilities > Commit

MUtilities
Fork

MUtilities: Commit

MUtilities development repository

Expose the crack_command_line() function.

--- a/include/MUtils/OSSupport.h

+++ b/include/MUtils/OSSupport.h

		@@ -102,6 +102,7 @@ namespace MUtils
102	102
103	103	//CLI Arguments
104	104	typedef QMap<QString,QString> ArgumentMap;
	105	+ MUTILS_API const QStringList crack_command_line(const QString &command_line = QString());
105	106	MUTILS_API const ArgumentMap &arguments(void);
106	107
107	108	//Copy file

--- a/src/OSSupport_Win32.cpp

+++ b/src/OSSupport_Win32.cpp

		@@ -77,6 +77,28 @@ void MUtils::OS::system_message_err(const wchar_t const title, const wchar_t c
77	77	static QReadWriteLock g_arguments_lock;
78	78	static QScopedPointer<MUtils::OS::ArgumentMap> g_arguments_list;
79	79
	80	+const QStringList MUtils::OS::crack_command_line(const QString &command_line)
	81	+{
	82	+ int nArgs = 0;
	83	+ LPWSTR *szArglist = CommandLineToArgvW(command_line.isNull() ? GetCommandLineW() : MUTILS_WCHR(command_line), &nArgs);
	84	+
	85	+ QStringList command_line_tokens;
	86	+ if(NULL != szArglist)
	87	+ {
	88	+ for(int i = 0; i < nArgs; i++)
	89	+ {
	90	+ const QString argStr = MUTILS_QSTR(szArglist[i]).trimmed();
	91	+ if(!argStr.isEmpty())
	92	+ {
	93	+ command_line_tokens << argStr;
	94	+ }
	95	+ }
	96	+ LocalFree(szArglist);
	97	+ }
	98	+
	99	+ return command_line_tokens;
	100	+}
	101	+
80	102	const MUtils::OS::ArgumentMap &MUtils::OS::arguments(void)
81	103	{
82	104	QReadLocker readLock(&g_arguments_lock);

		@@ -98,15 +120,16 @@ const MUtils::OS::ArgumentMap &MUtils::OS::arguments(void)
98	120
99	121	g_arguments_list.reset(new ArgumentMap());
100	122	int nArgs = 0;
101		- LPWSTR *szArglist = CommandLineToArgvW(GetCommandLineW(), &nArgs);
	123	+ const QStringList argList = crack_command_line();
102	124
103		- if(NULL != szArglist)
	125	+ if(argList.count() > 1)
104	126	{
105		- const QChar separator = QLatin1Char('=');
106	127	const QString argPrefix = QLatin1String("--");
107		- for(int i = 0; i < nArgs; i++)
	128	+ const QChar separator = QLatin1Char('=');
	129	+
	130	+ for(int i = 1; i < nArgs; i++)
108	131	{
109		- const QString argStr = MUTILS_QSTR(szArglist[i]).trimmed();
	132	+ const QString &argStr = argList[i];
110	133	if(argStr.startsWith(argPrefix))
111	134	{
112	135	const QString argData = argStr.mid(2).trimmed();

		@@ -126,9 +149,8 @@ const MUtils::OS::ArgumentMap &MUtils::OS::arguments(void)
126	149	}
127	150	}
128	151	}
129		- LocalFree(szArglist);
130	152	}
131		- else
	153	+ else if(argList.empty())
132	154	{
133	155	qWarning("CommandLineToArgvW() has failed !!!");
134	156	}