Use wide-string APIs on Windows.

[simgear.git] / simgear / misc / strutils.hxx

diff --git a/simgear/misc/strutils.hxx b/simgear/misc/strutils.hxx
index 73e24fc458adae44db74c24a06e93650a96de447..dd78863c373bffc8e14ebf67ae1d7f86ac5cdc2a 100644 (file)
--- a/simgear/misc/strutils.hxx
+++ b/simgear/misc/strutils.hxx
@@ -38,6 +38,11 @@ typedef std::vector < std::string > string_list;
 namespace simgear {
   namespace strutils {
 
+       /**
+        * utf8ToLatin1() convert utf8 to latin, useful for accent character (i.e éâàîè...)
+        */
+       std::string utf8ToLatin1( std::string & s_utf8 );
+
 //     /** 
 //      * atof() wrapper for "string" type
 //      */
@@ -137,7 +142,7 @@ namespace simgear {
     
     /**
      * Like strcmp(), but for dotted versions strings NN.NN.NN
-     * any number of terms are support.
+     * any number of terms are supported.
      * @return 0 if versions match, -ve number if v1 is lower, +ve if v1
      * is greater
      */
@@ -149,18 +154,44 @@ namespace simgear {
      */
     std::string uppercase(const std::string &s);
 
+   /**
+    * Convert a string to lower case.
+    * @return lower case string
+    */
+   std::string lowercase(const std::string &s);
+   
+  /**
+   * Convert a string to lower case in place
+   */
+  void lowercase(std::string &s);
+  
        /**
      * convert a string in the local Windows 8-bit encoding to UTF-8
      * (no-op on other platforms)
      */
     std::string convertWindowsLocal8BitToUtf8(const std::string& a);
 
+      /**
+       *
+       */
+      std::string convertUtf8ToWindowsLocal8Bit(const std::string& a);
+
+    std::wstring convertUtf8ToWString(const std::string& a);
+       std::string convertWStringToUtf8(const std::wstring& w);
+
+    /**
+     * Get md5 hash of raw data.
+     */
+    std::string md5(const unsigned char* data, size_t num);
+    std::string md5(const char* data, size_t num);
+    std::string md5(const std::string& str);
+
     /**
      * convert base-64 encoded data to raw bytes (possibly with embedded
      * NULs). Throws an exception if input data is not base64, or is
      * malformed
      */
-    std::string decodeBase64(const std::string& a);
+      void decodeBase64(const std::string& a, std::vector<unsigned char>& output);
     
     /**
      * convert bytes to hexadecimal equivalent
@@ -180,6 +211,21 @@ namespace simgear {
 
     inline std::string unescape(const std::string& str)
     { return unescape(str.c_str()); }
+      
+      /**
+       * Check a printf-style format string for dangerous (buffer-overflowing,
+       * memory re-writing) format tokens. If a problematic token is
+       * found, logs an error (SG_WARN) and returns an empty format string.
+       */
+      std::string sanitizePrintfFormat(const std::string& input);
+
+    /**
+     * Get the message corresponding to a given value of errno.
+     *
+     * Similar to strerror(), except it should be thread-safe and returns an
+     * std::string.
+     */
+    std::string error_string(int errnum);
 
   } // end namespace strutils
 } // end namespace simgear