/*
process command line, GNU style.
- this is Copyleft (c) 1996--2006 Han-Wen Nienhuys, <hanwen@xs4all.nl>
+ this is Copyleft (c) 1996--2009 Han-Wen Nienhuys, <hanwen@xs4all.nl>
*/
#include "getopt-long.hh"
#include <cstdlib>
#include "config.hh"
-#include "string.hh"
+#include "international.hh"
#if !HAVE_GETTEXT
inline char *
return found_option_;
}
-Std_string
+string
Long_option_init::to_string () const
{
- Std_string str;
+ string str;
if (shortname_char_)
str += "-" + shortname_char_;
if (shortname_char_ && longname_str0_)
str += ", ";
if (longname_str0_)
- str += Std_string ("`--") + longname_str0_ + "'";
+ str += string ("`--") + longname_str0_ + "'";
return str;
}
-Std_string
+string
Long_option_init::str_for_help () const
{
- Std_string s;
+ string s;
if (shortname_char_)
s = "-" + ::to_string (shortname_char_);
else
if (!error_out_)
return;
- Std_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'",
- Std_string (argument_index_
- ? Std_string ("-" + Std_string (1, arg_value_char_a_a_[array_index_][argument_index_]))
- : Std_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'",
const int EXTRA_SPACES = 5;
-Std_string
+string
Long_option_init::table_string (Long_option_init *l)
{
- Std_string tabstr = "";
+ string tabstr = "";
int wid = 0;
for (int i = 0; l[i].shortname_char_ || l[i].longname_str0_; i++)
- wid = max (wid, int(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++)
{
- Std_string s = " " + l[i].str_for_help ();
- s += Std_string (wid - s.length () + EXTRA_SPACES, ' ');
+ string s = " " + l[i].str_for_help ();
+ s += string (wid - s.length () + EXTRA_SPACES, ' ');
- Std_string help_text (gettext (l[i].help_str0_));
- replace_all (help_text, "\n",
- "\n" + Std_string (wid + EXTRA_SPACES + 2, ' '));
+ string help_text (gettext (l[i].help_str0_));
+ replace_all (&help_text, "\n",
+ "\n" + string (wid + EXTRA_SPACES + 2, ' '));
tabstr += s + help_text + "\n";
}