X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FUtils%2FConsole%2FTraits.cti;h=d1c543b948e191dbbfda8b4d7c01d433377c7f08;hb=0003d55730b447329342161d12cf2ed23b63459e;hp=c96ae787335d55f112271f00cbd9cdc1d9f6a157;hpb=a30f975608bae2dcee151af15dc7f40602627615;p=senf.git

diff --git a/senf/Utils/Console/Traits.cti b/senf/Utils/Console/Traits.cti
index c96ae78..d1c543b 100644
--- a/senf/Utils/Console/Traits.cti
+++ b/senf/Utils/Console/Traits.cti
@@ -1,24 +1,29 @@
 // $Id$
 //
-// Copyright (C) 2008 
+// Copyright (C) 2008
 // Fraunhofer Institute for Open Communication Systems (FOKUS)
-// Competence Center NETwork research (NET), St. Augustin, GERMANY
-//     Stefan Bund <g0dil@berlios.de>
 //
-// This program 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 2 of the License, or
-// (at your option) any later version.
+// The contents of this file are subject to the Fraunhofer FOKUS Public License
+// Version 1.0 (the "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at 
+// http://senf.berlios.de/license.html
 //
-// This program 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.
+// The Fraunhofer FOKUS Public License Version 1.0 is based on, 
+// but modifies the Mozilla Public License Version 1.1.
+// See the full license text for the amendments.
 //
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the
-// Free Software Foundation, Inc.,
-// 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+// Software distributed under the License is distributed on an "AS IS" basis, 
+// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License 
+// for the specific language governing rights and limitations under the License.
+//
+// The Original Code is Fraunhofer FOKUS code.
+//
+// The Initial Developer of the Original Code is Fraunhofer-Gesellschaft e.V. 
+// (registered association), Hansastraße 27 c, 80686 Munich, Germany.
+// All Rights Reserved.
+//
+// Contributor(s):
+//   Stefan Bund <g0dil@berlios.de>
 
 /** \file
     \brief Traits inline template implementation */
@@ -27,13 +32,13 @@
 
 // Custom includes
 #include <sstream>
-#include <boost/lexical_cast.hpp>
+#include <boost/format.hpp>
 #include <senf/Utils/TypeInfo.hh>
 
 #define prefix_ inline
-///////////////////////////////cti.p///////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::console::detail::ReturnValueTraits<Type>
 
 template <class Type>
@@ -49,7 +54,7 @@ prefix_ void senf::console::senf_console_format_value(Type const & value, std::o
     os << value;
 }
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::console::ArgumentTraits<Type>
 
 template <class Type>
@@ -88,10 +93,28 @@ prefix_ std::string senf::console::ArgumentTraits<Type>::str(Type const & value)
 {
     std::stringstream ss;
     senf::console::format(value, ss);
+    std::string rv (ss.str());
+
+    if (rv.empty() || ! boost::algorithm::all(rv, CommandParser::isWordChar)) {
+        for (std::string::size_type i (0); i < rv.size(); ++i)
+            if (rv[i] == '"' || rv[i] == '\\')
+                rv.insert(i++,"\\");
+            else if (rv[i] < ' ' || rv[i] > 126) {
+                rv.insert(i+1, (boost::format("x%02x")
+                                % unsigned(static_cast<unsigned char>(rv[i]))).str().c_str());
+                rv[i] = '\\';
+                i += 3;
+            }
+
+        rv.insert(0,"\"");
+        rv.push_back('"');
+        return rv;
+    }
+
     return ss.str();
 }
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::console::detail::CharArgumentTraits<CharT>
 
 template <class CharT>
@@ -106,10 +129,10 @@ parse(ParseCommandInfo::TokensRange const & tokens, CharT & out)
 template <class CharT>
 prefix_ std::string senf::console::detail::CharArgumentTraits<CharT>::description()
 {
-    return prettyBaseName(typeid(CharT));
+    return std::numeric_limits<CharT>::is_signed ? "byte" : "ubyte";
 }
 
-///////////////////////////////cti.e///////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_