X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Fgetopt-long.cc;h=7e1f3353357ccdeff64756ad5ef31d0bfad80d6d;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=2a594526b8924cbfa08355c70399bc6c06b92e38;hpb=2fd5f86de0500ecd9a3f47a2540c3b304f835ef4;p=lilypond.git diff --git a/flower/getopt-long.cc b/flower/getopt-long.cc index 2a594526b8..7e1f335335 100644 --- a/flower/getopt-long.cc +++ b/flower/getopt-long.cc @@ -1,127 +1,125 @@ /* - process command line, GNU style. + process command line, GNU style. - this is (Copyleft) 1996, Han-Wen Nienhuys, - */ + this is Copyleft (c) 1996--2008 Han-Wen Nienhuys, +*/ -#include -#include -#include -#include -#include "config.h" #include "getopt-long.hh" + +#include +#include +#include + +#include "config.hh" #include "international.hh" -#include "string-convert.hh" #if !HAVE_GETTEXT -inline char* -gettext (char const* s) +inline char * +gettext (char const *s) { - return (char*)s; + return (char *)s; } #else #include #endif long -Getopt_long::argument_to_i() +Getopt_long::get_argument_index () { long l; - if (!optional_argument_ch_C_ - || sscanf (optional_argument_ch_C_, "%ld", &l) != 1) + if (!optional_argument_str0_ + || sscanf (optional_argument_str0_, "%ld", &l) != 1) report (E_ILLEGALARG); return l; } const Long_option_init * -Getopt_long::parselong() +Getopt_long::parselong () { - char const *optnm = arg_value_ch_a_a_[array_index_i_] + 2 ; + char const *optnm = arg_value_char_a_a_[array_index_] + 2; assert (*optnm); char const *endopt = strchr (optnm, '='); - int searchlen = (endopt) ? endopt - optnm : strlen (optnm); + int searchlen = (endopt) ? endopt - optnm : strlen (optnm); - found_option_l_=0; - for (int i=0; i< table_len_i_; i++) + found_option_ = 0; + for (int i = 0; i < table_len_; i++) { - char const *ln = option_a_[i].longname_sz_; + char const *ln = option_a_[i].longname_str0_; if (ln && !strncmp (ln, optnm, searchlen)) { - found_option_l_ = option_a_+i; + found_option_ = option_a_ + i; break; } } - if (!found_option_l_) + if (!found_option_) { report (E_UNKNOWNOPTION); return 0; } - array_index_i_++; - argument_index_i_ = 0; - + array_index_++; + argument_index_ = 0; - if (found_option_l_->take_arg_sz_) + if (found_option_->take_arg_str0_) { if (endopt) - optional_argument_ch_C_ = endopt +1; // a '=' + optional_argument_str0_ = endopt +1; // a '=' else { - optional_argument_ch_C_ = arg_value_ch_a_a_[array_index_i_]; - array_index_i_++; + optional_argument_str0_ = arg_value_char_a_a_[array_index_]; + array_index_++; } - if (!optional_argument_ch_C_) + if (!optional_argument_str0_) report (E_ARGEXPECT); - } else { - optional_argument_ch_C_ = 0; + optional_argument_str0_ = 0; if (endopt) report (E_NOARGEXPECT); } - return found_option_l_; + return found_option_; } -String -Long_option_init::str () const +string +Long_option_init::to_string () const { - String str; - if (shortname_ch_) - str += "-" + shortname_ch_; - if (shortname_ch_ && longname_sz_) + string str; + if (shortname_char_) + str += "-" + shortname_char_; + if (shortname_char_ && longname_str0_) str += ", "; - if (longname_sz_) - str += String ("`--") + longname_sz_ + "'"; + if (longname_str0_) + str += string ("`--") + longname_str0_ + "'"; return str; } -String +string Long_option_init::str_for_help () const { - String s; - if (shortname_ch_) - s = "-" + to_str (shortname_ch_); + string s; + if (shortname_char_) + s = "-" + ::to_string (shortname_char_); else s = " "; - s = s + ((shortname_ch_ && longname_sz_) ? "," : " "); + s = s + ((shortname_char_ && longname_str0_) ? ", " : " "); - if (longname_sz_) - s = s + "--" + longname_sz_; + if (longname_str0_) + s = s + "--" + longname_str0_; - if (take_arg_sz_) + if (take_arg_str0_) { - if (longname_sz_) + if (longname_str0_) s = s + "="; else s = s + " "; - - s = s + gettext (take_arg_sz_); + + s = s + gettext (take_arg_str0_); } return s; } @@ -131,220 +129,211 @@ void Getopt_long::report (Errorcod c) { error_ = c; - if (!error_ostream_l_) + if (!error_out_) return; - String str = arg_value_ch_a_a_[0]; + string str = arg_value_char_a_a_[0]; str += ": "; switch (c) { case E_ARGEXPECT: - str += _f ("Option `%s' requires an argument", - found_option_l_->str ()); + str += _f ("option `%s' requires an argument", + found_option_->to_string ()); break; - case E_NOARGEXPECT: - str += _f ("Option `%s' doesn't allow an argument", - found_option_l_->str ()); + case E_NOARGEXPECT: + str += _f ("option `%s' does not allow an argument", + found_option_->to_string ()); break; case E_UNKNOWNOPTION: str += _f ("unrecognized option: `%s'", - String (argument_index_i_ - ? String ("-" + String_convert::form_str ("%c", - arg_value_ch_a_a_[array_index_i_][argument_index_i_])) - : String (arg_value_ch_a_a_[array_index_i_]))); + string (argument_index_ + ? string ("-" + string (1, arg_value_char_a_a_[array_index_][argument_index_])) + : string (arg_value_char_a_a_[array_index_]))); break; case E_ILLEGALARG: str += _f ("invalid argument `%s' to option `%s'", - optional_argument_ch_C_, found_option_l_->str ()); + optional_argument_str0_, found_option_->to_string ()); + break; default: assert (false); } - *error_ostream_l_ << str << endl; + fprintf (error_out_, "%s\n", str.c_str ()); exit (2); } const Long_option_init * -Getopt_long::parseshort() +Getopt_long::parseshort () { - char c=arg_value_ch_a_a_[array_index_i_][argument_index_i_]; - found_option_l_=0; + char c = arg_value_char_a_a_[array_index_][argument_index_]; + found_option_ = 0; assert (c); - for (int i=0; i < table_len_i_; i++) - if (option_a_[i].shortname_ch_ == c) + for (int i = 0; i < table_len_; i++) + if (option_a_[i].shortname_char_ == c) { - found_option_l_ = option_a_+i; + found_option_ = option_a_ + i; break; } - if (!found_option_l_) + if (!found_option_) { report (E_UNKNOWNOPTION); return 0; } - argument_index_i_++; - if (!found_option_l_->take_arg_sz_) + argument_index_++; + if (!found_option_->take_arg_str0_) { - optional_argument_ch_C_ = 0; - return found_option_l_; + optional_argument_str0_ = 0; + return found_option_; } - optional_argument_ch_C_ = arg_value_ch_a_a_[array_index_i_] + argument_index_i_; + optional_argument_str0_ = arg_value_char_a_a_[array_index_] + argument_index_; - array_index_i_ ++; - argument_index_i_ = 0; + array_index_++; + argument_index_ = 0; - if (!optional_argument_ch_C_[0]) - { - optional_argument_ch_C_ = arg_value_ch_a_a_[array_index_i_]; - array_index_i_ ++; - } - if (!optional_argument_ch_C_) + if (!optional_argument_str0_[0]) { - report (E_ARGEXPECT); + optional_argument_str0_ = arg_value_char_a_a_[array_index_]; + array_index_++; } + if (!optional_argument_str0_) + report (E_ARGEXPECT); - return found_option_l_; + return found_option_; } const Long_option_init * -Getopt_long::operator()() +Getopt_long::operator () () { - if (!ok()) + if (!ok ()) return 0; - next(); + next (); if (!ok ()) return 0; - if (argument_index_i_) - return parseshort(); + if (argument_index_) + return parseshort (); - const char * argument_C = arg_value_ch_a_a_[array_index_i_]; + char const *argument = arg_value_char_a_a_[array_index_]; - if (argument_C[0] != '-') + if (argument[0] != '-') return 0; - if (argument_C[1] == '-') {// what to do with "command -- bla" - if (argument_C[2]) - return parselong(); + if (argument[1] == '-') {// what to do with "command -- bla" + if (argument[2]) + return parselong (); else return 0; } else { - if (argument_C[ 1 ]) + if (argument[ 1 ]) { - argument_index_i_ = 1; - return parseshort(); + argument_index_ = 1; + return parseshort (); } else - { - return 0; - } + return 0; } } - - -Getopt_long::Getopt_long (int c, char **v, Long_option_init *lo) +Getopt_long::Getopt_long (int c, char **v, Long_option_init *lo) { option_a_ = lo; - error_ostream_l_ = &cerr; - arg_value_ch_a_a_ = v; - argument_count_i_ = c; - array_index_i_ = 1; - argument_index_i_ = 0; + error_out_ = stderr; + arg_value_char_a_a_ = v; + argument_count_ = c; + array_index_ = 1; + argument_index_ = 0; // reached end of option table? - table_len_i_ =0; - for (int i = 0; option_a_[i].longname_sz_ ||option_a_[i].shortname_ch_; i++) - table_len_i_ ++; - + table_len_ = 0; + for (int i = 0; option_a_[i].longname_str0_ || option_a_[i].shortname_char_; i++) + table_len_++; } bool -Getopt_long::ok() const +Getopt_long::ok () const { - return array_index_i_ < argument_count_i_; + return array_index_ < argument_count_; } void -Getopt_long::next() +Getopt_long::next () { error_ = E_NOERROR; - while (array_index_i_ < argument_count_i_ - && !arg_value_ch_a_a_[array_index_i_][argument_index_i_]) + while (array_index_ < argument_count_ + && !arg_value_char_a_a_[array_index_][argument_index_]) { - array_index_i_++; - argument_index_i_ = 0; + array_index_++; + argument_index_ = 0; } } char const * -Getopt_long::current_arg() +Getopt_long::current_arg () { - if (array_index_i_ >= argument_count_i_) + if (array_index_ >= argument_count_) return 0; - char const * a = arg_value_ch_a_a_[array_index_i_]; - return a + argument_index_i_; + char const *a = arg_value_char_a_a_[array_index_]; + return a + argument_index_; } char const * -Getopt_long::get_next_arg() +Getopt_long::get_next_arg () { - char const * a = current_arg(); + char const *a = current_arg (); if (a) { - array_index_i_ ++; - argument_index_i_= 0; + array_index_++; + argument_index_ = 0; } return a; } - const int EXTRA_SPACES = 5; -String -Long_option_init::table_str (Long_option_init *l) +string +Long_option_init::table_string (Long_option_init *l) { - String argstr = "ARG"; - String tabstr = ""; + string tabstr = ""; int wid = 0; - for (int i=0; l[i].shortname_ch_ || l[i].longname_sz_; i++) - { - wid = wid >? l[i].str_for_help ().length_i (); - } + for (int i = 0; l[i].shortname_char_ || l[i].longname_str0_; i++) + wid = max (int(wid), int(l[i].str_for_help ().length ())); - for (int i=0; l[i].shortname_ch_ || l[i].longname_sz_; i++) + for (int i = 0; l[i].shortname_char_ || l[i].longname_str0_; i++) { - String s = " " + l[i].str_for_help (); - s += String_convert::char_str (' ', wid - s.length_i () + EXTRA_SPACES); + string s = " " + l[i].str_for_help (); + s += string (wid - s.length () + EXTRA_SPACES, ' '); - tabstr += s + gettext (l[i].help_sz_) + "\n"; + string help_text (gettext (l[i].help_str0_)); + replace_all (&help_text, "\n", + "\n" + string (wid + EXTRA_SPACES + 2, ' ')); + tabstr += s + help_text + "\n"; } - return tabstr; } int Long_option_init::compare (Long_option_init const &a, Long_option_init const &b) { - if (a.shortname_ch_ && b.shortname_ch_ && a.shortname_ch_- b.shortname_ch_) - return a.shortname_ch_ - b.shortname_ch_; + if (a.shortname_char_ && b.shortname_char_ && a.shortname_char_- b.shortname_char_) + return a.shortname_char_ - b.shortname_char_; - if (b.shortname_ch_ && a.longname_sz_) + if (b.shortname_char_ && a.longname_str0_) { - char s[2] = {b.shortname_ch_, 0}; - return strcmp (a.longname_sz_, s); + char s[2] = {b.shortname_char_, 0}; + return strcmp (a.longname_str0_, s); } - if (a.shortname_ch_ && b.longname_sz_) + if (a.shortname_char_ && b.longname_str0_) { - char s[2] = {a.shortname_ch_, 0}; - return strcmp (s, b.longname_sz_); + char s[2] = {a.shortname_char_, 0}; + return strcmp (s, b.longname_str0_); } - - return strcmp (a.longname_sz_, b.longname_sz_); + + return strcmp (a.longname_str0_, b.longname_str0_); }