/*
process command line, GNU style.
- this is Copyleft (c) 1996--2005 Han-Wen Nienhuys, <hanwen@cs.uu.nl>
+ this is Copyleft (c) 1996--2007 Han-Wen Nienhuys, <hanwen@xs4all.nl>
*/
#include "getopt-long.hh"
#include <cassert>
#include <cstdlib>
-#include <iostream>
-
#include "config.hh"
-#include "string-convert.hh"
+#include "international.hh"
#if !HAVE_GETTEXT
inline char *
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;
}
}
array_index_++;
argument_index_ = 0;
-
if (found_option_->take_arg_str0_)
{
if (endopt)
return found_option_;
}
-String
+string
Long_option_init::to_string () const
{
- String str;
+ string str;
if (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
if (!error_out_)
return;
- String str = arg_value_char_a_a_[0];
+ string str = arg_value_char_a_a_[0];
str += ": ";
switch (c)
{
found_option_->to_string ());
break;
case E_NOARGEXPECT:
- str += _f ("option `%s' doesn't allow an argument",
+ 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'",
default:
assert (false);
}
- fprintf (error_out_, "%s\n", str.to_str0 ());
+ fprintf (error_out_, "%s\n", str.c_str ());
exit (2);
}
array_index_++;
}
if (!optional_argument_str0_)
- {
- report (E_ARGEXPECT);
- }
+ report (E_ARGEXPECT);
return found_option_;
}
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;
return parseshort ();
}
else
- {
- return 0;
- }
+ return 0;
}
}
const int EXTRA_SPACES = 5;
-String
+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 ();
- }
+ wid = max (int(wid), int(l[i].str_for_help ().length ()));
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;