HTTP: Rename urlretrieve/urlload to save/load.

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

diff --git a/simgear/misc/strutils.hxx b/simgear/misc/strutils.hxx
index d2c8a3e830d2888b2c006fcd45847e773427befe..7fce94a5f2728681d84d03eade76a8d94c009091 100644 (file)
--- a/simgear/misc/strutils.hxx
+++ b/simgear/misc/strutils.hxx
@@ -137,7 +137,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
      */
@@ -160,7 +160,7 @@ namespace simgear {
      * 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
@@ -168,6 +168,26 @@ namespace simgear {
     std::string encodeHex(const std::string& bytes);
     
     std::string encodeHex(const unsigned char* rawBytes, unsigned int length);
+
+    /**
+     * Unescape string.
+     *
+     * @param str String possibly containing escaped characters.
+     * @return string with escaped characters replaced by single character
+     *         values.
+     */
+    std::string unescape(const char* str);
+
+    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);
+
   } // end namespace strutils
 } // end namespace simgear