Changeset c1e2243fb1d931f43be26b3abfe1be8be0f52c33

Timestamp:

01/06/07 23:47:18 (6 years ago)

Author:

Philipp Kern <phil@…>

Parents:

b3345157b2b819cd58281cee08c90aa8d9bf309e

Children:

71a982926069e42fa9bb0f8d38b1d6d4d82c527d

git-committer:

Philipp Kern <phil@0x539.de> / 2007-01-06T22:47:18Z+0000

Message:

[project @ Convert all different line encodings to UNIX ones]

Original author: Philipp Kern <phil@…>
Date: 2005-09-04 21:29:39+00:00

Files:

• src/window.cpp (modified) (2 diffs)

src/window.cpp

@@ -831 +831 @@
 }
 
+namespace
+{
+        // convert2unix converts a given string from any special line endings
+        // (DOS or old-style Macintosh) to Unix line endings. It does no
+        // book-keeping about the encountered endings but ensures that no
+        // CR characters are left in the string.
+        void convert2unix(std::string& str)
+        {
+                for(std::string::size_type i = 0; i < str.length(); ++ i)
+                        // Convert DOS CRLF to a single LF
+                        if(str[i] == '\r' && str[i+1] == '\n')
+                                str.erase(i, 1);
+                        // Convert Macintosh CR to LF
+                        else if(str[i] == '\r')
+                                str[i] = '\n';
+        }
+}
+
 void Gobby::Window::open_local_file(const Glib::ustring& file,
                                     bool open_as_edited)
@@ -838 +856 @@
                 // Set local file path for the document_insert callback
                 m_local_file_path = file;
+                std::string content(
+                        convert_to_utf8(Glib::file_get_contents(file)) );
+                convert2unix(content);
 
                 // TODO: Set path in newly generated document
                 // TODO: Convert file to UTF-8
                 m_buffer->create_document(
-                        Glib::path_get_basename(file),
-                        convert_to_utf8(Glib::file_get_contents(file)),
-                        open_as_edited
+                        Glib::path_get_basename(file), content, open_as_edited
                 );
         }