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

diff --git a/senf/Utils/Console/Traits.cti b/senf/Utils/Console/Traits.cti
index c96ae78..baca16e 100644
--- a/senf/Utils/Console/Traits.cti
+++ b/senf/Utils/Console/Traits.cti
@@ -1,6 +1,6 @@
 // $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>
@@ -28,6 +28,7 @@
 // Custom includes
 #include <sstream>
 #include <boost/lexical_cast.hpp>
+#include <boost/format.hpp>
 #include <senf/Utils/TypeInfo.hh>
 
 #define prefix_ inline
@@ -88,6 +89,24 @@ 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();
 }
 
@@ -106,7 +125,7 @@ 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///////////////////////////////////////