Commit 371c7cf6 authored by Jan Möbius's avatar Jan Möbius

Reverted SimpleOpt patch


git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@4889 383ad7c9-94d9-4d36-a494-682f7c89f535
parent ce2e0dbb
......@@ -269,7 +269,7 @@ enum _ESOFlags
separated argument "-opt arg" is supplied by the user as a
combined argument "-opt=arg". By default this is not considered
an error. */
SO_O_PEDANTIC = 0x0040,
SO_O_PEDANTIC = 0x0040,
/*! Case-insensitive comparisons for short arguments */
SO_O_ICASE_SHORT = 0x0100,
......@@ -573,21 +573,6 @@ CSimpleOptTempl<SOCHAR>::Init(
m_nFlags = a_nFlags;
m_pszClump = NULL;
// Remove -psn_0_xxxxx argument which is automatically
// attached by MacOSX
for (int i = 0; i < m_argc; i++) {
if(strlen(m_argv[i]) > 4) {
if( ( (m_argv[i])[0] == (SOCHAR)'-' ) &&
( (m_argv[i])[1] == (SOCHAR)'p' ) &&
( (m_argv[i])[2] == (SOCHAR)'s' ) &&
( (m_argv[i])[3] == (SOCHAR)'n' ) ) {
m_argc--;
m_nLastArg--;
m_argv[i] = "";
}
}
}
#ifdef SO_MAX_ARGS
if (m_argc > SO_MAX_ARGS) {
m_nLastError = SO_ARG_INVALID_DATA;
......@@ -808,7 +793,7 @@ CSimpleOptTempl<SOCHAR>::PrepareArg(
return (SOCHAR)'/';
}
#endif
return a_pszString == 0x0 ? NULL : a_pszString[0];
return a_pszString[0];
}
template<class SOCHAR>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment