X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Fgetopt-long.cc;h=51e11d896c3908ba0056ce71894e0f1942095f65;hb=6dcfd7cbee3a24fe3ce39d63698e3a621df48f3b;hp=d8d750bf0e8bd83f865fc70de72a1f40f86e842c;hpb=bdf4ab13203502e7ec7cf9cf5896527643a07c1f;p=lilypond.git

diff --git a/flower/getopt-long.cc b/flower/getopt-long.cc
index d8d750bf0e..51e11d896c 100644
--- a/flower/getopt-long.cc
+++ b/flower/getopt-long.cc
@@ -1,7 +1,20 @@
 /*
-  process command line, GNU style.
+  This file is part of LilyPond, the GNU music typesetter.
 
-  this is Copyleft (c) 1996--2005 Han-Wen Nienhuys, <hanwen@cs.uu.nl>
+  Copyright (C) 1996--2011 Han-Wen Nienhuys, <hanwen@xs4all.nl>
+
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "getopt-long.hh"
@@ -10,10 +23,8 @@
 #include <cassert>
 #include <cstdlib>
 
-#include <iostream>
-
 #include "config.hh"
-#include "string-convert.hh"
+#include "international.hh"
 
 #if !HAVE_GETTEXT
 inline char *
@@ -43,16 +54,16 @@ Getopt_long::parselong ()
   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;
 	}
     }
@@ -65,7 +76,6 @@ Getopt_long::parselong ()
   array_index_++;
   argument_index_ = 0;
 
-
   if (found_option_->take_arg_str0_)
     {
       if (endopt)
@@ -88,23 +98,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_;
   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
@@ -135,7 +145,7 @@ 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)
     {
@@ -144,15 +154,14 @@ Getopt_long::report (Errorcod 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'",
@@ -161,7 +170,7 @@ Getopt_long::report (Errorcod c)
     default:
       assert (false);
     }
-  fprintf (error_out_, "%s\n", str.to_str0 ());
+  fprintf (error_out_, "%s\n", str.c_str ());
   exit (2);
 }
 
@@ -202,9 +211,7 @@ Getopt_long::parseshort ()
       array_index_++;
     }
   if (!optional_argument_str0_)
-    {
-      report (E_ARGEXPECT);
-    }
+    report (E_ARGEXPECT);
 
   return found_option_;
 }
@@ -222,7 +229,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;
@@ -241,9 +248,7 @@ Getopt_long::operator () ()
 	  return parseshort ();
 	}
       else
-	{
-	  return 0;
-	}
+	return 0;
     }
 }
 
@@ -303,24 +308,24 @@ Getopt_long::get_next_arg ()
 
 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;