X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=nucleus%2Flibrary%2Fapplication%2Fcommand_line.cpp;h=ea3d28d5755b509896e4d90e65acd57136a16c31;hb=997f97dd6f7d7c6ba0d70d2dd09c2fa4f17e8efd;hp=f132867f8e500d9005b539fe564c5f575fd706e0;hpb=0ab6f33ed5210d12ffd170c01bfb3e0248121623;p=feisty_meow.git diff --git a/nucleus/library/application/command_line.cpp b/nucleus/library/application/command_line.cpp index f132867f..ea3d28d5 100644 --- a/nucleus/library/application/command_line.cpp +++ b/nucleus/library/application/command_line.cpp @@ -25,9 +25,6 @@ #include #include -#include -//temp - #undef LOG #define LOG(s) CLASS_EMERGENCY_LOG(program_wide_logger::get(), s) @@ -70,17 +67,9 @@ command_parameter &command_parameter::operator = ////////////// // option_prefixes: the list of valid prefixes for options on a command line. -// these are the characters that precede command line arguments. For Unix, -// the default is a dash (-), while for DOS most programs use forward-slash -// (/). Adding more characters is trivial; just add a character to the list -// before the sentinel of '\0'. -#if defined(_MSC_VER) || defined(__MINGW32__) || defined(__WIN32__) - static char option_prefixes[] = { '-', '/', '\0' }; -#elif defined(__UNIX__) - static char option_prefixes[] = { '-', '\0' }; -#else - #error "I don't know what kind of operating system this is." -#endif +// these are the characters that precede command line arguments. we have +// dropped any but the linux default of dash ('-'). +static char option_prefixes[] = { '-', '\0' }; bool it_is_a_prefix_char(char to_test) { @@ -121,10 +110,11 @@ command_line::command_line(const astring &full_line) astring accumulator; string_array string_list; bool in_quote = false; -//hmmm: this is not quote right yet. +//hmmm: this is not quite right yet. // use the separate command line method, but get it to run iteratively // so we can keep pulling them apart? maybe it already does! // separate is better because it handles escaped quotes. +//hmmm: does above complaint parse? what's not right yet? for (int i = 0; i < full_line.length(); i++) { char to_examine = full_line.get(i); if (to_examine == '"') {