X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Fgetopt-long.cc;h=7e1f3353357ccdeff64756ad5ef31d0bfad80d6d;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=643527c91a679247199722e5f6f9ced65531216f;hpb=7e72a1e50e94a7f9738d62599de79fe7745f600c;p=lilypond.git diff --git a/flower/getopt-long.cc b/flower/getopt-long.cc index 643527c91a..7e1f335335 100644 --- a/flower/getopt-long.cc +++ b/flower/getopt-long.cc @@ -1,27 +1,23 @@ /* - process command line, GNU style. + process command line, GNU style. - this is Copyleft (c) 1996--2004 Han-Wen Nienhuys, - */ + this is Copyleft (c) 1996--2008 Han-Wen Nienhuys, +*/ -#include -#include -#include -#include +#include "getopt-long.hh" -#include +#include +#include +#include -#include "config.h" -#include "getopt-long.hh" +#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 @@ -41,20 +37,20 @@ Getopt_long::get_argument_index () const Long_option_init * Getopt_long::parselong () { - char const *optnm = arg_value_char_a_a_[array_index_] + 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_=0; - for (int i=0; i< table_len_; i++) + found_option_ = 0; + for (int i = 0; i < table_len_; i++) { char const *ln = option_a_[i].longname_str0_; if (ln && !strncmp (ln, optnm, searchlen)) { - found_option_ = option_a_+i; + found_option_ = option_a_ + i; break; } } @@ -67,7 +63,6 @@ Getopt_long::parselong () array_index_++; argument_index_ = 0; - if (found_option_->take_arg_str0_) { if (endopt) @@ -79,7 +74,6 @@ Getopt_long::parselong () } if (!optional_argument_str0_) report (E_ARGEXPECT); - } else { @@ -91,23 +85,23 @@ Getopt_long::parselong () return found_option_; } -String +string Long_option_init::to_string () const { - String str; + string str; if (shortname_char_) - str += "-" + shortname_char_; + str += "-" + shortname_char_; if (shortname_char_ && longname_str0_) str += ", "; if (longname_str0_) - str += String ("`--") + longname_str0_ + "'"; + str += string ("`--") + longname_str0_ + "'"; return str; } -String +string Long_option_init::str_for_help () const { - String s; + string s; if (shortname_char_) s = "-" + ::to_string (shortname_char_); else @@ -124,7 +118,7 @@ Long_option_init::str_for_help () const s = s + "="; else s = s + " "; - + s = s + gettext (take_arg_str0_); } return s; @@ -138,47 +132,46 @@ Getopt_long::report (Errorcod c) if (!error_out_) return; - String str = arg_value_char_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_->to_string ()); + found_option_->to_string ()); break; - case E_NOARGEXPECT: - str += _f ("option `%s' doesn't allow an argument", - found_option_->to_string ()); + 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_ - ? String ("-" + String_convert::form_string ("%c", - arg_value_char_a_a_[array_index_][argument_index_])) - : String (arg_value_char_a_a_[array_index_]))); + 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_str0_, found_option_->to_string ()); + optional_argument_str0_, found_option_->to_string ()); break; default: assert (false); } - fprintf(error_out_, "%s\n", str.to_str0 ()); + fprintf (error_out_, "%s\n", str.c_str ()); exit (2); } const Long_option_init * Getopt_long::parseshort () { - char c=arg_value_char_a_a_[array_index_][argument_index_]; - found_option_=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++) + for (int i = 0; i < table_len_; i++) if (option_a_[i].shortname_char_ == c) { - found_option_ = option_a_+i; + found_option_ = option_a_ + i; break; } @@ -196,18 +189,16 @@ Getopt_long::parseshort () } optional_argument_str0_ = arg_value_char_a_a_[array_index_] + argument_index_; - array_index_ ++; + array_index_++; argument_index_ = 0; if (!optional_argument_str0_[0]) { optional_argument_str0_ = arg_value_char_a_a_[array_index_]; - array_index_ ++; + array_index_++; } if (!optional_argument_str0_) - { - report (E_ARGEXPECT); - } + report (E_ARGEXPECT); return found_option_; } @@ -225,7 +216,7 @@ Getopt_long::operator () () if (argument_index_) return parseshort (); - const char * argument = arg_value_char_a_a_[array_index_]; + char const *argument = arg_value_char_a_a_[array_index_]; if (argument[0] != '-') return 0; @@ -244,15 +235,11 @@ Getopt_long::operator () () 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_out_ = stderr; @@ -262,16 +249,15 @@ Getopt_long::Getopt_long (int c, char **v, Long_option_init *lo) argument_index_ = 0; // reached end of option table? - table_len_ =0; - for (int i = 0; option_a_[i].longname_str0_ ||option_a_[i].shortname_char_; i++) - table_len_ ++; - + 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 { - return array_index_ < argument_count_; + return array_index_ < argument_count_; } void @@ -291,46 +277,44 @@ Getopt_long::current_arg () { if (array_index_ >= argument_count_) return 0; - char const * a = arg_value_char_a_a_[array_index_]; + char const *a = arg_value_char_a_a_[array_index_]; return a + argument_index_; } char const * Getopt_long::get_next_arg () { - char const * a = current_arg (); + char const *a = current_arg (); if (a) { - array_index_ ++; - argument_index_= 0; + array_index_++; + argument_index_ = 0; } return a; } - const int EXTRA_SPACES = 5; -String -Long_option_init::table_string (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_char_ || l[i].longname_str0_; i++) - { - wid = wid >? l[i].str_for_help ().length (); - } + 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_char_ || l[i].longname_str0_; 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_string (' ', wid - s.length () + EXTRA_SPACES); + string s = " " + l[i].str_for_help (); + s += string (wid - s.length () + EXTRA_SPACES, ' '); - tabstr += s + gettext (l[i].help_str0_) + "\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; } @@ -350,6 +334,6 @@ Long_option_init::compare (Long_option_init const &a, Long_option_init const &b) char s[2] = {a.shortname_char_, 0}; return strcmp (s, b.longname_str0_); } - + return strcmp (a.longname_str0_, b.longname_str0_); }