libtransport.git Changeset - fe7ba8449659

Changeset - fe7ba8449659

Parent rev.

Child rev.

[Not reviewed]

0 1 4

HanzZ - 13 years ago 2012-08-01 17:16:17
hanzz.k@gmail.com

Replace invalid utf8 characters by _ in data from ICQ

5 files changed with 849 insertions and 2 deletions:

src/networkpluginserver.cpp

src/utf8.h

src/utf8/checked.h

318

src/utf8/core.h

259

src/utf8/unchecked.h

228

0 comments (0 inline, 0 general)

src/networkpluginserver.cpp

➞

Show inline comments

@@ @@ -23,48 +23,50 @@ @@
 #include "transport/transport.h"
 #include "transport/storagebackend.h"
 #include "transport/rostermanager.h"
 #include "transport/usermanager.h"
 #include "transport/conversationmanager.h"
 #include "transport/localbuddy.h"
 #include "transport/config.h"
 #include "transport/conversation.h"
 #include "transport/vcardresponder.h"
 #include "transport/rosterresponder.h"
 #include "transport/memoryreadbytestream.h"
 #include "transport/logging.h"
 #include "transport/admininterface.h"
 #include "blockresponder.h"
 #include "Swiften/Swiften.h"
 #include "Swiften/Server/ServerStanzaChannel.h"
 #include "Swiften/Elements/StreamError.h"
 #include "Swiften/Network/BoostConnectionServer.h"
 #include "Swiften/Elements/AttentionPayload.h"
 #include "Swiften/Elements/XHTMLIMPayload.h"
 #include "Swiften/Elements/InvisiblePayload.h"
 #include "Swiften/Elements/SpectrumErrorPayload.h"
 #include "transport/protocol.pb.h"
 #include "utf8.h"
 #include <Swiften/FileTransfer/ReadBytestream.h>
 #include <Swiften/Elements/StreamInitiationFileInfo.h>
 #ifdef _WIN32
 #include "windows.h"
 #include <stdint.h>
 #else
 #include "sys/wait.h"
 #include "sys/signal.h"
 #include "popt.h"
 #endif
 namespace Transport {
 static unsigned long backend_id;
 static unsigned long bytestream_id;
 DEFINE_LOGGER(logger, "NetworkPluginServer");
 class NetworkConversation : public Conversation {
 	public:
 		NetworkConversation(ConversationManager *conversationManager, const std::string &legacyName, bool muc = false) : Conversation(conversationManager, legacyName, muc) {
+		}
 void NetworkPluginServer::handleDisconnectedPayload(const std::string &data) {
 	pbnetwork::Disconnected payload;
 	if (payload.ParseFromString(data) == false) {
 		// TODO: ERROR
 		return;
+	}
 	m_component->m_userRegistry->onPasswordInvalid(payload.user(), payload.message());
 	User *user = m_userManager->getUser(payload.user());
 	if (!user) {
 		return;
+	}
 	user->handleDisconnected(payload.message(), (Swift::SpectrumErrorPayload::Error) payload.error());
+}
 void NetworkPluginServer::handleVCardPayload(const std::string &data) {
 	pbnetwork::VCard payload;
 	if (payload.ParseFromString(data) == false) {
 		std::cout << "PARSING ERROR\n";
 		// TODO: ERROR
 		return;
+	}
 	std::string field;
 	boost::shared_ptr<Swift::VCard> vcard(new Swift::VCard());
 	vcard->setFullName(payload.fullname());
 	utf8::replace_invalid(payload.fullname().begin(), payload.fullname().end(), field.begin(), '_');
 	vcard->setFullName(field);
 	utf8::replace_invalid(payload.nickname().begin(), payload.nickname().end(), field.begin(), '_');
 	vcard->setNickname(field);
 	vcard->setPhoto(Swift::createByteArray(payload.photo()));
 	vcard->setNickname(payload.nickname());
 	m_vcardResponder->sendVCard(payload.id(), vcard);
+}
 void NetworkPluginServer::handleAuthorizationPayload(const std::string &data) {
 	pbnetwork::Buddy payload;
 	if (payload.ParseFromString(data) == false) {
 		// TODO: ERROR
 		return;
+	}
 	User *user = m_userManager->getUser(payload.username());
 	if (!user)
 		return;
 	// Create subscribe presence and forward it to XMPP side
 	Swift::Presence::ref response = Swift::Presence::create();
 	response->setTo(user->getJID());
 	std::string name = payload.buddyname();
 	name = Swift::JID::getEscapedNode(name);
 // 	if (name.find_last_of("@") != std::string::npos) { // OK when commented
 // 		name.replace(name.find_last_of("@"), 1, "%"); // OK when commented

src/utf8.h

➞

Show inline comments

@@ new file 100644 @@
 // Copyright 2006 Nemanja Trifunovic
 /*
 Permission is hereby granted, free of charge, to any person or organization
 obtaining a copy of the software and accompanying documentation covered by
 this license (the "Software") to use, reproduce, display, distribute,
 execute, and transmit the Software, and to prepare derivative works of the
 Software, and to permit third-parties to whom the Software is furnished to
 do so, all subject to the following:
 The copyright notices in the Software and this entire statement, including
 the above license grant, this restriction and the following disclaimer,
 must be included in all copies of the Software, in whole or in part, and
 all derivative works of the Software, unless such copies or derivative
 works are solely in the form of machine-executable object code generated by
 a source language processor.
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
 SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
 FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
 ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 DEALINGS IN THE SOFTWARE.
 */
 #ifndef UTF8_FOR_CPP_2675DCD0_9480_4c0c_B92A_CC14C027B731
 #define UTF8_FOR_CPP_2675DCD0_9480_4c0c_B92A_CC14C027B731
 #include "utf8/checked.h"
 #include "utf8/unchecked.h"
 #endif // header guard

src/utf8/checked.h

➞

Show inline comments

@@ new file 100644 @@
 // Copyright 2006 Nemanja Trifunovic
 /*
 Permission is hereby granted, free of charge, to any person or organization
 obtaining a copy of the software and accompanying documentation covered by
 this license (the "Software") to use, reproduce, display, distribute,
 execute, and transmit the Software, and to prepare derivative works of the
 Software, and to permit third-parties to whom the Software is furnished to
 do so, all subject to the following:
 The copyright notices in the Software and this entire statement, including
 the above license grant, this restriction and the following disclaimer,
 must be included in all copies of the Software, in whole or in part, and
 all derivative works of the Software, unless such copies or derivative
 works are solely in the form of machine-executable object code generated by
 a source language processor.
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
 SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
 FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
 ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 DEALINGS IN THE SOFTWARE.
 */
 #ifndef UTF8_FOR_CPP_CHECKED_H_2675DCD0_9480_4c0c_B92A_CC14C027B731
 #define UTF8_FOR_CPP_CHECKED_H_2675DCD0_9480_4c0c_B92A_CC14C027B731
 #include "core.h"
 #include <stdexcept>
 namespace utf8
+{
     // Exceptions that may be thrown from the library functions.
     class invalid_code_point : public std::exception {
         uint32_t cp;
     public:
         invalid_code_point(uint32_t cp) : cp(cp) {}
         virtual const char* what() const throw() { return "Invalid code point"; }
         uint32_t code_point() const {return cp;}
     };
     class invalid_utf8 : public std::exception {
         uint8_t u8;
     public:
         invalid_utf8 (uint8_t u) : u8(u) {}
         virtual const char* what() const throw() { return "Invalid UTF-8"; }
         uint8_t utf8_octet() const {return u8;}
     };
     class invalid_utf16 : public std::exception {
         uint16_t u16;
     public:
         invalid_utf16 (uint16_t u) : u16(u) {}
         virtual const char* what() const throw() { return "Invalid UTF-16"; }
         uint16_t utf16_word() const {return u16;}
     };
     class not_enough_room : public std::exception {
     public:
         virtual const char* what() const throw() { return "Not enough space"; }
     };
     /// The library API - functions intended to be called by the users
     template <typename octet_iterator, typename output_iterator>
     output_iterator replace_invalid(octet_iterator start, octet_iterator end, output_iterator out, uint32_t replacement)
+    {
         while (start != end) {
             octet_iterator sequence_start = start;
             internal::utf_error err_code = internal::validate_next(start, end);
             switch (err_code) {
                 case internal::OK :
                     for (octet_iterator it = sequence_start; it != start; ++it)
                         *out++ = *it;
                     break;
                 case internal::NOT_ENOUGH_ROOM:
                     throw not_enough_room();
                 case internal::INVALID_LEAD:
                     append (replacement, out);
                     ++start;
                     break;
                 case internal::INCOMPLETE_SEQUENCE:
                 case internal::OVERLONG_SEQUENCE:
                 case internal::INVALID_CODE_POINT:
                     append (replacement, out);
                     ++start;
                     // just one replacement mark for the sequence
                     while (internal::is_trail(*start) && start != end)
                         ++start;
                     break;
+            }
+        }
         return out;
+    }
     template <typename octet_iterator, typename output_iterator>
     inline output_iterator replace_invalid(octet_iterator start, octet_iterator end, output_iterator out)
+    {
         static const uint32_t replacement_marker = internal::mask16(0xfffd);
         return replace_invalid(start, end, out, replacement_marker);
+    }
     template <typename octet_iterator>
     octet_iterator append(uint32_t cp, octet_iterator result)
+    {
         if (!internal::is_code_point_valid(cp))
             throw invalid_code_point(cp);
         if (cp < 0x80)                        // one octet
             *(result++) = static_cast<uint8_t>(cp);
         else if (cp < 0x800) {                // two octets
             *(result++) = static_cast<uint8_t>((cp >> 6)            | 0xc0);
             *(result++) = static_cast<uint8_t>((cp & 0x3f)          | 0x80);
+        }
         else if (cp < 0x10000) {              // three octets
             *(result++) = static_cast<uint8_t>((cp >> 12)           | 0xe0);
             *(result++) = static_cast<uint8_t>(((cp >> 6) & 0x3f)     | 0x80);
             *(result++) = static_cast<uint8_t>((cp & 0x3f)          | 0x80);
+        }
         else if (cp <= internal::CODE_POINT_MAX) {      // four octets
             *(result++) = static_cast<uint8_t>((cp >> 18)           | 0xf0);
             *(result++) = static_cast<uint8_t>(((cp >> 12)& 0x3f)     | 0x80);
             *(result++) = static_cast<uint8_t>(((cp >> 6) & 0x3f)     | 0x80);
             *(result++) = static_cast<uint8_t>((cp & 0x3f)          | 0x80);
+        }
         else
             throw invalid_code_point(cp);
         return result;
+    }
     template <typename octet_iterator>
     uint32_t next(octet_iterator& it, octet_iterator end)
+    {
         uint32_t cp = 0;
         internal::utf_error err_code = internal::validate_next(it, end, &cp);
         switch (err_code) {
             case internal::OK :
                 break;
             case internal::NOT_ENOUGH_ROOM :
                 throw not_enough_room();
             case internal::INVALID_LEAD :
             case internal::INCOMPLETE_SEQUENCE :
             case internal::OVERLONG_SEQUENCE :
                 throw invalid_utf8(*it);
             case internal::INVALID_CODE_POINT :
                 throw invalid_code_point(cp);
+        }
         return cp;
+    }
     template <typename octet_iterator>
     uint32_t peek_next(octet_iterator it, octet_iterator end)
+    {
         return next(it, end);
+    }
     template <typename octet_iterator>
     uint32_t prior(octet_iterator& it, octet_iterator start)
+    {
         octet_iterator end = it;
         while (internal::is_trail(*(--it)))
             if (it < start)
                 throw invalid_utf8(*it); // error - no lead byte in the sequence
         octet_iterator temp = it;
         return next(temp, end);
+    }
     /// Deprecated in versions that include "prior"
     template <typename octet_iterator>
     uint32_t previous(octet_iterator& it, octet_iterator pass_start)
+    {
         octet_iterator end = it;
         while (internal::is_trail(*(--it)))
             if (it == pass_start)
                 throw invalid_utf8(*it); // error - no lead byte in the sequence
         octet_iterator temp = it;
         return next(temp, end);
+    }
     template <typename octet_iterator, typename distance_type>
     void advance (octet_iterator& it, distance_type n, octet_iterator end)
+    {
         for (distance_type i = 0; i < n; ++i)
             next(it, end);
+    }
     template <typename octet_iterator>
     typename std::iterator_traits<octet_iterator>::difference_type
     distance (octet_iterator first, octet_iterator last)
+    {
         typename std::iterator_traits<octet_iterator>::difference_type dist;
         for (dist = 0; first < last; ++dist)
             next(first, last);
         return dist;
+    }
     template <typename u16bit_iterator, typename octet_iterator>
     octet_iterator utf16to8 (u16bit_iterator start, u16bit_iterator end, octet_iterator result)
+    {
         while (start != end) {
             uint32_t cp = internal::mask16(*start++);
             // Take care of surrogate pairs first
             if (internal::is_surrogate(cp)) {
                 if (start != end) {
                     uint32_t trail_surrogate = internal::mask16(*start++);
                     if (trail_surrogate >= internal::TRAIL_SURROGATE_MIN && trail_surrogate <= internal::TRAIL_SURROGATE_MAX)
                         cp = (cp << 10) + trail_surrogate + internal::SURROGATE_OFFSET;
                     else
                         throw invalid_utf16(static_cast<uint16_t>(trail_surrogate));
+                }
                 else
                     throw invalid_utf16(static_cast<uint16_t>(*start));
+            }
             result = append(cp, result);
+        }
         return result;
+    }
     template <typename u16bit_iterator, typename octet_iterator>
     u16bit_iterator utf8to16 (octet_iterator start, octet_iterator end, u16bit_iterator result)
+    {
         while (start != end) {
             uint32_t cp = next(start, end);
             if (cp > 0xffff) { //make a surrogate pair
                 *result++ = static_cast<uint16_t>((cp >> 10)   + internal::LEAD_OFFSET);
                 *result++ = static_cast<uint16_t>((cp & 0x3ff) + internal::TRAIL_SURROGATE_MIN);
+            }
             else
                 *result++ = static_cast<uint16_t>(cp);
+        }
         return result;
+    }
     template <typename octet_iterator, typename u32bit_iterator>
     octet_iterator utf32to8 (u32bit_iterator start, u32bit_iterator end, octet_iterator result)
+    {
         while (start != end)
             result = append(*(start++), result);
         return result;
+    }
     template <typename octet_iterator, typename u32bit_iterator>
     u32bit_iterator utf8to32 (octet_iterator start, octet_iterator end, u32bit_iterator result)
+    {
         while (start < end)
             (*result++) = next(start, end);
         return result;
+    }
     // The iterator class
     template <typename octet_iterator>
     class iterator : public std::iterator <std::bidirectional_iterator_tag, uint32_t> {
       octet_iterator it;
       octet_iterator range_start;
       octet_iterator range_end;
       public:
       iterator () {};
       explicit iterator (const octet_iterator& octet_it,
                          const octet_iterator& range_start,
                          const octet_iterator& range_end) :
                it(octet_it), range_start(range_start), range_end(range_end)
+      {
           if (it < range_start || it > range_end)
               throw std::out_of_range("Invalid utf-8 iterator position");
+      }
       // the default "big three" are OK
       octet_iterator base () const { return it; }
       uint32_t operator * () const
+      {
           octet_iterator temp = it;
           return next(temp, range_end);
+      }
       bool operator == (const iterator& rhs) const
+      {
           if (range_start != rhs.range_start || range_end != rhs.range_end)
               throw std::logic_error("Comparing utf-8 iterators defined with different ranges");
           return (it == rhs.it);
+      }
       bool operator != (const iterator& rhs) const
+      {
           return !(operator == (rhs));
+      }
       iterator& operator ++ ()
+      {
           next(it, range_end);
           return *this;
+      }
       iterator operator ++ (int)
+      {
           iterator temp = *this;
           next(it, range_end);
           return temp;
+      }
       iterator& operator -- ()
+      {
           prior(it, range_start);
           return *this;
+      }
       iterator operator -- (int)
+      {
           iterator temp = *this;
           prior(it, range_start);
           return temp;
+      }
     }; // class iterator
 } // namespace utf8
 #endif //header guard

src/utf8/core.h

➞

Show inline comments

@@ new file 100644 @@
 // Copyright 2006 Nemanja Trifunovic
 /*
 Permission is hereby granted, free of charge, to any person or organization
 obtaining a copy of the software and accompanying documentation covered by
 this license (the "Software") to use, reproduce, display, distribute,
 execute, and transmit the Software, and to prepare derivative works of the
 Software, and to permit third-parties to whom the Software is furnished to
 do so, all subject to the following:
 The copyright notices in the Software and this entire statement, including
 the above license grant, this restriction and the following disclaimer,
 must be included in all copies of the Software, in whole or in part, and
 all derivative works of the Software, unless such copies or derivative
 works are solely in the form of machine-executable object code generated by
 a source language processor.
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
 SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
 FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
 ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 DEALINGS IN THE SOFTWARE.
 */
 #ifndef UTF8_FOR_CPP_CORE_H_2675DCD0_9480_4c0c_B92A_CC14C027B731
 #define UTF8_FOR_CPP_CORE_H_2675DCD0_9480_4c0c_B92A_CC14C027B731
 #include <iterator>
 namespace utf8
+{
     // The typedefs for 8-bit, 16-bit and 32-bit unsigned integers
     // You may need to change them to match your system.
     // These typedefs have the same names as ones from cstdint, or boost/cstdint
     typedef unsigned char   uint8_t;
     typedef unsigned short  uint16_t;
     typedef unsigned int    uint32_t;
 // Helper code - not intended to be directly called by the library users. May be changed at any time
 namespace internal
+{
     // Unicode constants
     // Leading (high) surrogates: 0xd800 - 0xdbff
     // Trailing (low) surrogates: 0xdc00 - 0xdfff
     const uint16_t LEAD_SURROGATE_MIN  = 0xd800u;
     const uint16_t LEAD_SURROGATE_MAX  = 0xdbffu;
     const uint16_t TRAIL_SURROGATE_MIN = 0xdc00u;
     const uint16_t TRAIL_SURROGATE_MAX = 0xdfffu;
     const uint16_t LEAD_OFFSET         = LEAD_SURROGATE_MIN - (0x10000 >> 10);
     const uint32_t SURROGATE_OFFSET    = 0x10000u - (LEAD_SURROGATE_MIN << 10) - TRAIL_SURROGATE_MIN;
     // Maximum valid value for a Unicode code point
     const uint32_t CODE_POINT_MAX      = 0x0010ffffu;
     template<typename octet_type>
     inline uint8_t mask8(octet_type oc)
+    {
         return static_cast<uint8_t>(0xff & oc);
+    }
     template<typename u16_type>
     inline uint16_t mask16(u16_type oc)
+    {
         return static_cast<uint16_t>(0xffff & oc);
+    }
     template<typename octet_type>
     inline bool is_trail(octet_type oc)
+    {
         return ((mask8(oc) >> 6) == 0x2);
+    }
     template <typename u16>
     inline bool is_surrogate(u16 cp)
+    {
         return (cp >= LEAD_SURROGATE_MIN && cp <= TRAIL_SURROGATE_MAX);
+    }
     template <typename u32>
     inline bool is_code_point_valid(u32 cp)
+    {
         return (cp <= CODE_POINT_MAX && !is_surrogate(cp) && cp != 0xfffe && cp != 0xffff);
+    }
     template <typename octet_iterator>
     inline typename std::iterator_traits<octet_iterator>::difference_type
     sequence_length(octet_iterator lead_it)
+    {
         uint8_t lead = mask8(*lead_it);
         if (lead < 0x80)
             return 1;
         else if ((lead >> 5) == 0x6)
             return 2;
         else if ((lead >> 4) == 0xe)
             return 3;
         else if ((lead >> 3) == 0x1e)
             return 4;
         else
             return 0;
+    }
     enum utf_error {OK, NOT_ENOUGH_ROOM, INVALID_LEAD, INCOMPLETE_SEQUENCE, OVERLONG_SEQUENCE, INVALID_CODE_POINT};
     template <typename octet_iterator>
     utf_error validate_next(octet_iterator& it, octet_iterator end, uint32_t* code_point)
+    {
         uint32_t cp = mask8(*it);
         // Check the lead octet
         typedef typename std::iterator_traits<octet_iterator>::difference_type octet_difference_type;
         octet_difference_type length = sequence_length(it);
         // "Shortcut" for ASCII characters
         if (length == 1) {
             if (end - it > 0) {
                 if (code_point)
                     *code_point = cp;
                 ++it;
                 return OK;
+            }
             else
                 return NOT_ENOUGH_ROOM;
+        }
         // Do we have enough memory?
         if (std::distance(it, end) < length)
             return NOT_ENOUGH_ROOM;
         // Check trail octets and calculate the code point
         switch (length) {
             case 0:
                 return INVALID_LEAD;
                 break;
             case 2:
                 if (is_trail(*(++it))) {
                     cp = ((cp << 6) & 0x7ff) + ((*it) & 0x3f);
+                }
                 else {
                     --it;
                     return INCOMPLETE_SEQUENCE;
+                }
             break;
             case 3:
                 if (is_trail(*(++it))) {
                     cp = ((cp << 12) & 0xffff) + ((mask8(*it) << 6) & 0xfff);
                     if (is_trail(*(++it))) {
                         cp += (*it) & 0x3f;
+                    }
                     else {
                         std::advance(it, -2);
                         return INCOMPLETE_SEQUENCE;
+                    }
+                }
                 else {
                     --it;
                     return INCOMPLETE_SEQUENCE;
+                }
             break;
             case 4:
                 if (is_trail(*(++it))) {
                     cp = ((cp << 18) & 0x1fffff) + ((mask8(*it) << 12) & 0x3ffff);
                     if (is_trail(*(++it))) {
                         cp += (mask8(*it) << 6) & 0xfff;
                         if (is_trail(*(++it))) {
                             cp += (*it) & 0x3f;
+                        }
                         else {
                             std::advance(it, -3);
                             return INCOMPLETE_SEQUENCE;
+                        }
+                    }
                     else {
                         std::advance(it, -2);
                         return INCOMPLETE_SEQUENCE;
+                    }
+                }
                 else {
                     --it;
                     return INCOMPLETE_SEQUENCE;
+                }
             break;
+        }
         // Is the code point valid?
         if (!is_code_point_valid(cp)) {
             for (octet_difference_type i = 0; i < length - 1; ++i)
                 --it;
             return INVALID_CODE_POINT;
+        }
         if (code_point)
             *code_point = cp;
         if (cp < 0x80) {
             if (length != 1) {
                 std::advance(it, -(length-1));
                 return OVERLONG_SEQUENCE;
+            }
+        }
         else if (cp < 0x800) {
             if (length != 2) {
                 std::advance(it, -(length-1));
                 return OVERLONG_SEQUENCE;
+            }
+        }
         else if (cp < 0x10000) {
             if (length != 3) {
                 std::advance(it, -(length-1));
                 return OVERLONG_SEQUENCE;
+            }
+        }
         ++it;
         return OK;
+    }
     template <typename octet_iterator>
     inline utf_error validate_next(octet_iterator& it, octet_iterator end) {
         return validate_next(it, end, 0);
+    }
 } // namespace internal
     /// The library API - functions intended to be called by the users
     // Byte order mark
     const uint8_t bom[] = {0xef, 0xbb, 0xbf};
     template <typename octet_iterator>
     octet_iterator find_invalid(octet_iterator start, octet_iterator end)
+    {
         octet_iterator result = start;
         while (result != end) {
             internal::utf_error err_code = internal::validate_next(result, end);
             if (err_code != internal::OK)
                 return result;
+        }
         return result;
+    }
     template <typename octet_iterator>
     inline bool is_valid(octet_iterator start, octet_iterator end)
+    {
         return (find_invalid(start, end) == end);
+    }
     template <typename octet_iterator>
     inline bool is_bom (octet_iterator it)
+    {
         return (
             (internal::mask8(*it++)) == bom[0] &&
             (internal::mask8(*it++)) == bom[1] &&
             (internal::mask8(*it))   == bom[2]
            );
+    }
 } // namespace utf8
 #endif // header guard

src/utf8/unchecked.h

➞

Show inline comments

@@ new file 100644 @@
 // Copyright 2006 Nemanja Trifunovic
 /*
 Permission is hereby granted, free of charge, to any person or organization
 obtaining a copy of the software and accompanying documentation covered by
 this license (the "Software") to use, reproduce, display, distribute,
 execute, and transmit the Software, and to prepare derivative works of the
 Software, and to permit third-parties to whom the Software is furnished to
 do so, all subject to the following:
 The copyright notices in the Software and this entire statement, including
 the above license grant, this restriction and the following disclaimer,
 must be included in all copies of the Software, in whole or in part, and
 all derivative works of the Software, unless such copies or derivative
 works are solely in the form of machine-executable object code generated by
 a source language processor.
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
 SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
 FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
 ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 DEALINGS IN THE SOFTWARE.
 */
 #ifndef UTF8_FOR_CPP_UNCHECKED_H_2675DCD0_9480_4c0c_B92A_CC14C027B731
 #define UTF8_FOR_CPP_UNCHECKED_H_2675DCD0_9480_4c0c_B92A_CC14C027B731
 #include "core.h"
 namespace utf8
+{
     namespace unchecked
+    {
         template <typename octet_iterator>
         octet_iterator append(uint32_t cp, octet_iterator result)
+        {
             if (cp < 0x80)                        // one octet
                 *(result++) = static_cast<uint8_t>(cp);
             else if (cp < 0x800) {                // two octets
                 *(result++) = static_cast<uint8_t>((cp >> 6)          | 0xc0);
                 *(result++) = static_cast<uint8_t>((cp & 0x3f)        | 0x80);
+            }
             else if (cp < 0x10000) {              // three octets
                 *(result++) = static_cast<uint8_t>((cp >> 12)         | 0xe0);
                 *(result++) = static_cast<uint8_t>((cp >> 6) & 0x3f   | 0x80);
                 *(result++) = static_cast<uint8_t>((cp & 0x3f)        | 0x80);
+            }
             else {                                // four octets
                 *(result++) = static_cast<uint8_t>((cp >> 18)         | 0xf0);
                 *(result++) = static_cast<uint8_t>((cp >> 12)& 0x3f   | 0x80);
                 *(result++) = static_cast<uint8_t>((cp >> 6) & 0x3f   | 0x80);
                 *(result++) = static_cast<uint8_t>((cp & 0x3f)        | 0x80);
+            }
             return result;
+        }
         template <typename octet_iterator>
         uint32_t next(octet_iterator& it)
+        {
             uint32_t cp = internal::mask8(*it);
             typename std::iterator_traits<octet_iterator>::difference_type length = utf8::internal::sequence_length(it);
             switch (length) {
                 case 1:
                     break;
                 case 2:
                     it++;
                     cp = ((cp << 6) & 0x7ff) + ((*it) & 0x3f);
                     break;
                 case 3:
                     ++it;
                     cp = ((cp << 12) & 0xffff) + ((internal::mask8(*it) << 6) & 0xfff);
                     ++it;
                     cp += (*it) & 0x3f;
                     break;
                 case 4:
                     ++it;
                     cp = ((cp << 18) & 0x1fffff) + ((internal::mask8(*it) << 12) & 0x3ffff);
                     ++it;
                     cp += (internal::mask8(*it) << 6) & 0xfff;
                     ++it;
                     cp += (*it) & 0x3f;
                     break;
+            }
             ++it;
             return cp;
+        }
         template <typename octet_iterator>
         uint32_t peek_next(octet_iterator it)
+        {
             return next(it);
+        }
         template <typename octet_iterator>
         uint32_t prior(octet_iterator& it)
+        {
             while (internal::is_trail(*(--it))) ;
             octet_iterator temp = it;
             return next(temp);
+        }
         // Deprecated in versions that include prior, but only for the sake of consistency (see utf8::previous)
         template <typename octet_iterator>
         inline uint32_t previous(octet_iterator& it)
+        {
             return prior(it);
+        }
         template <typename octet_iterator, typename distance_type>
         void advance (octet_iterator& it, distance_type n)
+        {
             for (distance_type i = 0; i < n; ++i)
                 next(it);
+        }
         template <typename octet_iterator>
         typename std::iterator_traits<octet_iterator>::difference_type
         distance (octet_iterator first, octet_iterator last)
+        {
             typename std::iterator_traits<octet_iterator>::difference_type dist;
             for (dist = 0; first < last; ++dist)
                 next(first);
             return dist;
+        }
         template <typename u16bit_iterator, typename octet_iterator>
         octet_iterator utf16to8 (u16bit_iterator start, u16bit_iterator end, octet_iterator result)
+        {
             while (start != end) {
                 uint32_t cp = internal::mask16(*start++);
             // Take care of surrogate pairs first
                 if (internal::is_surrogate(cp)) {
                     uint32_t trail_surrogate = internal::mask16(*start++);
                     cp = (cp << 10) + trail_surrogate + internal::SURROGATE_OFFSET;
+                }
                 result = append(cp, result);
+            }
             return result;
+        }
         template <typename u16bit_iterator, typename octet_iterator>
         u16bit_iterator utf8to16 (octet_iterator start, octet_iterator end, u16bit_iterator result)
+        {
             while (start != end) {
                 uint32_t cp = next(start);
                 if (cp > 0xffff) { //make a surrogate pair
                     *result++ = static_cast<uint16_t>((cp >> 10)   + internal::LEAD_OFFSET);
                     *result++ = static_cast<uint16_t>((cp & 0x3ff) + internal::TRAIL_SURROGATE_MIN);
+                }
                 else
                     *result++ = static_cast<uint16_t>(cp);
+            }
             return result;
+        }
         template <typename octet_iterator, typename u32bit_iterator>
         octet_iterator utf32to8 (u32bit_iterator start, u32bit_iterator end, octet_iterator result)
+        {
             while (start != end)
                 result = append(*(start++), result);
             return result;
+        }
         template <typename octet_iterator, typename u32bit_iterator>
         u32bit_iterator utf8to32 (octet_iterator start, octet_iterator end, u32bit_iterator result)
+        {
             while (start < end)
                 (*result++) = next(start);
             return result;
+        }
         // The iterator class
         template <typename octet_iterator>
           class iterator : public std::iterator <std::bidirectional_iterator_tag, uint32_t> {
             octet_iterator it;
             public:
             iterator () {};
             explicit iterator (const octet_iterator& octet_it): it(octet_it) {}
             // the default "big three" are OK
             octet_iterator base () const { return it; }
             uint32_t operator * () const
+            {
                 octet_iterator temp = it;
                 return next(temp);
+            }
             bool operator == (const iterator& rhs) const
+            {
                 return (it == rhs.it);
+            }
             bool operator != (const iterator& rhs) const
+            {
                 return !(operator == (rhs));
+            }
             iterator& operator ++ ()
+            {
                 std::advance(it, internal::sequence_length(it));
                 return *this;
+            }
             iterator operator ++ (int)
+            {
                 iterator temp = *this;
                 std::advance(it, internal::sequence_length(it));
                 return temp;
+            }
             iterator& operator -- ()
+            {
                 prior(it);
                 return *this;
+            }
             iterator operator -- (int)
+            {
                 iterator temp = *this;
                 prior(it);
                 return temp;
+            }
           }; // class iterator
     } // namespace utf8::unchecked
 } // namespace utf8
 #endif // header guard

0 comments (0 inline, 0 general)